From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 5fb5fe2..8cf5e60 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
@@ -27,7 +27,6 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
-import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.photovoltaic.widget.ListStaticDialog;
@@ -105,6 +104,11 @@
mUrl = "https://bahrain-gateway.hdlcontrol.com";
}
switchPhoneOrEmailStyleView();
+ try {
+ Country.load(this);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
private void initEvent() {
@@ -259,6 +263,7 @@
hideLoading();
ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
dialog.show();
+ dialog.setTitle(getString(R.string.home_account_registered_successfully));
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -416,12 +421,12 @@
//鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(20);
- viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000, null));
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000, null));
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
//鏄剧ず鍖哄彿
viewBinding.registerRegionAccountRl.setVisibility(View.VISIBLE);
@@ -447,12 +452,12 @@
//閭
viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16);
- viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000, null));
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000, null));
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
//闅愯棌鍖哄彿
--
Gitblit v1.8.0