From 637e3152e3bfea430ca774c7dd178b4b9696c37f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 十二月 2023 17:11:58 +0800
Subject: [PATCH] 2023年12月26日17:11:48
---
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 906e15a..a2c30fc 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
@@ -29,6 +29,10 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.photovoltaic.widget.ListStaticDialog;
+import com.sahooz.library.countrypicker.Country;
+import com.sahooz.library.countrypicker.CountryPickerFragment;
+import com.sahooz.library.countrypicker.PickCountryCallback;
+
/**
* 娉ㄥ唽璐﹀彿鐣岄潰
@@ -101,6 +105,7 @@
finish();
}
});
+ //鏈嶅姟鍣ㄩ�夋嫨
viewBinding.registerRegionServerRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -125,6 +130,14 @@
});
}
});
+ //鎵嬫満鍖哄彿閫夋嫨
+ viewBinding.registerRegionAccountRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectArea();
+ }
+ });
+
//鍒囨崲鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.underlineCl.setOnClickListener(new View.OnClickListener() {
@Override
@@ -215,6 +228,9 @@
if (!isLocalCheckAccountAndPassword()) {
return;
}
+ //
+ viewBinding.textErrorTv.setText("");
+
String account = viewBinding.registerAccountEt.getText().toString();
String psw = viewBinding.registerConfirmPswEt.getText().toString();
String verification_code;
@@ -244,13 +260,14 @@
@Override
public void onFailure(HDLException e) {
-
+ HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
}
});
}
});
}
+
/**
* 鍙戦�侀獙璇佺爜鎸囦护
@@ -273,7 +290,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 +304,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) {
@@ -308,6 +325,7 @@
});
}
+
/**
* 鍒濆鍖栨墜鏈哄彿璁℃椂鍣�
@@ -355,6 +373,22 @@
}
};
+
+ /**
+ * 鍥藉鎵嬫満鍙峰尯鍙峰脊绐�
+ */
+ 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();
+ }
/**
* 鍒囨崲鎵嬫満鍙锋垨鑰呴偖绠辩殑鏍峰紡
@@ -422,6 +456,11 @@
}
isCompleteEnabled();
+ try {
+ Country.load(this);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@@ -468,6 +507,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ Country.destroy();
if (phoneCountDownTimer != null) {
phoneCountDownTimer.cancel();
phoneCountDownTimer = null;
@@ -580,4 +620,6 @@
}
};
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0