From 78bd3ac1cc25c2a0c9684d87ccd199cabcd7bda4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 13:13:31 +0800
Subject: [PATCH] 2025年07月07日13:13:28
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 538cd35..7f41ce6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -72,7 +72,7 @@
@Override
public void onFailure(HDLException error) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(error);
+ cloudCallBeak.onFailure(HttpClient.getException(error));
}
}
});
@@ -107,7 +107,7 @@
@Override
public void onFailure(HDLException error) {
if (callBack != null) {
- callBack.onFailure(error);
+ callBack.onFailure(HttpClient.getException(error));
}
}
});
@@ -165,11 +165,13 @@
* @param verifyCode 楠岃瘉鐮�
* @param cloudCallBeak -
*/
- public void changePassword_B(boolean isPhone, String account, String loginPwd, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void changePassword_B(boolean isPhone, String account, String loginPwd, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_FORGET_PROGRAM_PWD;
JsonObject json = new JsonObject();
if (isPhone) {
+
json.addProperty("userPhone", account);//鐢ㄦ埛鎵嬫満鍙� 鎵嬫満鍙峰拰閭蹇呭～鍏朵竴
+ json.addProperty("phonePrefix", phonePrefix.replace("+", ""));//鎵嬫満鍙峰墠缂�
} else {
json.addProperty("userEmail", account);
}
@@ -497,13 +499,15 @@
* @param account 璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
* @param loginPwd 瀵嗙爜
* @param verifyCode 楠岃瘉鐮�
+ * @param phonePrefix 鎵嬫満鍙峰墠缂�
* @param cloudCallBeak -
*/
- public void registerAccount_C(boolean isPhone, String account, String loginPwd, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void registerAccount_C(boolean isPhone, String account, String loginPwd, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_GET_OAUTH_REGISTER;
JsonObject json = new JsonObject();
if (isPhone) {
json.addProperty("memberPhone", account);//鐢ㄦ埛鎵嬫満鍙� 鎵嬫満鍙峰拰閭蹇呭～鍏朵竴
+ json.addProperty("phonePrefix", phonePrefix.replace("+", ""));//鎵嬫満鍙峰墠缂�
} else {
json.addProperty("memberEmail", account);
}
@@ -539,13 +543,15 @@
* @param account 璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
* @param loginPwd 鏂板瘑鐮�
* @param verifyCode 楠岃瘉鐮�
+ * @param phonePrefix 鎵嬫満鍙峰墠缂�
* @param cloudCallBeak -
*/
- public void changePassword_C(boolean isPhone, String account, String loginPwd, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void changePassword_C(boolean isPhone, String account, String loginPwd, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_FORGET_PROGRAM_PWD;
JsonObject json = new JsonObject();
if (isPhone) {
json.addProperty("memberPhone", account);//鐢ㄦ埛鎵嬫満鍙� 鎵嬫満鍙峰拰閭蹇呭～鍏朵竴
+ json.addProperty("phonePrefix", phonePrefix.replace("+", ""));//鎵嬫満鍙峰墠缂�
} else {
json.addProperty("memberEmail", account);
}
@@ -608,13 +614,15 @@
*
* @param memberPhone 鎵嬫満鍙凤紙鏈粦瀹氭墜鏈哄彿鍙傛暟浼爊ull锛�
* @param memberEmail 閭锛堟湭缁戝畾閭鍙傛暟浼爊ull锛�
+ * @param phonePrefix 鎵嬫満鍙峰墠缂�
* @param verifyCode 楠岃瘉鐮�
*/
- public void bindingAccount_C(String memberPhone, String memberEmail, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void bindingAccount_C(String memberPhone, String memberEmail, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_MEMBERINFO_BINDWITHACCOUNT;
JsonObject json = new JsonObject();
if (!TextUtils.isEmpty(memberPhone)) {
json.addProperty("memberPhone", memberPhone);//鎵嬫満鍙�
+ json.addProperty("phonePrefix", phonePrefix.replace("+", ""));//鎵嬫満鍙峰墠缂�
}
if (!TextUtils.isEmpty(memberEmail)) {
json.addProperty("memberEmail", memberEmail);//閭
@@ -673,7 +681,7 @@
/**
- * 鍙戦�侀獙璇佺爜(B鍜孋绔叡鐢�)
+ * 鍙戦�侀獙璇佺爜(C绔�)
*
* @param isPhone true琛ㄧず鎵嬫満鍙�,鍚﹀垯鏄偖绠�
* @param account 璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
@@ -681,14 +689,56 @@
* @param verifyType 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁
* @param cloudCallBeak -
*/
- public void sendVerifyCode(boolean isPhone, String account, String phonePrefix, int verifyType, CloudCallBeak<Boolean> cloudCallBeak) {
- String requestUrl = HttpApi.POST_SEND_VERIFICATION;
+ public void sendVerifyCode_C(boolean isPhone, String account, String phonePrefix, String verifyType, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_SEND_VERIFICATION_C;
JsonObject json = new JsonObject();
if (isPhone) {
json.addProperty("phone", account);//鐢ㄦ埛鎵嬫満鍙�
- json.addProperty("phonePrefix", phonePrefix);//鎵嬫満鍙峰墠缂�
+ json.addProperty("phonePrefix", phonePrefix.replace("+", ""));//鎵嬫満鍙峰墠缂�
} else {
json.addProperty("mail", account);//閭
+ }
+ json.addProperty("verifyType", verifyType);//1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁
+// json.addProperty("languageType", loginPwd);//璇█
+// json.addProperty("expireSecond", expireSecond);//楠岃瘉鐮佽繃鏈熸椂闂达紙绉掞級,榛樿5鍒嗛挓
+// json.addProperty("platform", "APP");
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+ /**
+ * 鍙戦�侀獙璇佺爜(B绔�)
+ *
+ * @param isPhone true琛ㄧず鎵嬫満鍙�,鍚﹀垯鏄偖绠�
+ * @param account 璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
+ * @param phonePrefix 鎵嬫満鍙峰墠缂�
+ * @param verifyType 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁
+ * @param cloudCallBeak -
+ */
+ public void sendVerifyCode_B(boolean isPhone, String account, String phonePrefix, String verifyType, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = isPhone ? HttpApi.POST_SEND_VERIFICATION_Phone_B : HttpApi.POST_SEND_VERIFICATION_Email_B;
+ JsonObject json = new JsonObject();
+ if (isPhone) {
+ json.addProperty("userPhone", account);//鐢ㄦ埛鎵嬫満鍙�
+ json.addProperty("phonePrefix", phonePrefix.replace("+", ""));//鎵嬫満鍙峰墠缂�
+ } else {
+ json.addProperty("userEmail", account);//閭
}
json.addProperty("verifyType", verifyType);//1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁
// json.addProperty("languageType", loginPwd);//璇█
@@ -773,7 +823,7 @@
UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//涓庝笂涓�涓处鍙锋槸鍚﹀悓涓�涓�
//UserConfigManage.getInstance().getUserId()琛ㄧず绗竴娆″畨瑁呯櫥褰�
if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserId()) && !UserConfigManage.getInstance().isTheSameLoginAccount()) {
- //涓嶅悓璐﹀彿,鍒犻櫎涔嬪墠鐨勬棫璐﹀彿鏃ュ織淇℃伅;
+ //涓嶅悓璐﹀彿,鍒犻櫎涔嬪墠鐨勬棫璐﹀彿淇℃伅;
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getUserFilePath());
UserConfigManage.getInstance().setHomeId("");
@@ -791,6 +841,7 @@
UserConfigManage.getInstance().setToken(obj.getAccessToken());//Token
UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());//璁よ瘉璇锋眰澶村墠缂�(搴曞眰璇锋眰缁熶竴鍔�)
UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());//鍒锋柊Token鐢ㄧ殑
+ UserConfigManage.getInstance().setNoNetworkFlag(false);
UserConfigManage.getInstance().Save();
}
--
Gitblit v1.8.0