From 3ccff7173fb73322f7785d8eaedc90a1b5d8765d Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 10 十二月 2024 22:44:03 +0800
Subject: [PATCH] 2024年12月10日22:43:59
---
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 146 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 109 insertions(+), 37 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..cd71d51 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,16 +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.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
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;
+import com.hdl.photovoltaic.widget.ListStaticDialog;
+import com.sahooz.library.countrypicker.Country;
+import com.sahooz.library.countrypicker.CountryPickerFragment;
+import com.sahooz.library.countrypicker.PickCountryCallback;
+
/**
* 娉ㄥ唽璐﹀彿鐣岄潰
@@ -61,6 +66,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_00000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -70,8 +77,7 @@
public void onKeyboardShow(int h) {
ConstraintSet cs = new ConstraintSet();
cs.clone(viewBinding.parentCl);
- cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h))
- ;//
+ cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
//搴旂敤绾︽潫
cs.applyTo(viewBinding.parentCl);
}
@@ -91,7 +97,22 @@
private void initView() {
- switchPhoneOrMailView();
+ //鏍规嵁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();
+ }
+ HdlCommonLogic.getInstance().setSpan(viewBinding.registerPhoneVerificationTv, viewBinding.registerPhoneVerificationTv.getText().toString(), true, null);
+ HdlCommonLogic.getInstance().setSpan(viewBinding.registerMailVerificationTv, viewBinding.registerMailVerificationTv.getText().toString(), true, null);
}
private void initEvent() {
@@ -102,35 +123,46 @@
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";
viewBinding.regionTv.setText(listDialog.geHDLChinaText());
+ listDialog.dismiss();
}
});
- listDialog.setOnHDLBahrainListener(new ListDialog.onHDLBahrainListener() {
+ listDialog.setOnHDLBahrainListener(new ListStaticDialog.onHDLBahrainListener() {
@Override
public void HDLBahrain() {
mUrl = "https://bahrain-gateway.hdlcontrol.com";
viewBinding.regionTv.setText(listDialog.getHDLBahrainText());
+ listDialog.dismiss();
}
});
}
});
+ //鎵嬫満鍖哄彿閫夋嫨
+ viewBinding.registerRegionAccountRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectArea();
+ }
+ });
+
//鍒囨崲鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.underlineCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
isPhoneType = true;
- switchPhoneOrMailView();
+ switchPhoneOrEmailStyleView();
}
});
//鍒囨崲閭
@@ -138,7 +170,7 @@
@Override
public void onClick(View v) {
isPhoneType = false;
- switchPhoneOrMailView();
+ switchPhoneOrEmailStyleView();
}
});
@@ -214,6 +246,9 @@
if (!isLocalCheckAccountAndPassword()) {
return;
}
+ //
+ viewBinding.textErrorTv.setText("");
+
String account = viewBinding.registerAccountEt.getText().toString();
String psw = viewBinding.registerConfirmPswEt.getText().toString();
String verification_code;
@@ -222,14 +257,17 @@
} else {
verification_code = viewBinding.registerMailVerificationEt.getText().toString();
}
- HdlAccountLogic.getInstance().registerAccount(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
+ 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() {
@@ -243,13 +281,15 @@
@Override
public void onFailure(HDLException e) {
-
+ hideLoading();
+ HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
}
});
}
});
}
+
/**
* 鍙戦�侀獙璇佺爜鎸囦护
@@ -271,9 +311,8 @@
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
public void onSuccess(HDLUserRegionBean obj) {
- //鍙戦�佹秷鎭獙璇佺爜
HdlThreadLogic.toast(RegisterAccountActivity.this, getString(R.string.home_login_already_exists));
- HdlLogLogic.print("regionByAccount onSuccess==" + obj);
+ HdlLogLogic.print("鑾峰彇璐﹀彿鍖哄煙淇℃伅--->" + obj, false);
}
@Override
@@ -287,7 +326,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 +338,19 @@
@Override
public void onFailure(HDLException e) {
-
+ HdlThreadLogic.toast(_mActivity, e);
}
});
+ } else {
+ HdlThreadLogic.toast(_mActivity, e);
}
+
}
});
}
+
/**
* 鍒濆鍖栨墜鏈哄彿璁℃椂鍣�
@@ -318,7 +361,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 +369,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 +385,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_E6FFFFFF, null));
viewBinding.registerMailVerificationTv.setEnabled(false);
}
@@ -350,31 +393,49 @@
@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_E6FFFFFF, null));
viewBinding.registerMailVerificationTv.setEnabled(true);
}
};
/**
+ * 鍥藉鎵嬫満鍙峰尯鍙峰脊绐�
+ */
+ 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 switchPhoneOrMailView() {
+ private void switchPhoneOrEmailStyleView() {
+
+
if (isPhoneType) {
//鎵嬫満鍙�
- viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_鎵嬫満鍙�);
- viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(20);
- viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
- viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(18);
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
- viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_閭);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
+ viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(14);
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF, 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_璇疯緭鍏ユ墜鏈哄彿);
+ viewBinding.registerAccountEt.setHint(R.string.home_login_input_phone);
//鏄剧ず鎵嬫満鍙烽獙璇佺爜锛岄殣钘忛偖绠遍獙璇佺爜,
viewBinding.registerPhoneVerificationCodeRl.setVisibility(View.VISIBLE);
viewBinding.registerMailVerificationCodeRl.setVisibility(View.GONE);
@@ -392,15 +453,18 @@
} 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_66FFFFFF, null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
- viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_閭);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
- viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
+ viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(18);
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
+
+ //闅愯棌鍖哄彿
+ viewBinding.registerRegionAccountRl.setVisibility(View.GONE);
//杈撳叆閭
viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);
viewBinding.registerAccountEt.setHint(R.string.home_login_input_mail);
@@ -421,7 +485,7 @@
viewBinding.registerConfirmPswEt.setText(mMailConfirmPsw);
}
- isCompleteEnabled();
+
}
@@ -439,6 +503,11 @@
verification_code = viewBinding.registerMailVerificationEt.getText().toString();
}
boolean isEnabled = account.length() > 0 && psw1.length() > 0 && psw2.length() > 0 && verification_code.length() > 0;
+ if (isEnabled) {
+ viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ } else {
+ viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ }
viewBinding.registerCompleteTv.setEnabled(isEnabled);
}
@@ -468,6 +537,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ Country.destroy();
if (phoneCountDownTimer != null) {
phoneCountDownTimer.cancel();
phoneCountDownTimer = null;
@@ -580,4 +650,6 @@
}
};
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0