From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 34 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 e12bcc5..7b24c8e 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
@@ -12,7 +12,6 @@
import android.view.View;
import androidx.appcompat.content.res.AppCompatResources;
-import androidx.constraintlayout.widget.ConstraintSet;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -22,12 +21,13 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityRegisterAccountBinding;
+import com.hdl.photovoltaic.enums.VerifyType;
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.utils.GPSManagerUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.photovoltaic.widget.ListStaticDialog;
@@ -72,27 +72,27 @@
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
initEvent();
- KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
- @Override
- 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.applyTo(viewBinding.parentCl);
- }
-
- @Override
-
- public void onKeyboardHide(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.applyTo(viewBinding.parentCl);
- }
-
- });
+// KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
+// @Override
+// 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.applyTo(viewBinding.parentCl);
+// }
+//
+// @Override
+//
+// public void onKeyboardHide(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.applyTo(viewBinding.parentCl);
+// }
+//
+// });
}
@@ -101,18 +101,36 @@
if (UserConfigManage.getInstance().isZh()) {
mUrl = "https://china-gateway.hdlcontrol.com";
viewBinding.regionTv.setText("HDL China");
+ viewBinding.regionAccountTv.setText(getText(R.string.home_chinese_mainland));
+ viewBinding.regionAccountNumberTv.setText("+86");
} else {
viewBinding.regionTv.setText("HDL Bahrain");
mUrl = "https://bahrain-gateway.hdlcontrol.com";
+ viewBinding.regionAccountTv.setText(getText(R.string.iraq));
+ viewBinding.regionAccountNumberTv.setText("+964");
}
switchPhoneOrEmailStyleView();
try {
Country.load(this);
+ Country country = null;
+ if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
+ //鍐嶆牴鎹郴缁熻瑷�
+ country = Country.getCountryInfo();
+ } else {
+ //鍏堟牴鎹畾浣�
+ country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
+ }
+ if (country != null) {
+ viewBinding.regionAccountTv.setText(country.translate);
+ viewBinding.regionAccountNumberTv.setText("+" + country.code);
+ }
} 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() {
@@ -258,7 +276,7 @@
verification_code = viewBinding.registerMailVerificationEt.getText().toString();
}
showLoading();
- HdlAccountLogic.getInstance().registerAccount_C(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
+ HdlAccountLogic.getInstance().registerAccount_C(isPhoneType, account, psw, verification_code, viewBinding.regionAccountNumberTv.getText().toString(), new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
HdlThreadLogic.runMainThread(new Runnable() {
@@ -326,7 +344,7 @@
mUrl = "https://test-gz.hdlcontrol.com";
}
HDLLinkPMUser.getInstance().setUserRegionUrl(mUrl);
- HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), 1, new CloudCallBeak<Boolean>() {
+ HdlAccountLogic.getInstance().sendVerifyCode_C(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), VerifyType.VerifyType_1, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
if (isPhoneType) {
@@ -385,7 +403,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_E6FFFFFF, null));
+// viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerMailVerificationTv.setEnabled(false);
}
@@ -393,7 +411,7 @@
@Override
public void onFinish() {
viewBinding.registerMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
-// viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+// viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerMailVerificationTv.setEnabled(true);
}
@@ -406,13 +424,14 @@
CountryPickerFragment dialog = new CountryPickerFragment(this, new PickCountryCallback() {
@Override
public void onPick(Country country) {
- if (country.flag != 0) viewBinding.regionAccountTv.setText(country.name);
+ if (country.flag != 0) viewBinding.regionAccountTv.setText(country.translate);
viewBinding.regionAccountNumberTv.setText("+" + country.code);
}
});
dialog.show();
dialog.setDialogSize();
}
+
/**
* 鍒囨崲鎵嬫満鍙锋垨鑰呴偖绠辩殑鏍峰紡
@@ -424,12 +443,12 @@
//鎵嬫満鍙�
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.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
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.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
//鏄剧ず鍖哄彿
viewBinding.registerRegionAccountRl.setVisibility(View.VISIBLE);
@@ -455,12 +474,12 @@
//閭
viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16);
- viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B, null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
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.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
//闅愯棌鍖哄彿
@@ -504,9 +523,9 @@
}
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));
+ viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.registerCompleteTv.setEnabled(isEnabled);
}
--
Gitblit v1.8.0