代码优化

video/app/src/main/java/com/duben/loveplayletd/mvp/model/UserBean.java

@@ -28,6 +28,7 @@ public class UserBean implements Serializable {
     private int idcardStatus;//认证状态，1 已认证
     private int beans;//金币，买各种虚拟资产证
     private int rewardCoin;//奖励金额
+    private int planSex;//1男2女，0没匹配上
     private String city;//城市
     private String age;//年龄
     private String headerUrl;//头像
@@ -207,4 +208,12 @@ public class UserBean implements Serializable {
     public int getActiviteFlag() {
         return activiteFlag;
     }
+
+    public int getPlanSex() {
+        return planSex;
+    }
+
+    public void setPlanSex(int planSex) {
+        this.planSex = planSex;
+    }
 }

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

@@ -65,7 +65,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
             }
             if (!TextUtils.isEmpty(userManager?.userID)) {
                 myPresenter.getBaseMsg()
-                myPresenter.getUserHallMsg()
+
             } else {
                 myPresenter.userLogin()
             }
@@ -77,7 +77,10 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
 
         when (v?.id) {
             R.id.ll_edit_profile, R.id.civ_my_avatar -> {
-                readyGo(EditProfileActivity::class.java)
+                if(UserManager.getInstance().newFlag){
+                    readyGo(EditProfileActivity::class.java)
+                }
+
             }
             R.id.rl_my_vip -> {
                 if (!userManager.vipFlag) {
@@ -157,24 +160,44 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
             tv_vip_btn.text = "立即升级"
         }
 
-        if (data.sex == 1) {
-            // 男性无认证页面
-            ll_my_auth.visibility = View.GONE
-            // 男性展示充值的金币
-            tv_my_coin.text = "" + data.beans
-        } else {
-            if (data.idcardStatus == 2 || data.idcardStatus == 0) {
-                ll_my_auth.visibility = View.VISIBLE
-            }
-            // 女性展示奖励的金币
-            tv_my_coin.text = "" + data.rewardCoin
+        if (data.activiteFlag == 1) {
+            // 匹配
+            if (data.sex == 1) {
+                // 男性无认证页面
+                ll_my_auth.visibility = View.GONE
+                // 男性展示充值的金币
+                tv_my_coin.text = "" + data.beans
+            } else {
+                if (data.idcardStatus == 2 || data.idcardStatus == 0) {
+                    ll_my_auth.visibility = View.VISIBLE
+                }
+                // 女性展示奖励的金币
+                tv_my_coin.text = "" + data.rewardCoin
 //            if (data.idcardStatus == 0) {
 //                // 女性展示认证页面
 //                ll_my_auth.visibility = View.VISIBLE
 //            } else {
 //                ll_my_auth.visibility = View.GONE
 //            }
+            }
+
+            tv_edit_profile.visibility=View.VISIBLE
+            ll_my_likeroot.visibility=View.VISIBLE
+            ll_my_wallet.visibility=View.VISIBLE
+            ll_my_invite.visibility=View.VISIBLE
+            ll_my_album.visibility=View.VISIBLE
+            ll_my_auth.visibility=View.VISIBLE
+
+            myPresenter.getUserHallMsg()
+        }else{
+            tv_edit_profile.visibility=View.GONE
+            ll_my_likeroot.visibility=View.GONE
+            ll_my_wallet.visibility=View.GONE
+            ll_my_invite.visibility=View.GONE
+            ll_my_album.visibility=View.GONE
+            ll_my_auth.visibility=View.GONE
         }
+
     }
 
     override fun getUserHallMsgSuc(data: UserHallMsg) {

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

@@ -343,10 +343,10 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
     }
 
     override fun getBaseMsgSuc(data: UserBean) {
-        if (data.sex == 1) {
+        if (data.planSex == 1) {
             // 男
             ll_user_root.visibility = View.GONE
-        } else {
+        } else if(data.planSex == 2){
             // 女
             if (AppConfig.basicUserProfileFlag || UserManager.getInstance().userHasBasic()) {
                 ll_user_root.visibility = View.GONE

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

@@ -95,6 +95,7 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/ll_my_likeroot"
                     android:layout_width="match_parent"
                     android:layout_height="100dp"
                     android:gravity="center_vertical"