From a8e0bddc9903d854808e9526600128e95560faa3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 30 十月 2023 18:21:25 +0800
Subject: [PATCH] 2023年10月30日18:21:12

---
 app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
index 6da6dac..5cc5a34 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
@@ -29,7 +29,6 @@
 import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
 import com.hdl.photovoltaic.widget.ListDialog;
-import com.hdl.sdk.link.common.utils.ThreadToolUtils;
 
 /**
  * 娉ㄥ唽璐﹀彿鐣岄潰
@@ -318,7 +317,7 @@
             long time = (millisUntilFinished / 1000);
             String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
             viewBinding.registerPhoneVerificationTv.setText(str);
-            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000));
+            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000,null));
             viewBinding.registerPhoneVerificationTv.setEnabled(false);
 
         }
@@ -326,7 +325,7 @@
         @Override
         public void onFinish() {
             viewBinding.registerPhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
-            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
+            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3,null));
             viewBinding.registerPhoneVerificationTv.setEnabled(true);
 
 
@@ -342,7 +341,7 @@
             String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
 
             viewBinding.registerMailVerificationTv.setText(str);
-            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000));
+            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000,null));
             viewBinding.registerMailVerificationTv.setEnabled(false);
 
         }
@@ -350,7 +349,7 @@
         @Override
         public void onFinish() {
             viewBinding.registerMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
-            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
+            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3,null));
             viewBinding.registerMailVerificationTv.setEnabled(true);
 
         }
@@ -362,19 +361,19 @@
     private void switchPhoneOrMailView() {
         if (isPhoneType) {
             //鎵嬫満鍙�
-            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_鎵嬫満鍙�);
+            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
             viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(20);
-            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
+            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000,null));
             viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
 
-            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_閭);
+            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
             viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16);
-            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
+            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000,null));
             viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
 
             //杈撳叆鎵嬫満鍙�
             viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_NUMBER);
-            viewBinding.registerAccountEt.setHint(R.string.home_login_璇疯緭鍏ユ墜鏈哄彿);
+            viewBinding.registerAccountEt.setHint(R.string.home_login_input_phone);
             //鏄剧ず鎵嬫満鍙烽獙璇佺爜锛岄殣钘忛偖绠遍獙璇佺爜,
             viewBinding.registerPhoneVerificationCodeRl.setVisibility(View.VISIBLE);
             viewBinding.registerMailVerificationCodeRl.setVisibility(View.GONE);
@@ -392,14 +391,14 @@
 
         } else {
             //閭
-            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_鎵嬫満鍙�);
+            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
             viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16);
-            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
+            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000,null));
             viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
 
-            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_閭);
+            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
             viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20);
-            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
+            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000,null));
             viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
             //杈撳叆閭
             viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);

--
Gitblit v1.8.0