王鹏鹏 před 2 roky
rodič
revize
07b915d2a1

+ 11 - 6
home/src/main/java/com/yingyangfly/home/evaluation/BindingEvaluationActivity.kt

@@ -61,7 +61,9 @@ class BindingEvaluationActivity :
                 v.startAnimation(getEndAnimation())
                 when (v.id) {
                     R.id.loginOutLayout -> {
-                        showTipsDialog()
+                        if (TextUtils.isEmpty(User.getToken()).not()) {
+                            showTipsDialog()
+                        }
                     }
                     R.id.searchLayout -> {
                         JumpUtil.jumpActivity(RouterUrlCommon.evaluationHistory, mContext)
@@ -94,7 +96,8 @@ class BindingEvaluationActivity :
         }, success = {
             runOnUiThread {
                 binding.tvPhone.text = ""
-                binding.loginOutLayout.show(false)
+                binding.imageLoginOut.show(false)
+                binding.tvLoginOut.show(false)
                 User.saveToken("")
                 User.savePhone("")
                 showBindingPhoneDialog()
@@ -151,10 +154,12 @@ class BindingEvaluationActivity :
     override fun onResume() {
         super.onResume()
         if (TextUtils.isEmpty(User.getToken())) {
-            binding.loginOutLayout.show(false)
+            binding.imageLoginOut.show(false)
+            binding.tvLoginOut.show(false)
             showBindingPhoneDialog()
         } else {
-            binding.loginOutLayout.show(true)
+            binding.imageLoginOut.show(true)
+            binding.tvLoginOut.show(true)
             binding.tvPhone.text = if (TextUtils.isEmpty(User.getPhone()).not()) {
                 "手机号:" + hideMiddleDigits(User.getPhone())
             } else {
@@ -170,8 +175,8 @@ class BindingEvaluationActivity :
     private fun showBindingPhoneDialog() {
         val bindingPhoneDialog = BindingPhoneDialog()
         bindingPhoneDialog.onDialogClickListener = {
-            binding.loginOutLayout.show(true)
-            binding.loginOutLayout.show(true)
+            binding.imageLoginOut.show(true)
+            binding.tvLoginOut.show(true)
             binding.tvPhone.text = "手机号:" + hideMiddleDigits(it)
         }
         bindingPhoneDialog.show(supportFragmentManager, "bindingPhoneDialog")

+ 6 - 3
home/src/main/res/layout/activity_binding_evaluation.xml

@@ -30,24 +30,27 @@
             android:orientation="vertical"
             android:paddingStart="@dimen/divider_48px"
             android:paddingEnd="@dimen/divider_48px"
-            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/imageLoginOut"
                 android:layout_width="@dimen/divider_59px"
                 android:layout_height="@dimen/divider_53px"
                 android:background="@mipmap/icon_evaluation_login_out"
-                android:scaleType="centerInside" />
+                android:scaleType="centerInside"
+                android:visibility="gone" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvLoginOut"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_10px"
                 android:text="退出绑定"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:visibility="gone" />
         </LinearLayout>
 
         <LinearLayout