From 43c0a28db7e43959561036dbde0eb5cb37a7e324 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 10 五月 2024 18:25:40 +0800
Subject: [PATCH] 2024年05月10日18:25:29
---
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 10 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 7dabc0e..6f7b52e 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,15 +20,21 @@
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.ListDialog;
+import com.hdl.photovoltaic.widget.ListStaticDialog;
+import com.sahooz.library.countrypicker.Country;
+import com.sahooz.library.countrypicker.CountryPickerFragment;
+import com.sahooz.library.countrypicker.PickCountryCallback;
+
/**
* 娉ㄥ唽璐﹀彿鐣岄潰
@@ -90,7 +96,20 @@
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();
+ try {
+ Country.load(this);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
private void initEvent() {
@@ -101,12 +120,13 @@
finish();
}
});
+ //鏈嶅姟鍣ㄩ�夋嫨
viewBinding.registerRegionServerRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- ListDialog listDialog = new ListDialog(_mActivity);
+ ListStaticDialog listDialog = new ListStaticDialog(_mActivity);
listDialog.show();
- listDialog.setOnHDLChinaOnListener(new ListDialog.onHDLChinaListener() {
+ listDialog.setOnHDLChinaOnListener(new ListStaticDialog.onHDLChinaListener() {
@Override
public void HDLChina() {
mUrl = "https://china-gateway.hdlcontrol.com";
@@ -115,7 +135,7 @@
}
});
- listDialog.setOnHDLBahrainListener(new ListDialog.onHDLBahrainListener() {
+ listDialog.setOnHDLBahrainListener(new ListStaticDialog.onHDLBahrainListener() {
@Override
public void HDLBahrain() {
mUrl = "https://bahrain-gateway.hdlcontrol.com";
@@ -125,6 +145,14 @@
});
}
});
+ //鎵嬫満鍖哄彿閫夋嫨
+ viewBinding.registerRegionAccountRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectArea();
+ }
+ });
+
//鍒囨崲鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.underlineCl.setOnClickListener(new View.OnClickListener() {
@Override
@@ -215,6 +243,9 @@
if (!isLocalCheckAccountAndPassword()) {
return;
}
+ //
+ viewBinding.textErrorTv.setText("");
+
String account = viewBinding.registerAccountEt.getText().toString();
String psw = viewBinding.registerConfirmPswEt.getText().toString();
String verification_code;
@@ -223,14 +254,17 @@
} 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.setTitle(getString(R.string.home_account_registered_successfully));
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -244,13 +278,15 @@
@Override
public void onFailure(HDLException e) {
-
+ hideLoading();
+ HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
}
});
}
});
}
+
/**
* 鍙戦�侀獙璇佺爜鎸囦护
@@ -273,7 +309,7 @@
@Override
public void onSuccess(HDLUserRegionBean obj) {
HdlThreadLogic.toast(RegisterAccountActivity.this, getString(R.string.home_login_already_exists));
- HdlLogLogic.print("鑾峰彇璐﹀彿鍖哄煙淇℃伅===" + obj, false);
+ HdlLogLogic.print("鑾峰彇璐﹀彿鍖哄煙淇℃伅--->" + obj, false);
}
@Override
@@ -287,7 +323,7 @@
mUrl = "https://test-gz.hdlcontrol.com";
}
HDLLinkPMUser.getInstance().setUserRegionUrl(mUrl);
- HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, "86", 1, new CloudCallBeak<Boolean>() {
+ HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), 1, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
if (isPhoneType) {
@@ -299,15 +335,19 @@
@Override
public void onFailure(HDLException e) {
-
+ HdlThreadLogic.toast(_mActivity, e);
}
});
+ } else {
+ HdlThreadLogic.toast(_mActivity, e);
}
+
}
});
}
+
/**
* 鍒濆鍖栨墜鏈哄彿璁℃椂鍣�
@@ -357,9 +397,27 @@
};
/**
+ * 鍥藉鎵嬫満鍙峰尯鍙峰脊绐�
+ */
+ private void selectArea() {
+ CountryPickerFragment dialog = new CountryPickerFragment(this, new PickCountryCallback() {
+ @Override
+ public void onPick(Country country) {
+ if (country.flag != 0)
+ viewBinding.regionAccountTv.setText(country.name);
+ viewBinding.regionAccountNumberTv.setText("+" + country.code);
+ }
+ });
+ dialog.show();
+ dialog.setDialogSize();
+ }
+
+ /**
* 鍒囨崲鎵嬫満鍙锋垨鑰呴偖绠辩殑鏍峰紡
*/
private void switchPhoneOrEmailStyleView() {
+
+
if (isPhoneType) {
//鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
@@ -371,7 +429,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);
@@ -401,6 +460,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);
@@ -421,7 +483,7 @@
viewBinding.registerConfirmPswEt.setText(mMailConfirmPsw);
}
- isCompleteEnabled();
+
}
@@ -468,6 +530,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ Country.destroy();
if (phoneCountDownTimer != null) {
phoneCountDownTimer.cancel();
phoneCountDownTimer = null;
@@ -580,4 +643,6 @@
}
};
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0