From f9956641e92cce3ece4cdff523a6e453f159d268 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 十二月 2023 11:58:30 +0800
Subject: [PATCH] 2023年12月21日11:58:13
---
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 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..6e30683 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
@@ -1,8 +1,12 @@
package com.hdl.photovoltaic.ui.account;
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.CountDownTimer;
+import android.telephony.TelephonyManager;
import android.text.Editable;
import android.text.InputType;
import android.text.TextUtils;
@@ -13,6 +17,7 @@
import androidx.appcompat.content.res.AppCompatResources;
import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.core.content.ContextCompat;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -26,9 +31,17 @@
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;
+import com.sahooz.library.countrypicker.Country;
+import com.sahooz.library.countrypicker.CountryPickerFragment;
+import com.sahooz.library.countrypicker.PickCountryCallback;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
/**
* 娉ㄥ唽璐﹀彿鐣岄潰
@@ -101,6 +114,7 @@
finish();
}
});
+ //鏈嶅姟鍣ㄩ�夋嫨
viewBinding.registerRegionServerRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -125,6 +139,14 @@
});
}
});
+ //鎵嬫満鍖哄彿閫夋嫨
+ viewBinding.registerRegionAccountRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectArea();
+ }
+ });
+
//鍒囨崲鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.underlineCl.setOnClickListener(new View.OnClickListener() {
@Override
@@ -252,6 +274,7 @@
}
+
/**
* 鍙戦�侀獙璇佺爜鎸囦护
*/
@@ -287,7 +310,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 +331,7 @@
});
}
+
/**
* 鍒濆鍖栨墜鏈哄彿璁℃椂鍣�
@@ -355,6 +379,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 +462,11 @@
}
isCompleteEnabled();
+ try {
+ Country.load(this);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@@ -468,6 +513,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ Country.destroy();
if (phoneCountDownTimer != null) {
phoneCountDownTimer.cancel();
phoneCountDownTimer = null;
@@ -580,4 +626,6 @@
}
};
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0