优化样式，修复BUG

video/app/agconnect-services.json

-{
-	"agcgw":{
-		"backurl":"connect-drcn.dbankcloud.cn",
-		"url":"connect-drcn.hispace.hicloud.com"
-	},
-	"client":{
-		"cp_id":"*********",
-		"product_id":"********",
-		"client_id":"********",
-		"client_secret":"************",
-		"app_id":"********",
-		"package_name":"com.duben.loveplayletd",
-		"api_key":"**********"
-	},
-	"service":{
-		"analytics":{
-			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
-			"resource_id":"p1",
-			"channel_id":""
-		},
-		"cloudstorage":{
-			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn"
-		},
-		"ml":{
-			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
-		}
-	},
-	"region":"CN",
-	"configuration_version":"1.0"
-}
\ No newline at end of file

video/app/build.gradle

@@ -5,7 +5,6 @@ apply plugin: 'kotlin-kapt'
 //sharesdk
 apply plugin: 'com.mob.sdk'
 
-apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.huawei.agconnect'
 apply plugin: 'com.hihonor.mcs.asplugin'
 
@@ -309,7 +308,6 @@ dependencies {
     api 'com.tencent.timpush:vivo:8.3.6498'
     api 'com.tencent.timpush:huawei:8.3.6498'
     api 'com.tencent.timpush:honor:8.3.6498'
-    annotationProcessor 'com.google.auto.service:auto-service-annotations:1.1.1'
 
     // 选择器
     implementation 'com.contrarywind:Android-PickerView:4.1.9'

video/app/google-services.json

-{
-  "project_info": {
-    "project_number": "******",
-    "firebase_url": "******",
-    "project_id": "******",
-    "storage_bucket": "******.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "******",
-        "android_client_info": {
-          "package_name": "com.duben.loveplayletd"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "******.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "******"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "******.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file

video/app/mcs-services.json

-{
-	"developer_id":"********",
-	"app_id":"********",
-	"package_name":"com.duben.loveplayletd",
-	"version":"1.0"
-}
\ No newline at end of file

video/app/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.duben.loveplayletd">
 
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
@@ -266,6 +265,7 @@
         <activity
             android:name=".ui.preview.ImagePreviewActivity"
             android:exported="false"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activitys.ShareActivity"

video/app/src/main/java/com/duben/library/utils/GlideUtils.kt

@@ -243,10 +243,8 @@ object GlideUtils {
         defaultImage: Int = R.mipmap.ic_my_avat
     ) {
         Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20").apply(
-            RequestOptions().transform(
-                CenterCrop(),
-                RoundedCorners(BubbleUtils.dp2px(5))
-            ).placeholder(defaultImage)
+            RequestOptions()
+                .placeholder(defaultImage)
                 .error(defaultImage)
         ).dontAnimate().into(mImageView)
     }
@@ -259,10 +257,9 @@ object GlideUtils {
         defaultImage: Int = R.mipmap.ic_my_avat
     ) {
         Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20").apply(
-            RequestOptions().transform(
-                CenterCrop(),
-                RoundedCorners(BubbleUtils.dp2px(10))
-            ).placeholder(defaultImage)
+            RequestOptions()
+                .transform(CenterCrop(), RoundedCorners(BubbleUtils.dp2px(10)))
+                .placeholder(defaultImage)
                 .error(defaultImage)
         ).dontAnimate().into(mImageView)
     }
@@ -287,4 +284,6 @@ object GlideUtils {
     fun loadHighRoundImageView(mContext: Context, path: String?, mImageView: ImageView) {
         Glide.with(mContext).load(path).dontAnimate().into(mImageView)
     }
+
+
 }
\ No newline at end of file

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/BasicUserProfileActivity.kt

@@ -5,7 +5,6 @@ import android.app.Activity
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.graphics.Color
-import android.media.AudioManager
 import android.os.Handler
 import android.os.Looper
 import android.text.TextUtils
@@ -197,9 +196,9 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
     }
 
     override fun initBasicSuc() {
-        LogUtil.d("mcg -->>>> initBasicSuc"+true)
+        LogUtil.d("mcg -->>>> initBasicSuc" + true)
         AppConfig.basicUserProfileFlag = true
-        ToastUtil.showLong(context,"填写完成")
+        ToastUtil.showLong(context, "填写完成")
         Handler(Looper.getMainLooper()).postDelayed({
             finish()
         }, 1000)

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/DrawCashActivity.kt

@@ -22,7 +22,6 @@ import com.duben.loveplayletd.ui.activitys.base.BaseActivity
 import com.duben.loveplayletd.utils.ToastUtil
 import kotlinx.android.synthetic.main.activity_drawcash.*
 import kotlinx.android.synthetic.main.header_layout.*
-import okhttp3.internal.notify
 
 /**
  *  @author Assen
@@ -169,7 +168,7 @@ class DrawCashActivity : BaseActivity(), View.OnClickListener, DrawCashView {
 
     override fun addCashoutReqSuc() {
 //        showToast("提现成功！")
-        ToastUtil.showLong(context,"提现已申请，请耐心等待!")
+        ToastUtil.showLong(context, "提现已申请，请耐心等待!")
         Handler(Looper.getMainLooper()).postDelayed({
             finish()
         }, 2500)

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/EditProfileActivity.kt

@@ -14,6 +14,7 @@ import android.view.View
 import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder
@@ -385,8 +386,27 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
     }
 
     private fun showAddressDialog() {
-        val provinceIndex = 0
-        val cityIndex = 0
+        var provinceIndex = 0
+        var cityIndex = 0
+
+        // 默认选中
+        if (!userProfileData?.findCity.isNullOrEmpty()) {
+            val careerArr = userProfileData?.findCity!!.split("-")
+            addressOptions1Items?.let {
+                for (i in 0 until it.size) {
+                    if (careerArr[0].isNotEmpty() && it[i].name == careerArr[0]) {
+                        provinceIndex = i
+                        for (j in 0 until it[i].cityList.size) {
+                            if (careerArr[1].isNotEmpty() && it[i].cityList[j].name == careerArr[1]) {
+                                cityIndex = j
+                                break
+                            }
+                        }
+                        break
+                    }
+                }
+            }
+        }
 
         // 弹出选择器
         val pvOptions =
@@ -403,8 +423,14 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
                 tvJyfw.text = tx
             }
                 .setSelectOptions(provinceIndex, cityIndex)
-                .setDividerColor(Color.BLACK)
-                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setTitleText("选择交友范围")
+                .setTitleColor(Color.WHITE)
+                .setTitleBgColor(ContextCompat.getColor(this, R.color.color_232122))
+                .setBgColor(ContextCompat.getColor(this, R.color.color_232122))
+                .setCancelColor(Color.WHITE)
+                .setSubmitColor(ContextCompat.getColor(this, R.color.color_E8CF83))
+                .setDividerColor(Color.LTGRAY)
+                .setTextColorCenter(Color.WHITE) //设置选中项文字颜色
                 .setContentTextSize(20)
                 .build<Any>()
 
@@ -416,8 +442,27 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
     }
 
     private fun showJobPick() {
-        val provinceIndex = 0
-        val cityIndex = 0
+        var firstIndex = 0
+        var secondIndex = 0
+
+        // 默认选中
+        if (!userProfileData?.career.isNullOrEmpty()) {
+            val careerArr = userProfileData?.career!!.split("-")
+            jobOptions1Items?.let {
+                for (i in 0 until it.size) {
+                    if (careerArr[0].isNotEmpty() && it[i].sort == careerArr[0]) {
+                        firstIndex = i
+                        for (j in 0 until it[i].name.size) {
+                            if (careerArr[1].isNotEmpty() && it[i].name[j] == careerArr[1]) {
+                                secondIndex = j
+                                break
+                            }
+                        }
+                        break
+                    }
+                }
+            }
+        }
 
         // 弹出选择器
         val pvOptions = OptionsPickerBuilder(this) { options1, options2, _, _ ->
@@ -432,9 +477,15 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
             userProfileData?.career = tx
             tvJob.text = tx
         }
-            .setSelectOptions(provinceIndex, cityIndex)
-            .setDividerColor(Color.BLACK)
-            .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+            .setSelectOptions(firstIndex, secondIndex)
+            .setTitleText("选择职业")
+            .setTitleColor(Color.WHITE)
+            .setTitleBgColor(ContextCompat.getColor(this, R.color.color_232122))
+            .setBgColor(ContextCompat.getColor(this, R.color.color_232122))
+            .setCancelColor(Color.WHITE)
+            .setSubmitColor(ContextCompat.getColor(this, R.color.color_E8CF83))
+            .setDividerColor(Color.LTGRAY)
+            .setTextColorCenter(Color.WHITE) //设置选中项文字颜色
             .setContentTextSize(20)
             .build<Any>()
 

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/RealAuthActivity.kt

@@ -9,6 +9,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder
@@ -363,8 +364,27 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
     }
 
     private fun showJobPick() {
-        val provinceIndex = 0
-        val cityIndex = 0
+        var firstIndex = 0
+        var secondIndex = 0
+
+        // 默认选中
+        if (!userProfileData?.career.isNullOrEmpty()) {
+            val careerArr = userProfileData?.career!!.split("-")
+            jobOptions1Items?.let {
+                for (i in 0 until it.size) {
+                    if (careerArr[0].isNotEmpty() && it[i].sort == careerArr[0]) {
+                        firstIndex = i
+                        for (j in 0 until it[i].name.size) {
+                            if (careerArr[1].isNotEmpty() && it[i].name[j] == careerArr[1]) {
+                                secondIndex = j
+                                break
+                            }
+                        }
+                        break
+                    }
+                }
+            }
+        }
 
         // 弹出选择器
         val pvOptions = OptionsPickerBuilder(this) { options1, options2, _, _ ->
@@ -379,9 +399,15 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
             userProfileData?.career = tx
             zyTv.text = tx
         }
-                .setSelectOptions(provinceIndex, cityIndex)
-                .setDividerColor(Color.BLACK)
-                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+            .setSelectOptions(firstIndex, secondIndex)
+            .setTitleText("选择职业")
+            .setTitleColor(Color.WHITE)
+            .setTitleBgColor(ContextCompat.getColor(this, R.color.color_232122))
+            .setBgColor(ContextCompat.getColor(this, R.color.color_232122))
+            .setCancelColor(Color.WHITE)
+            .setSubmitColor(ContextCompat.getColor(this, R.color.color_E8CF83))
+            .setDividerColor(Color.LTGRAY)
+            .setTextColorCenter(Color.WHITE) //设置选中项文字颜色
             .setContentTextSize(20)
             .build<Any>()
 
@@ -394,8 +420,27 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
     }
 
     private fun showAddressDialog() {
-        val provinceIndex = 0
-        val cityIndex = 0
+        var provinceIndex = 0
+        var cityIndex = 0
+
+        // 默认选中
+        if (!userProfileData?.findCity.isNullOrEmpty()) {
+            val careerArr = userProfileData?.findCity!!.split("-")
+            addressOptions1Items?.let {
+                for (i in 0 until it.size) {
+                    if (careerArr[0].isNotEmpty() && it[i].name == careerArr[0]) {
+                        provinceIndex = i
+                        for (j in 0 until it[i].cityList.size) {
+                            if (careerArr[1].isNotEmpty() && it[i].cityList[j].name == careerArr[1]) {
+                                cityIndex = j
+                                break
+                            }
+                        }
+                        break
+                    }
+                }
+            }
+        }
 
         // 弹出选择器
         val pvOptions =
@@ -412,8 +457,14 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
                 jyfwTv.text = tx
             }
                 .setSelectOptions(provinceIndex, cityIndex)
-                        .setDividerColor(Color.BLACK)
-                        .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setTitleText("选择交友范围")
+                .setTitleColor(Color.WHITE)
+                .setTitleBgColor(ContextCompat.getColor(this, R.color.color_232122))
+                .setBgColor(ContextCompat.getColor(this, R.color.color_232122))
+                .setCancelColor(Color.WHITE)
+                .setSubmitColor(ContextCompat.getColor(this, R.color.color_E8CF83))
+                .setDividerColor(Color.LTGRAY)
+                .setTextColorCenter(Color.WHITE) //设置选中项文字颜色
                 .setContentTextSize(20)
                 .build<Any>()
 

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/UserProfileActivity.kt

@@ -138,6 +138,15 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
             R.id.iv_head_more -> {
                 showToBlackDialog()
             }
+            R.id.iv_avatar_female -> {
+                userProfileData?.let {
+                    val bundle = Bundle()
+                    bundle.putStringArrayList(
+                        ImagePreviewActivity.IMAGE_PREVIEW_DATA, arrayListOf(it.headerUrl)
+                    )
+                    readyGo(ImagePreviewActivity::class.java, bundle)
+                }
+            }
             R.id.iv_like, R.id.tv_like_male -> {
                 userProfileData?.let {
                     if (!UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1) {
@@ -205,6 +214,7 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
         tv_chat.setOnClickListener(this)
         tv_like_male.setOnClickListener(this)
         iv_like.setOnClickListener(this)
+        iv_avatar_female.setOnClickListener(this)
     }
 
     override fun getMorePageSuc(data: UserProfileData) {

video/app/src/main/java/com/duben/loveplayletd/ui/adapter/SquareAdapter.kt

 package com.duben.loveplayletd.ui.adapter
 
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
+import android.content.Context
 import android.view.View
-import android.view.ViewGroup
-import android.view.ViewOutlineProvider
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
@@ -17,7 +14,6 @@ import com.duben.loveplayletd.R
 import com.duben.loveplayletd.manager.UserManager
 import com.duben.loveplayletd.mvp.model.HallList
 import com.google.gson.Gson
-import eightbitlab.com.blurview.BlurView
 
 class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layout.item_square) {
 
@@ -31,6 +27,11 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
         } else {
             holder.getView<TextView>(R.id.tv_recommend_location).text = "未知"
         }
+        if (isBlur) {
+            holder.getView<TextView>(R.id.tv_recommend_name).text = "****"
+        } else {
+            holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
+        }
 
         if (UserManager.getInstance().userSex == 2) {
             // 用户是女的，看的只有男的
@@ -50,25 +51,13 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
                 holder.getView<TextView>(R.id.tv_recommend_online).visibility = View.GONE
             }
 
-            val blurViewHead = holder.getView<BlurView>(R.id.item_blurview_head)
-            if (isBlur) {
-                holder.getView<TextView>(R.id.tv_recommend_name).text = "****"
-                blurViewHead.visibility = View.VISIBLE
-                blurViewHead.setupWith(holder.itemView as ViewGroup)
-                        .setFrameClearDrawable(holder.itemView.background)
-                        .setBlurRadius(10f)
-                blurViewHead.clipToOutline = true
-            } else {
-                holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
-                blurViewHead.visibility = View.GONE
-            }
-
-            GlideUtils.loadThumbRoundImageView(
-                    holder.itemView.context,
-                    item.headerUrl,
+            loadSquareImageView(
+                context, item.headerUrl,
                 holder.getView(R.id.iv_recommend_header),
+                isBlur,
                 R.mipmap.ic_default_avatar_male
             )
+
             holder.getView<TextView>(R.id.tv_status).visibility = View.GONE
             holder.getView<TextView>(R.id.tv_recommend_age).visibility = View.VISIBLE
             if (!item.age.isNullOrEmpty()) {
@@ -104,35 +93,14 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
             holder.getView<LinearLayout>(R.id.ll_recommend_root)
                 .setBackgroundResource(R.drawable.shape_bg_black)
 
-            GlideUtils.loadThumbRoundImageView(
-                    holder.itemView.context,
+            loadSquareImageView(
+                context,
                 item.headerUrl,
                 holder.getView(R.id.iv_recommend_header),
+                isBlur,
                 R.mipmap.ic_default_avatar_female
             )
 
-            val blurViewHead = holder.getView<BlurView>(R.id.item_blurview_head)
-            val blurViewImages = holder.getView<BlurView>(R.id.item_blurview_images)
-            if (isBlur) {
-                holder.getView<TextView>(R.id.tv_recommend_name).text = "****"
-                blurViewHead.visibility = View.VISIBLE
-                blurViewHead.setupWith(holder.itemView as ViewGroup)
-                        .setFrameClearDrawable(ColorDrawable(Color.RED))
-                        .setBlurRadius(10f)
-                blurViewImages.visibility = View.VISIBLE
-                blurViewImages.setupWith(holder.itemView as ViewGroup)
-                        .setFrameClearDrawable(ColorDrawable(Color.RED))
-                        .setBlurRadius(10f)
-                blurViewHead.outlineProvider = ViewOutlineProvider.BACKGROUND
-                blurViewHead.clipToOutline = true
-                blurViewImages.outlineProvider = ViewOutlineProvider.BACKGROUND
-                blurViewImages.clipToOutline = true
-            } else {
-                holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
-                blurViewHead.visibility = View.GONE
-                blurViewImages.visibility = View.GONE
-            }
-
             holder.getView<RelativeLayout>(R.id.rl_album).visibility = View.VISIBLE
             holder.getView<TextView>(R.id.tv_status).visibility = View.VISIBLE
             holder.getView<TextView>(R.id.tv_status).text = item.hallTime
@@ -155,12 +123,14 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
                 holder.getView<TextView>(R.id.tv_recommend_label2).visibility = View.GONE
             }
             if (!item.tagsCommon.isNullOrEmpty()) {
-                val array: Array<String> = gson.fromJson(item.tagsCommon, Array<String>::class.java)
+                val array: Array<String> =
+                    gson.fromJson(item.tagsCommon, Array<String>::class.java)
                 if (array.isNotEmpty()) {
                     holder.getView<TextView>(R.id.tv_recommend_label3).visibility = View.VISIBLE
                     holder.getView<TextView>(R.id.tv_recommend_label3).text = array[0]
                 } else {
-                    holder.getView<TextView>(R.id.tv_recommend_label3).visibility = View.INVISIBLE
+                    holder.getView<TextView>(R.id.tv_recommend_label3).visibility =
+                        View.INVISIBLE
                 }
             } else {
                 holder.getView<TextView>(R.id.tv_recommend_label3).visibility = View.INVISIBLE
@@ -183,14 +153,13 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
                         view1.visibility = View.VISIBLE
                         view2.visibility = View.VISIBLE
                         view3.visibility = View.VISIBLE
-                        GlideUtils.loadThumbRoundImageView(
-                                context, array[0], view1, 5f
-                        )
-                        GlideUtils.loadThumbRoundImageView(
-                                context, array[1], view2, 5f
-                        )
-                        GlideUtils.loadThumbRoundImageView(
-                                context, array[2], holder.getView(R.id.iv_photo_more), 5f
+                        loadSquareImageView(context, array[0], view1, isBlur)
+                        loadSquareImageView(context, array[1], view2, isBlur)
+                        loadSquareImageView(
+                            context,
+                            array[2],
+                            holder.getView(R.id.iv_photo_more),
+                            isBlur
                         )
                         holder.getView<TextView>(R.id.tv_more).visibility = View.VISIBLE
                         holder.getView<TextView>(R.id.tv_more).text = "+${array.size}"
@@ -198,21 +167,24 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
                         view1.visibility = View.VISIBLE
                         view2.visibility = View.VISIBLE
                         view3.visibility = View.VISIBLE
-                        GlideUtils.loadThumbRoundImageView(context, array[0], view1, 5f)
-                        GlideUtils.loadThumbRoundImageView(context, array[1], view2, 5f)
-                        GlideUtils.loadThumbRoundImageView(
-                                context, array[2], holder.getView(R.id.iv_photo_more), 5f
+                        loadSquareImageView(context, array[0], view1, isBlur)
+                        loadSquareImageView(context, array[1], view2, isBlur)
+                        loadSquareImageView(
+                            context,
+                            array[2],
+                            holder.getView(R.id.iv_photo_more),
+                            isBlur
                         )
                         holder.getView<TextView>(R.id.tv_more).visibility = View.GONE
                     } else if (array.size == 2) {
                         view1.visibility = View.VISIBLE
                         view2.visibility = View.VISIBLE
-                        GlideUtils.loadThumbRoundImageView(context, array[0], view1, 5f)
-                        GlideUtils.loadThumbRoundImageView(context, array[1], view2, 5f)
+                        loadSquareImageView(context, array[0], view1, isBlur)
+                        loadSquareImageView(context, array[1], view2, isBlur)
                         view3.visibility = View.GONE
                     } else if (array.size == 1) {
                         view1.visibility = View.VISIBLE
-                        GlideUtils.loadThumbRoundImageView(context, array[0], view1, 5f)
+                        loadSquareImageView(context, array[0], view1, isBlur)
                         view2.visibility = View.GONE
                         view3.visibility = View.GONE
                     }
@@ -241,10 +213,28 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
         }
     }
 
+    fun loadSquareImageView(
+        ctx: Context,
+        path: String,
+        iv: ImageView,
+        isBlur: Boolean,
+        defaultImage: Int = R.mipmap.ic_default_avatar_male
+    ) {
+        if (isBlur) {
+            GlideUtils.loadBlurImageView(ctx, path, iv)
+        } else {
+            GlideUtils.loadThumbRound2ImageView(ctx, path, iv, defaultImage)
+        }
+    }
+
     fun setIsBlur(isBlur: Boolean) {
         this.isBlur = isBlur
     }
 
+    fun isBlur(): Boolean {
+        return this.isBlur
+    }
+
     private var mOnClickLikeListener: OnClickLikeListener? = null
 
     fun setOnClickLikeListener(onClickLikeListener: OnClickLikeListener) {

video/app/src/main/java/com/duben/loveplayletd/ui/fragment/MyFragment.kt

@@ -144,7 +144,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
 
         if (data.expireTime > 0) {
             iv_vip_label.setImageResource(R.mipmap.ic_is_vip)
-            tv_vip_date.text = "限时五折起"
+            tv_vip_btn.text = "限时五折起"
             if (data.isForever) {
                 tv_vip_date.text = "有效期: 永久有效"
             } else {

video/app/src/main/java/com/duben/loveplayletd/ui/fragment/SquareListFragment.kt

@@ -64,6 +64,13 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
         squarePresenter.detachView()
     }
 
+    override fun onFragmentResume() {
+        super.onFragmentResume()
+        if (::squareAdapter.isInitialized && !squareAdapter.isBlur() && UserManager.getInstance().vipFlag) {
+            squareAdapter.setIsBlur(true)
+        }
+    }
+
     override fun onFragmentFirstVisible() {
         super.onFragmentFirstVisible()
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_TWO) {
@@ -80,8 +87,7 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
 
     private fun initRecy() {
         squareAdapter = SquareAdapter()
-        if (mType == 3 && !UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1
-        ) {
+        if (mType == 3 && !UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1) {
             squareAdapter.setIsBlur(true)
         } else {
             squareAdapter.setIsBlur(false)

video/app/src/main/java/com/duben/loveplayletd/ui/widgets/CustomRecyclerView.java

+package com.duben.loveplayletd.ui.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class CustomRecyclerView extends RecyclerView {
+
+    private float startY;
+    private static final int THRESHOLD = 10;
+
+    public CustomRecyclerView(Context context) {
+        super(context);
+    }
+
+    public CustomRecyclerView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomRecyclerView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                startY = ev.getY();
+                getParent().requestDisallowInterceptTouchEvent(true);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                float currentY = ev.getY();
+                float dy = currentY - startY;
+                if (dy < -THRESHOLD) {
+                    getParent().requestDisallowInterceptTouchEvent(false);
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                getParent().requestDisallowInterceptTouchEvent(false);
+                break;
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+}
\ No newline at end of file

video/app/src/main/java/com/duben/loveplayletd/ui/widgets/SquareImageView.java

@@ -3,9 +3,10 @@ package com.duben.loveplayletd.ui.widgets;
 import android.content.Context;
 import android.util.AttributeSet;
 
-public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView {
+import com.tencent.qcloud.tuikit.timcommon.component.RoundCornerImageView;
+
+public class SquareImageView extends RoundCornerImageView {
     float width, height;
-    private float radius = 5f;
 
     public SquareImageView(Context context) {
         super(context);

video/app/src/main/res/drawable/shape_square_label.xml

@@ -7,7 +7,7 @@
         android:startColor="#DD6470" />
 
     <corners
-        android:bottomRightRadius="10dp"
-        android:topLeftRadius="10dp" />
+        android:bottomRightRadius="5dp"
+        android:topLeftRadius="5dp" />
 
 </shape>
\ No newline at end of file

video/app/src/main/res/layout/activity_drawcash.xml

 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -307,7 +306,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="20dp"
                     android:layout_marginTop="10dp"
-                    android:layout_marginBottom="20dp"
+                    android:layout_marginBottom="80dp"
                     android:lineHeight="20dp"
                     android:text="1.当月提取总金额小于500元时，手续费2%;\n2.当月提取总金额大于500、小于5000元时，手续费5%;\n3.当月提取总金额大于5000元时，手续费10%"
                     android:textColor="@color/color_A5A5A7" />
@@ -323,7 +322,7 @@
             android:layout_gravity="bottom"
             android:layout_marginStart="30dp"
             android:layout_marginEnd="30dp"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="20dp"
             android:background="@drawable/shape_draw_cash_orange"
             android:elevation="2dp"
             android:text="提取奖励"

video/app/src/main/res/layout/activity_share.xml

@@ -84,7 +84,7 @@
 
                     <TextView
                         android:id="@+id/tv_share_img"
-                        android:layout_width="320dp"
+                        android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:background="@drawable/shape_share_btn"
                         android:elevation="2dp"

video/app/src/main/res/layout/activity_user_profile.xml

@@ -15,8 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/full_transparent"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:layout_behavior=".ui.widgets.AppBarLayoutBehavior">
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/toolbar_layout"
@@ -108,24 +107,26 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="10dp"
                         android:orientation="vertical">
 
                         <TextView
                             android:id="@+id/tv_album_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="30dp"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginTop="20dp"
                             android:text="相册"
                             android:textColor="@color/white"
                             android:textSize="18sp"
                             android:textStyle="bold" />
 
-                        <androidx.recyclerview.widget.RecyclerView
+                        <com.duben.loveplayletd.ui.widgets.CustomRecyclerView
                             android:id="@+id/rcy_profile_album"
                             android:layout_width="match_parent"
                             android:layout_height="120dp"
-                            android:layout_marginTop="10dp" />
+                            android:layout_marginTop="10dp"
+                            android:paddingStart="5dp"
+                            android:paddingEnd="5dp" />
 
                     </LinearLayout>
 
@@ -354,7 +355,6 @@
             android:id="@+id/tv_chat"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginEnd="15dp"
             android:layout_weight="1"
             android:background="@drawable/shape_profile_chat"
             android:drawablePadding="-40dp"

video/app/src/main/res/layout/item_square.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/ll_recommend_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -18,32 +15,27 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
-            <ImageView
+        <com.tencent.qcloud.tuikit.timcommon.component.RoundCornerImageView
             android:id="@+id/iv_recommend_header"
             android:layout_width="110dp"
-                android:layout_height="110dp" />
+            android:layout_height="110dp"
+            android:scaleType="centerCrop"
+            app:corner_radius="5dp" />
 
         <TextView
             android:id="@+id/tv_real_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/shape_square_label"
-                android:paddingStart="4dp"
+            android:paddingStart="6dp"
             android:paddingTop="2dp"
-                android:paddingEnd="4dp"
+            android:paddingEnd="6dp"
             android:paddingBottom="2dp"
             android:text="真人"
             android:textColor="@color/white"
             android:textSize="10sp"
             android:visibility="gone" />
 
-            <eightbitlab.com.blurview.BlurView
-                android:id="@+id/item_blurview_head"
-                android:layout_width="110dp"
-                android:layout_height="110dp"
-                android:background="@drawable/shape_blur_round"
-                android:visibility="gone" />
-
     </FrameLayout>
 
     <FrameLayout
@@ -215,14 +207,18 @@
                 <com.duben.loveplayletd.ui.widgets.SquareImageView
                     android:id="@+id/iv_photo1"
                     android:layout_width="wrap_content"
-                        android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    app:corner_radius="5dp" />
 
                 <com.duben.loveplayletd.ui.widgets.SquareImageView
                     android:id="@+id/iv_photo2"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="4dp"
-                        android:layout_toEndOf="@id/iv_photo1" />
+                    android:layout_toEndOf="@id/iv_photo1"
+                    android:scaleType="centerCrop"
+                    app:corner_radius="5dp" />
 
                 <FrameLayout
                     android:id="@+id/fl_photo_more"
@@ -234,7 +230,9 @@
                     <com.duben.loveplayletd.ui.widgets.SquareImageView
                         android:id="@+id/iv_photo_more"
                         android:layout_width="wrap_content"
-                            android:layout_height="match_parent" />
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        app:corner_radius="5dp" />
 
                     <TextView
                         android:id="@+id/tv_more"
@@ -259,12 +257,6 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                    <eightbitlab.com.blurview.BlurView
-                        android:id="@+id/item_blurview_images"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="gone" />
-
             </RelativeLayout>
 
         </LinearLayout>
@@ -281,5 +273,4 @@
 
     </FrameLayout>
 
-    </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
\ No newline at end of file

video/app/src/main/res/layout/item_user_profile_album.xml

@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="10dp">
+    android:layout_marginStart="5dp">
 
     <ImageView
         android:id="@+id/iv_photo"

video/app/src/main/res/layout/layout_user_profile_head.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/head_container"
     android:layout_width="match_parent"
-    android:layout_height="80dp">
+    android:layout_height="match_parent">
 
     <View
         android:id="@+id/v_bar"
@@ -25,7 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        app:layout_collapseParallaxMultiplier="0.5"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

video/build.gradle

@@ -25,7 +25,6 @@ buildscript {
         classpath "com.mob.sdk:MobSDK:+"
         classpath 'com.huawei.agconnect:agcp:1.6.0.300'
         classpath 'com.hihonor.mcs:asplugin:2.0.1.300'
-        classpath 'com.google.gms:google-services:4.3.15'
     }
 }