Merge branch 'aiduanju_250123' of...

Merge branch 'aiduanju_250123' of http://gitlab.mints-id.com/android/android_vediosocial into aiduanju_250123

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/mvp/model/DynamicsEntity.kt

+package com.duben.loveplayletd.mvp.model
+
+import com.chad.library.adapter.base.entity.MultiItemEntity
+
+const val Dynamics_Item_Text = 1
+const val Dynamics_Item_IMAGE = 2
+const val Dynamics_Item_VIDEO = 3
+
+data class DynamicsEntity(
+    override val itemType: Int,
+    var text: String? = "",
+    var imageUrl: String? = "",
+    var videoUrl: String? = "",
+) : MultiItemEntity

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
@@ -148,7 +147,7 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
 
 
                 if (UserHelper.instance.isBpkg() && !isHaveGuid && et_ruid_code.text.toString()
-                                .isNotEmpty()
+                        .isNotEmpty()
                 ) {
                     basicUserProfilePresenter.updateRuserShareCode(et_ruid_code.text.toString())
                 }
@@ -167,12 +166,12 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
 
     private fun showAgePickDialog() {
         mSinglePickDialog = SinglePickDialog(
-                this, UserProfile.PROFILE_NL.str,
-                getAgePickerData(),
-                "1990"
+            this, UserProfile.PROFILE_NL.str,
+            getAgePickerData(),
+            "1990"
         )
         mSinglePickDialog?.setPickResultListener(object :
-                SinglePickDialog.OnPickResultListener {
+            SinglePickDialog.OnPickResultListener {
             override fun onPickResult(result: String) {
                 tv_age.text = result
             }
@@ -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)
@@ -218,42 +217,42 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
     private fun showAlbum() {
         val windowAnimationStyle = PictureWindowAnimationStyle()
         windowAnimationStyle.ofAllAnimation(
-                com.luck.picture.lib.R.anim.picture_anim_up_in,
-                com.luck.picture.lib.R.anim.picture_anim_down_out
+            com.luck.picture.lib.R.anim.picture_anim_up_in,
+            com.luck.picture.lib.R.anim.picture_anim_down_out
         )
 
         PermissionX.init(this)
-                .permissions(
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
+            .permissions(
+                Manifest.permission.READ_EXTERNAL_STORAGE,
 //                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.CAMERA
-                )
-                .request { allGranted: Boolean, _: List<String?>?, _: List<String?>? ->
-                    if (allGranted) {
-                        val isEnableCrop = true
-                        PictureSelector.create(this)
-                                .openGallery(PictureMimeType.ofImage())
-                                .theme(R.style.picture_WeChat_style) // 微信主题色
-                                .isWeChatStyle(true) // 微信样式
-                                .isCamera(true) //列表是否显示拍照按钮
-                                .isZoomAnim(false)//图片选择缩放效果
-                                .isEnableCrop(isEnableCrop)//是否开启裁剪
-                                .setPictureWindowAnimationStyle(windowAnimationStyle)
-                                .withAspectRatio(4, 4)
-                                .isCompress(true)//是否压缩
-                                .compressFocusAlpha(false)//压缩后是否保持图片的透明通道
-                                .minimumCompressSize(200)// 小于多少kb的图片不压缩
-                                .compressQuality(60)//图片压缩后输出质量
-                                .synOrAsy(true)//开启同步or异步压缩
-                                .maxSelectNum(10)
-                                .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)//屏幕旋转方向
-                                .selectionMode(PictureConfig.SINGLE)//单选or多选
-                                .imageEngine(GlideEngine.createGlideEngine())// 图片加载引擎
-                                .forResult(PictureConfig.CHOOSE_REQUEST)
-                    } else {
-                        showMissingPermissionDialog("位置 相机")
-                    }
+                Manifest.permission.CAMERA
+            )
+            .request { allGranted: Boolean, _: List<String?>?, _: List<String?>? ->
+                if (allGranted) {
+                    val isEnableCrop = true
+                    PictureSelector.create(this)
+                        .openGallery(PictureMimeType.ofImage())
+                        .theme(R.style.picture_WeChat_style) // 微信主题色
+                        .isWeChatStyle(true) // 微信样式
+                        .isCamera(true) //列表是否显示拍照按钮
+                        .isZoomAnim(false)//图片选择缩放效果
+                        .isEnableCrop(isEnableCrop)//是否开启裁剪
+                        .setPictureWindowAnimationStyle(windowAnimationStyle)
+                        .withAspectRatio(4, 4)
+                        .isCompress(true)//是否压缩
+                        .compressFocusAlpha(false)//压缩后是否保持图片的透明通道
+                        .minimumCompressSize(200)// 小于多少kb的图片不压缩
+                        .compressQuality(60)//图片压缩后输出质量
+                        .synOrAsy(true)//开启同步or异步压缩
+                        .maxSelectNum(10)
+                        .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)//屏幕旋转方向
+                        .selectionMode(PictureConfig.SINGLE)//单选or多选
+                        .imageEngine(GlideEngine.createGlideEngine())// 图片加载引擎
+                        .forResult(PictureConfig.CHOOSE_REQUEST)
+                } else {
+                    showMissingPermissionDialog("位置 相机")
                 }
+            }
     }
 
     /**
@@ -276,13 +275,13 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
             @Throws(Exception::class)
             override fun doInBackground(): List<File> {
                 return Luban.with(mContext)
-                        .loadMediaData<LocalMedia>(arrayListOf(media))
-                        .ignoreBy(200)
-                        .isCamera(false)
-                        .setCompressQuality(80)
-                        .setTargetDir(null)
-                        .setFocusAlpha(false)
-                        .setNewCompressFileName(newFileName).get()
+                    .loadMediaData<LocalMedia>(arrayListOf(media))
+                    .ignoreBy(200)
+                    .isCamera(false)
+                    .setCompressQuality(80)
+                    .setTargetDir(null)
+                    .setFocusAlpha(false)
+                    .setNewCompressFileName(newFileName).get()
             }
 
             override fun onSuccess(files: List<File>) {
@@ -331,7 +330,7 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
                     // 相册获取图片
                     PictureConfig.CHOOSE_REQUEST -> {
                         val selectList: List<LocalMedia> =
-                                PictureSelector.obtainMultipleResult(data)
+                            PictureSelector.obtainMultipleResult(data)
                         val img = selectList[0]
                         uploadOss(img.compressPath, OssType.PHOTO.type)
                     }

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/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) {
@@ -392,6 +402,7 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
         layoutManager.orientation = LinearLayoutManager.HORIZONTAL
         rcy_profile_album.layoutManager = layoutManager
         rcy_profile_album.adapter = userProfileAlbumAdapter
+        rcy_profile_album.isNestedScrollingEnabled = false
     }
 
     override fun getMorePageFail() {

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

+package com.duben.loveplayletd.ui.adapter
+
+import android.view.View
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.duben.loveplayletd.R
+import com.duben.loveplayletd.mvp.model.*
+
+class DynamicsAdapter : BaseMultiItemQuickAdapter<DynamicsEntity, BaseViewHolder>() {
+
+    init {
+        addItemType(Dynamics_Item_Text, R.layout.item_dynamics_text)
+        addItemType(Dynamics_Item_IMAGE, R.layout.item_dynamics_image)
+        addItemType(Dynamics_Item_VIDEO, R.layout.item_dynamics_video)
+    }
+
+    override fun convert(holder: BaseViewHolder, item: DynamicsEntity) {
+        when (holder.itemViewType) {
+            Dynamics_Item_Text -> {
+                initTextHolder(holder)
+            }
+            Dynamics_Item_IMAGE -> {
+                initImageHolder(holder)
+            }
+            Dynamics_Item_VIDEO -> {
+                initVideoHolder(holder)
+            }
+        }
+    }
+
+    private fun initTextHolder(holder: BaseViewHolder) {
+
+    }
+
+    private fun initImageHolder(holder: BaseViewHolder) {
+
+    }
+
+    private fun initVideoHolder(holder: BaseViewHolder) {
+
+    }
+
+    private var mOnCustomChildClickListener: OnCustomChildClickListener? = null
+
+    fun setOnCustomChildClickListener(onCustomChildClickListener: OnCustomChildClickListener) {
+        this.mOnCustomChildClickListener = onCustomChildClickListener
+    }
+
+    interface OnCustomChildClickListener {
+        fun onCustomChildClick(view: View, str: String)
+    }
+
+}
\ No newline at end of file

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

+package com.duben.loveplayletd.ui.fragment
+
+import android.view.View
+import com.duben.library.utils.nodoubleclick.AntiShake
+import com.duben.loveplayletd.R
+import com.duben.loveplayletd.ui.fragment.base.LazyLoadBaseFragment
+
+/**
+ *  @author Assen
+ *  @date 2025/2/6
+ *  @desc 动态
+ */
+class DynamicsFragment : LazyLoadBaseFragment(), View.OnClickListener {
+
+    override fun initViewsAndEvents() {
+        initDynamicsAdapter()
+    }
+
+    private fun initDynamicsAdapter() {
+
+    }
+
+    override fun getContentViewLayoutID() = R.layout.fragment_main_dynamics
+
+    override fun onClick(v: View?) {
+        if (AntiShake.check(v?.id)) return
+        when (v?.id) {
+
+        }
+    }
+}
\ No newline at end of file

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/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,14 +107,14 @@
                     <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"
@@ -125,7 +124,9 @@
                             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/fragment_main_dynamics.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/bg_female"
+    android:orientation="vertical"
+    android:paddingTop="20dp">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rcy_dynamic"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="6dp">
+
+
+
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="6dp">
+
+
+
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="6dp">
+
+
+
+</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'
     }
 }