代码优化

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

@@ -25,7 +25,7 @@ public class UserBean implements Serializable {
     private int sex;// 性别
     private String shareCode;// 分享码
     private boolean hasBase;// 是否填写基础资料
-    private int idcardStatus;//认证状态，1 已认证
+    private int idcardStatus;//认证状态，0-未认证  1 已认证  2-认证中
     private int beans;//金币，买各种虚拟资产证
     private int rewardCoin;//奖励金额
     private int planSex;//1男2女，0没匹配上

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

@@ -28,10 +28,7 @@ import com.duben.loveplayletd.manager.UserManager
 import com.duben.loveplayletd.mvp.model.*
 import com.duben.loveplayletd.mvp.presenters.SquarePresenter
 import com.duben.loveplayletd.mvp.views.SquareView
-import com.duben.loveplayletd.ui.activitys.BasicUserProfileActivity
-import com.duben.loveplayletd.ui.activitys.ShareActivity
-import com.duben.loveplayletd.ui.activitys.VipActivity
-import com.duben.loveplayletd.ui.activitys.WebActivity
+import com.duben.loveplayletd.ui.activitys.*
 import com.duben.loveplayletd.ui.adapter.*
 import com.duben.loveplayletd.ui.fragment.base.LazyLoadBaseFragment
 import com.duben.loveplayletd.ui.widgets.DialogListener
@@ -63,6 +60,7 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
     private var vpAdapter: SquarePageAdapter? = null
     private var isShowLocationFlag = false
     private var isGetCity = false
+    private var idStatus = 0
 
     private var newGirlDialog: NewGirlDialog? = null
 
@@ -343,20 +341,23 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
     }
 
     override fun getBaseMsgSuc(data: UserBean) {
+        this.idStatus = data.idcardStatus
         if (data.planSex == 1) {
             // 男
             ll_user_root.visibility = View.GONE
+            if (!UserManager.getInstance().userHasBasic()) {
+                val intent = Intent(requireContext(), BasicUserProfileActivity::class.java)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                startActivity(intent)
+            }
         } else if (data.planSex == 2) {
             // 女
-            if (AppConfig.basicUserProfileFlag || UserManager.getInstance().userHasBasic()) {
-                ll_user_root.visibility = View.GONE
-//                if (data.idcardStatus == 0) {
-//                    Handler(Looper.getMainLooper()).postDelayed({
-//                        UserHelper.instance.showRealAuthDialog()
-//                    }, 500)
-//                }
-            } else {
+            // 认证状态，0-未认证  1 已认证  2-认证中
+            if (idStatus == 0) {
+                // 未认证
                 ll_user_root.visibility = View.VISIBLE
+            } else {
+                ll_user_root.visibility = View.GONE
             }
         }
     }
@@ -383,9 +384,20 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
                 requestPermissions()
             }
             R.id.ll_user_root -> {
-                val intent = Intent(requireContext(), BasicUserProfileActivity::class.java)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                startActivity(intent)
+                if (!UserManager.getInstance().userHasBasic()) {
+                    val intent = Intent(requireContext(), BasicUserProfileActivity::class.java)
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    startActivity(intent)
+                    return
+                }
+
+                if (idStatus == 0) {
+                    val intent = Intent(requireContext(), RealAuthActivity::class.java)
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    startActivity(intent)
+                    return
+                }
+
             }
             R.id.iv_user_quit -> {
                 ll_user_root.visibility = View.GONE