From ba84a556dc93fcf75e6ec76f999344d3f96ad788 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 02 二月 2024 18:05:24 +0800
Subject: [PATCH] 2024年02月02日18:04:36
---
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 07d6b31..5fb5fe2 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
@@ -20,12 +20,14 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityRegisterAccountBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
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;
@@ -94,6 +96,14 @@
private void initView() {
+ //鏍规嵁app璇█榛樿鏈嶅姟鍣ㄥ湴鍧�
+ if (UserConfigManage.getInstance().isZh()) {
+ mUrl = "https://china-gateway.hdlcontrol.com";
+ viewBinding.regionTv.setText("HDL China");
+ } else {
+ viewBinding.regionTv.setText("HDL Bahrain");
+ mUrl = "https://bahrain-gateway.hdlcontrol.com";
+ }
switchPhoneOrEmailStyleView();
}
@@ -239,12 +249,14 @@
} else {
verification_code = viewBinding.registerMailVerificationEt.getText().toString();
}
+ showLoading();
HdlAccountLogic.getInstance().registerAccount_C(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
+ hideLoading();
ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
dialog.show();
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@@ -260,6 +272,7 @@
@Override
public void onFailure(HDLException e) {
+ hideLoading();
HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
}
});
@@ -319,7 +332,7 @@
HdlThreadLogic.toast(_mActivity, e);
}
});
- }else{
+ } else {
HdlThreadLogic.toast(_mActivity, e);
}
@@ -397,6 +410,8 @@
* 鍒囨崲鎵嬫満鍙锋垨鑰呴偖绠辩殑鏍峰紡
*/
private void switchPhoneOrEmailStyleView() {
+
+
if (isPhoneType) {
//鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
@@ -408,7 +423,8 @@
viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16);
viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
-
+ //鏄剧ず鍖哄彿
+ viewBinding.registerRegionAccountRl.setVisibility(View.VISIBLE);
//杈撳叆鎵嬫満鍙�
viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_NUMBER);
viewBinding.registerAccountEt.setHint(R.string.home_login_input_phone);
@@ -438,6 +454,9 @@
viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20);
viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
+
+ //闅愯棌鍖哄彿
+ viewBinding.registerRegionAccountRl.setVisibility(View.GONE);
//杈撳叆閭
viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);
viewBinding.registerAccountEt.setHint(R.string.home_login_input_mail);
@@ -458,12 +477,7 @@
viewBinding.registerConfirmPswEt.setText(mMailConfirmPsw);
}
- isCompleteEnabled();
- try {
- Country.load(this);
- } catch (Exception e) {
- e.printStackTrace();
- }
+
}
--
Gitblit v1.8.0