短信登录优化

app/src/main/java/cn/yunliyunwai/beyondclouds/ui/login/LoginActivity.java

@@ -131,13 +131,15 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
             public void onChanged(AuthenticationViewModel.VerifyCodeState verifyCodeState) {
                 if (verifyCodeState == AuthenticationViewModel.VerifyCodeState.UN_SEND) {
                     binding.btnSendVerifyCode.setText("发送验证码");
-                    binding.btnSendVerifyCode.setTextColor(0xff75d098);
+                    binding.btnSendVerifyCode.setTextColor(getResources().getColor(R.color.colorSendVerifyCode));
                     binding.btnSendVerifyCode.setEnabled(true);
+                    binding.txtSeconds.setVisibility(View.GONE);
                     return;
                 } else {
                     binding.btnSendVerifyCode.setEnabled(false);
-                    binding.btnSendVerifyCode.setTextColor(0xffaaaaaa);
+                    binding.btnSendVerifyCode.setTextColor(getResources().getColor(R.color.colorTextLevel5));
                     verifyCodeScheduledFuture = authenticationViewModel.startVerifyCodeCountdown();
+                    binding.txtSeconds.setVisibility(View.VISIBLE);
                 }
 
                 if (verifyCodeState == AuthenticationViewModel.VerifyCodeState.SEND_FAILURE) {
@@ -156,7 +158,7 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
             @Override
             public void onChanged(Integer leftSeconds) {
                 if (authenticationViewModel.getVerifyCodeState().getValue() != AuthenticationViewModel.VerifyCodeState.UN_SEND) {
-                    binding.btnSendVerifyCode.setText(leftSeconds + "s");
+                    binding.btnSendVerifyCode.setText(leftSeconds + "");
                     if (leftSeconds == 0) {
                         if (null != verifyCodeScheduledFuture) {
                             verifyCodeScheduledFuture.cancel(true);

app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/AuthenticationViewModel.java

@@ -418,7 +418,7 @@ public class AuthenticationViewModel extends ViewModel {
      * 开始倒计时
      */
     public ScheduledFuture startVerifyCodeCountdown() {
-        verifyCodeLeftSeconds.setValue(10);
+        verifyCodeLeftSeconds.setValue(60);
         return appExecutors.scheduledExecutor().scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {

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

@@ -218,19 +218,35 @@
                 app:layout_constraintStart_toStartOf="@id/edit_text_verify_code"
                 app:layout_constraintTop_toTopOf="@id/edit_text_verify_code" />
 
-            <Button
+            <TextView
                 android:id="@+id/btn_send_verify_code"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/send_verify_code"
                 android:textSize="13sp"
                 android:textColor="@color/colorSendVerifyCode"
-                android:background="@android:color/transparent"
                 android:visibility="@{viewModel.loginWay == LoginWay.SMS ? View.VISIBLE : View.GONE}"
                 app:layout_constraintTop_toTopOf="@id/edit_text_verify_code"
                 app:layout_constraintBottom_toBottomOf="@id/edit_text_verify_code"
-                app:layout_constraintEnd_toEndOf="@id/edit_text_verify_code" />
-
+                app:layout_constraintEnd_toEndOf="@id/txt_seconds" />
+            <TextView
+                android:id="@+id/txt_seconds"
+                android:textSize="10sp"
+                android:textColor="@color/colorTextLevel5"
+                android:text="s"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toStartOf="@id/view_fill_edit_verify_code_end"
+                app:layout_constraintTop_toTopOf="@id/edit_text_verify_code"
+                app:layout_constraintBottom_toBottomOf="@id/edit_text_verify_code"/>
+            <View
+                android:id="@+id/view_fill_edit_verify_code_end"
+                app:layout_constraintEnd_toEndOf="@id/edit_text_verify_code"
+                app:layout_constraintTop_toTopOf="@id/edit_text_verify_code"
+                app:layout_constraintBottom_toBottomOf="@id/edit_text_verify_code"
+                android:layout_width="15dp"
+                android:layout_height="0dp" />
             <!-- 验证码输入框 end -->
 
             <Button