主播评级:入口UI修改

app/src/main/java/com/mango/moshen/home/dialog/AnchorGradeDialog.kt

@@ -112,8 +112,8 @@ class AnchorGradeDialog : BaseDialog<DialogAnchorGradeBinding>() {
                     binding.tvRemainingTime.text = nextRemaining
 
                     if (it.nextRemaining - seconds.toInt() <= 0) {
-                        meViewModel.getAnchorGradeInfo()
                         disposable?.dispose()
+                        dismissAllowingStateLoss()
                     }
                 }
 

app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt

@@ -214,6 +214,7 @@ class MeFragment : BaseFragment(), View.OnClickListener {
                 meViewModel.getAnchorGradeInfo()
             } else {
                 mBinding.tvAnchorGrade.isVisible = false
+                mBinding.meItemSkill.isVisible = !(mUserInfo?.isParentMode ?: false)
             }
         }
 
@@ -225,6 +226,7 @@ class MeFragment : BaseFragment(), View.OnClickListener {
                         "主播评级入口曝光"
                     )
                 mBinding.tvAnchorGrade.isVisible = true
+                mBinding.meItemSkill.isVisible = false
                 anchorDrawableResIds[it.grade.toUpperCase(Locale.getDefault())]?.let { resId ->
                     mBinding.tvAnchorGrade.setBackgroundResource(resId)
                 }
@@ -236,6 +238,9 @@ class MeFragment : BaseFragment(), View.OnClickListener {
                         AnchorGradeDialog.newInstance().show(mContext)
                     }
                 }
+            } ?: run {
+                mBinding.tvAnchorGrade.isVisible = false
+                mBinding.meItemSkill.isVisible = !(mUserInfo?.isParentMode ?: false)
             }
         }
 
@@ -376,7 +381,9 @@ class MeFragment : BaseFragment(), View.OnClickListener {
             initNewUserCharge(it)
             setWalletInfo()
             mBinding.flPmMode.isVisible = it.isParentMode
-            mBinding.meItemSkill.isVisible = !it.isParentMode
+            if (it.isParentMode) {
+                mBinding.meItemSkill.isVisible = false
+            }
             it.userHeadwear?.effect?.let { effect ->
                 if (mBinding.ivHeadWear.tag != effect) {
                     NobleUtil.loadHeadWear(effect, mBinding.ivHeadWear)

app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt

@@ -47,6 +47,7 @@ import com.mango.core.user.bean.UserInfoSkillEntity
 import com.mango.core.utils.net.BeanObserver
 import com.mango.core.utils.net.RxHelper
 import com.mango.xchat_android_library.annatation.ActLayoutRes
+import com.netease.nim.uikit.common.util.sys.ScreenUtil
 
 
 @ActLayoutRes(R.layout.fragment_userinfo_userinfo)
@@ -146,8 +147,8 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         val magicIndicator: MagicIndicator = binding.magicIndicatorGift
         val fragmentList: MutableList<Fragment> = ArrayList(2)
         //礼物类型 1:普通礼物;2:辛运礼物
-        fragmentList.add(UserInfoGiftFragment.newInstance(1,false))
-        fragmentList.add(UserInfoGiftFragment.newInstance(2,false))
+        fragmentList.add(UserInfoGiftFragment.newInstance(1, false))
+        fragmentList.add(UserInfoGiftFragment.newInstance(2, false))
         val pagerAdapter = UserInfoPagerAdapter(childFragmentManager, fragmentList)
         val tagList: MutableList<String> = ArrayList(2)
         tagList.add("普通礼物")
@@ -244,6 +245,13 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         drawable.cornerRadius = conner.toFloat()
         drawable.setColor(Color.parseColor("#F4F7FF"))
         textView.background = drawable
+        if (vm.userId == AuthModel.get().currentUid) {
+            textView.setOnClickListener {
+                SkillHomeActivity.start(mContext, PAGE_TYPE_SELF, vm.userId)
+            }
+            textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.arrow_right, 0)
+            textView.setPadding(0, 0, ScreenUtil.dip2px(10f), 0)
+        }
         return textView
     }
 

app/src/main/res/layout/fragment_me.xml

@@ -44,7 +44,7 @@
                 android:id="@+id/me_item_setting"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_marginTop="36dp"
+                android:layout_marginTop="56dp"
                 android:layout_marginEnd="@dimen/dp_5"
                 android:onClick="@{click}"
                 android:orientation="horizontal"
@@ -63,12 +63,13 @@
             <!--个人信息-->
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/rl_user_info"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
+                android:layout_marginTop="10dp"
                 android:onClick="@{click}"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginEnd="100dp"
                 app:layout_constraintTop_toTopOf="@id/me_item_setting">
 
                 <com.mango.moshen.common.widget.CircleImageView
@@ -110,8 +111,8 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="30dp"
-                    app:layout_constraintEnd_toStartOf="@id/me_item_skill"
                     app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/iv_head_wear"
                     app:layout_constraintTop_toTopOf="@id/iv_head_wear">
 
@@ -238,45 +239,45 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <TextView
-                    android:id="@+id/tv_anchor_grade"
-                    android:layout_width="91dp"
-                    android:layout_height="28dp"
-                    android:layout_marginBottom="16dp"
-                    android:background="@drawable/anchor_grade_bg_me_s"
-                    android:fontFamily="sans-serif"
-                    android:gravity="center_vertical|end"
-                    android:paddingTop="2dp"
-                    android:paddingEnd="7dp"
-                    android:text="主播评级"
-                    android:textColor="@color/black"
-                    android:textSize="12sp"
-                    android:visibility="gone"
-                    app:layout_constraintBottom_toTopOf="@id/me_item_skill"
-                    app:layout_constraintEnd_toEndOf="parent" />
-
-                <TextView
-                    android:id="@+id/me_item_skill"
-                    android:layout_width="wrap_content"
-                    android:layout_height="28dp"
-                    android:layout_marginBottom="10dp"
-                    android:background="@drawable/shape_white_left_100dp"
-                    android:drawableStart="@mipmap/icon_skill_card"
-                    android:drawablePadding="5dp"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:onClick="@{click}"
-                    android:paddingStart="9dp"
-                    android:paddingEnd="5dp"
-                    android:text="技能卡"
-                    android:textColor="@color/color_333333"
-                    android:textSize="12sp"
-                    android:visibility="invisible"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <TextView
+                android:id="@+id/tv_anchor_grade"
+                android:layout_width="91dp"
+                android:layout_height="38dp"
+                android:layout_marginTop="32dp"
+                android:background="@drawable/anchor_grade_bg_me_s"
+                android:fontFamily="sans-serif"
+                android:gravity="center_vertical|end"
+                android:paddingTop="2dp"
+                android:paddingEnd="7dp"
+                android:text="主播评级"
+                android:textColor="@color/black"
+                android:textSize="12sp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/rl_user_info" />
+
+            <TextView
+                android:id="@+id/me_item_skill"
+                android:layout_width="wrap_content"
+                android:layout_height="28dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/shape_white_left_100dp"
+                android:drawableStart="@mipmap/icon_skill_card"
+                android:drawablePadding="5dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:onClick="@{click}"
+                android:paddingStart="9dp"
+                android:paddingEnd="5dp"
+                android:text="技能卡"
+                android:textColor="@color/color_333333"
+                android:textSize="12sp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@id/rl_user_info"
+                app:layout_constraintEnd_toEndOf="parent" />
+
             <LinearLayout
                 android:id="@+id/ll_user_relation"
                 android:layout_width="match_parent"