瀏覽代碼

1.添加退出登录功能

王鹏鹏 2 年之前
父節點
當前提交
2c055be6c8

+ 1 - 4
game/src/main/res/layout/activity_game_introduction.xml

@@ -174,17 +174,15 @@
                         android:textColor="@color/color_FFA54A0B"
                         android:textSize="@dimen/divider_22px"
                         app:layout_constraintBottom_toTopOf="@+id/tvTrainingSkill"
-                        app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/tvScientificPrinciple" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/tvTrainingSkill"
-                        android:layout_width="@dimen/divider_180px"
+                        android:layout_width="wrap_content"
                         android:layout_height="@dimen/divider_53px"
                         android:layout_marginTop="@dimen/divider_10px"
                         android:layout_marginBottom="@dimen/divider_86px"
-                        android:background="@drawable/bg_scientific_principle"
                         android:fontFamily="@font/lcb"
                         android:gravity="center"
                         android:includeFontPadding="false"
@@ -192,7 +190,6 @@
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_26px"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent" />
 
                     <androidx.appcompat.widget.AppCompatTextView

+ 3 - 2
login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -256,11 +256,12 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
         val m: Long = 1000
         binding.tvCode.text = setTvSendColor("重新发送(${time}s)")
         rxTimer.interval(m) {
-            binding.tvCode.text = setTvSendColor("重新发送(${time - 1 - it}s)")
             if (it == time - 1) {
-                binding.tvCode.text = "重新发送"
                 rxTimer.cancel()
+                binding.tvCode.text = "重新发送"
                 binding.tvCode.isClickable = true
+            } else{
+                binding.tvCode.text = setTvSendColor("重新发送(${time - 1 - it}s)")
             }
         }
     }