From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 329 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 291 insertions(+), 38 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 27dac5f..2c49f36 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -5,23 +5,26 @@
import com.google.gson.Gson;
import com.google.gson.JsonObject;
-import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
+import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean;
-import com.hdl.linkpm.sdk.user.bean.ImageSubmitInfo;
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack;
-import com.hdl.linkpm.sdk.user.controller.HDLPMUserController;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.ui.bean.AuthorizationAccountBean;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import java.io.File;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -57,7 +60,8 @@
* @param i_account 璐﹀彿
*/
public void regionByAccount(String i_account, CloudCallBeak<HDLUserRegionBean> cloudCallBeak) {
- HDLLinkPMUser.getInstance().regionByAccount(i_account, new IRegionByAccountCallBack() {
+ boolean isBooleanB = UserConfigManage.getInstance().isBAccount();
+ HDLLinkPMUser.getInstance().regionByAccount(isBooleanB, i_account, new IRegionByAccountCallBack() {
@Override
public void onSuccess(HDLUserRegionBean regionBean) {
if (cloudCallBeak != null) {
@@ -68,14 +72,14 @@
@Override
public void onFailure(HDLException error) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(error);
+ cloudCallBeak.onFailure(HttpClient.getException(error));
}
}
});
}
/**
- * 鐧诲綍(B绔处鍙�)
+ * 鐧诲綍(B,C绔处鍙�)
* 閫氳繃璐﹀彿鍜屽瘑鐮�
*
* @param account 鎵嬫満鎴栬�呴偖绠�
@@ -83,17 +87,18 @@
* @param callBack -
*/
public void loginByPassword(String account, String loginPwd, ILoginCallBack callBack) {
- String requestUrl = HttpApi.POST_Login;
+ boolean isBooleanB = UserConfigManage.getInstance().isBAccount();
JsonObject json = new JsonObject();
json.addProperty("account", account);
json.addProperty("loginPwd", loginPwd);
// json.addProperty("platform", "APP");
json.addProperty("grantType", "password");
- HDLLinkPMUser.getInstance().loginByPassword(account, loginPwd, new ILoginCallBack() {
+ HDLLinkPMUser.getInstance().loginByPassword(isBooleanB, account, loginPwd, new ILoginCallBack() {
@Override
public void onSuccess(HDLLoginBean loginBean) {
if (callBack != null) {
+ loginBean.setAccount(account);
saveUserData(loginBean);
callBack.onSuccess(loginBean);
}
@@ -102,12 +107,54 @@
@Override
public void onFailure(HDLException error) {
if (callBack != null) {
- callBack.onFailure(error);
+ callBack.onFailure(HttpClient.getException(error));
}
}
});
}
+
+ /**
+ * 妫�楠岃处鍙锋潈闄�(B绔处鍙�)
+ *
+ * @param cloudCallBeak -
+ */
+ public void getCompanyParterMenu_B(CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.B_POST_getCompanyParterMenu;
+ JsonObject json = new JsonObject();
+ json.addProperty("sysCode", "xenterra-app");
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String json) {
+ if (cloudCallBeak != null) {
+ if (TextUtils.isEmpty(json)) {
+ cloudCallBeak.onSuccess(false);
+ } else {
+ Gson gson = new Gson();
+ Type type = new TypeToken<List<AuthorizationAccountBean>>() {
+ }.getType();
+ List<AuthorizationAccountBean> authorizationAccounts = gson.fromJson(json, type);
+ if (authorizationAccounts != null && !authorizationAccounts.isEmpty()) {
+ cloudCallBeak.onSuccess(true);
+ } else {
+ cloudCallBeak.onSuccess(false);
+ }
+ }
+
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
/**
* 淇敼瀵嗙爜(B绔处鍙�)
@@ -118,11 +165,13 @@
* @param verifyCode 楠岃瘉鐮�
* @param cloudCallBeak -
*/
- public void changeBPassword(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);
}
@@ -155,7 +204,7 @@
* @param loginOldPwd 鑰佸瘑鐮�
* @param loginPwd 鏂板瘑鐮�
*/
- public void updateBPassword(String loginOldPwd, String loginPwd, CloudCallBeak<String> cloudCallBeak) {
+ public void updatePassword_B(String loginOldPwd, String loginPwd, CloudCallBeak<String> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_UPDATE_PROGRAM_PASSWORD;
JsonObject json = new JsonObject();
json.addProperty("userId", UserConfigManage.getInstance().getUserId());
@@ -183,14 +232,14 @@
/**
- * 鍒锋柊Token(B绔处鍙�)
+ * 鍒锋柊Token(C绔处鍙�)
*
* @param account 鎵嬫満鎴栬�呴偖绠�
* @param loginPwd 瀵嗙爜
* @param cloudCallBeak -
*/
- public void refreshToken(String account, String loginPwd, CloudCallBeak<HDLLoginBean> cloudCallBeak) {
- String requestUrl = HttpApi.POST_Login;
+ public void refreshToken_B(String account, String loginPwd, CloudCallBeak<HDLLoginBean> cloudCallBeak) {
+ String requestUrl = HttpApi.C_POST_Login;
JsonObject json = new JsonObject();
json.addProperty("grantType", "refresh_token");
// json.addProperty("refreshToken", UserConfigManage.getInstance().getRefreshToken());
@@ -220,9 +269,10 @@
*
* @param cloudCallBeak -
*/
- public void getUserInfo(CloudCallBeak<BUserInfo> cloudCallBeak) {
+ public void getUserInfo_B(CloudCallBeak<BUserInfo> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_GET_USERINFO;
JsonObject json = new JsonObject();
+ json.addProperty("userId", UserConfigManage.getInstance().getUserId());
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String jsonStr) {
@@ -256,9 +306,9 @@
* @param file 鍥剧墖鏂囦欢
* @param cloudCallBeak -
*/
- public void uploadUserHeadImage(File file, CloudCallBeak<String> cloudCallBeak) {
+ public void uploadUserHeadImage_C(File file, CloudCallBeak<String> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_GET_IMAGE_URL;
- HttpClient.getInstance().requestHttpFile(requestUrl, file, new CloudCallBeak<String>() {
+ HttpClient.getInstance().uploadingFile(requestUrl, file, new CloudCallBeak<String>() {
@Override
public void onSuccess(String jsonStr) {
if (cloudCallBeak != null) {
@@ -281,7 +331,7 @@
* @param imageKey 鐢ㄦ埛澶村儚imageKey
* @param cloudCallBeak -
*/
- public void getImageKey(String imageKey, CloudCallBeak<String> cloudCallBeak) {
+ public void getImageKey_C(String imageKey, CloudCallBeak<String> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_GET_IMAGE_URL;
JsonObject json = new JsonObject();
json.addProperty("imageKey", imageKey);
@@ -309,7 +359,7 @@
*
* @param cloudCallBeak -
*/
- public void getMemberInfo(CloudCallBeak<CUserInfo> cloudCallBeak) {
+ public void getMemberInfo_C(CloudCallBeak<CUserInfo> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_GET_MEMBER_INFO;
JsonObject json = new JsonObject();
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -334,6 +384,62 @@
}
/**
+ * 涓嬭浇瀛愯处鍙峰ご鍍�(C绔处鍙�)
+ *
+ * @param childAccountId 瀛愯处鍙穒d
+ * @param childId 瀛愯处鍙�(鎴愬憳)id鏌ユ壘瀛愯处鍙锋帴鍙ｈ幏鍙栧埌鐨勬暟鎹甶d
+ * @param homeId 浣忓畢id
+ * @param cloudCallBeak -
+ */
+ public void getHeadPortrait_C(String childAccountId, String childId, String homeId, CloudCallBeak<String> cloudCallBeak) {
+ String requestUrl = HttpApi.C_POST_GET_IMAGE_URL;
+ JsonObject json = new JsonObject();
+ json.addProperty("childAccountId", childAccountId);
+ if (TextUtils.isEmpty(childId)) {
+ json.addProperty("childId", childId);
+ }
+ json.addProperty("homeId", homeId);
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(jsonStr);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+
+ /**
+ * 淇敼鐢ㄦ埛鍚嶇О
+ *
+ * @param memberName 鐢ㄦ埛鍚嶇О
+ * @param cloudCallBeak -
+ */
+ public void updateMemberName_C(String memberName, CloudCallBeak<Boolean> cloudCallBeak) {
+ updateMemberInfo_C("", memberName, "", "", "", "", cloudCallBeak);
+ }
+
+ /**
+ * 淇敼鐢ㄦ埛澶村儚
+ *
+ * @param memberHeadIcon 澶村儚鍦板潃
+ * @param cloudCallBeak -
+ */
+ public void updateMemberHeadIcon_C(String memberHeadIcon, CloudCallBeak<Boolean> cloudCallBeak) {
+ updateMemberInfo_C("", "", "", memberHeadIcon, "", "", cloudCallBeak);
+ }
+
+ /**
* 鏇存柊涓汉淇℃伅(C绔处鍙�)
*
* @param languageType 璇█绫诲瀷
@@ -344,13 +450,7 @@
* @param memberSex 鐢ㄦ埛鎬у埆
* @param cloudCallBeak -
*/
- public void updateMemberInfo(String languageType,
- String memberName,
- String memberBirthday,
- String memberHeadIcon,
- String loginName,
- String memberSex,
- CloudCallBeak<Boolean> cloudCallBeak) {
+ public void updateMemberInfo_C(String languageType, String memberName, String memberBirthday, String memberHeadIcon, String loginName, String memberSex, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_UPDATE_MEMBER_INFO;
JsonObject json = new JsonObject();
if (!TextUtils.isEmpty(languageType)) {
@@ -401,11 +501,12 @@
* @param verifyCode 楠岃瘉鐮�
* @param cloudCallBeak -
*/
- public void registerAccount(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);
}
@@ -443,11 +544,12 @@
* @param verifyCode 楠岃瘉鐮�
* @param cloudCallBeak -
*/
- public void changeCPassword(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);
}
@@ -481,7 +583,7 @@
* @param loginOldPwd 鑰佸瘑鐮�
* @param loginPwd 鏂板瘑鐮�
*/
- public void updateCPassword(String loginOldPwd, String loginPwd, CloudCallBeak<String> cloudCallBeak) {
+ public void updatePassword_C(String loginOldPwd, String loginPwd, CloudCallBeak<String> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_UPDATE_PROGRAM_PASSWORD;
JsonObject json = new JsonObject();
json.addProperty("loginPwd", loginOldPwd);//鑰佸瘑鐮�
@@ -505,12 +607,78 @@
}
+ /**
+ * 缁戝畾璁よ瘉(鎵嬫満/閭)(C绔处鍙�)
+ *
+ * @param memberPhone 鎵嬫満鍙凤紙鏈粦瀹氭墜鏈哄彿鍙傛暟浼爊ull锛�
+ * @param memberEmail 閭锛堟湭缁戝畾閭鍙傛暟浼爊ull锛�
+ * @param verifyCode 楠岃瘉鐮�
+ */
+ 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);//閭
+ }
+ json.addProperty("verifyCode", verifyCode);//楠岃瘉鐮�
+ 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);
+ }
+ }
+ });
+
+
+ }
+
+
+ /**
+ * 瑙ｇ粦璁よ瘉(鎵嬫満/閭)(C绔处鍙�)
+ *
+ * @param unBindLabel 瑙ｇ粦鏍囪瘑锛圥HONE EMAIL锛�
+ */
+ public void unBindingAccount_C(String unBindLabel, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.C_POST_MEMBERINFO_UNBINDWITHACCOUNT;
+ JsonObject json = new JsonObject();
+ json.addProperty("unBindLabel", unBindLabel);//鎵嬫満鍙凤紙PHONE EMAIL锛�
+ 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);
+ }
+ }
+ });
+
+
+ }
+
// endregion
/**
- * 鍙戦�侀獙璇佺爜
+ * 鍙戦�侀獙璇佺爜(C绔�)
*
* @param isPhone true琛ㄧず鎵嬫満鍙�,鍚﹀垯鏄偖绠�
* @param account 璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
@@ -518,12 +686,12 @@
* @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);//閭
}
@@ -552,11 +720,54 @@
}
/**
+ * 鍙戦�侀獙璇佺爜(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);//璇█
+// 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);
+ }
+ }
+ });
+
+
+ }
+
+ /**
* 閫�鍑虹櫥褰曟椂璋冪敤锛屾竻闄ゆ帹閫佹暟鎹�
*/
- public void SignOutClearData() {
+ public void signOutClearData() {
String requestUrl = HttpApi.POST_GET_IMAGE_LOGOUT;
//閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄�
+ HttpClient.getInstance().requestHttp(requestUrl, new JsonObject().toString(), null);
}
public boolean isPhone(String phone) {
@@ -571,20 +782,62 @@
}
/**
+ * 娉ㄩ攢璐﹀彿(C绔处鍙�)
+ *
+ * @param pwd 璐﹀彿瀵嗙爜
+ * @param cloudCallBeak -
+ */
+ public void accountUnregisterC(String pwd, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.C_POST_MEMBER_UNREGISTER;
+ JsonObject json = new JsonObject();
+ json.addProperty("userId", UserConfigManage.getInstance().getUserId());
+ json.addProperty("pwd", pwd);
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+ /**
* 鐧诲綍鎴愬姛淇濆瓨鐧诲綍淇℃伅
*/
private void saveUserData(HDLLoginBean obj) {
if (obj != null) {
+ boolean isUserId = UserConfigManage.getInstance().getUserId().equals(obj.getUserId());
+ 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("");
+ }
UserConfigManage.getInstance().setLogin(true);//鏄惁鐧诲綍
UserConfigManage.getInstance().setAcceiptPolicy(true);//鏄惁閫夋嫨闅愮鏀跨瓥
UserConfigManage.getInstance().setLoginDateTime(System.currentTimeMillis());//鐧诲綍鏃堕棿
UserConfigManage.getInstance().setUserId(obj.getUserId());//鐢ㄦ埛id
- UserConfigManage.getInstance().setAccount(obj.getAccount());//璐﹀彿
+ //b绔拰c绔畾涔夎处鍙峰瓧娈典笉涓�鏍�
+ UserConfigManage.getInstance().setAccount(TextUtils.isEmpty(obj.getAccount()) ? obj.getUserPhone() : obj.getAccount());//璐﹀彿
+ UserConfigManage.getInstance().setBingPhone(obj.getUserPhone());//缁戝畾鎵嬫満
+ UserConfigManage.getInstance().setBingEmail(obj.getUserEmail());//缁戝畾閭
+
+ UserConfigManage.getInstance().setUserName(obj.getName());
UserConfigManage.getInstance().setToken(obj.getAccessToken());//Token
UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());//璁よ瘉璇锋眰澶村墠缂�(搴曞眰璇锋眰缁熶竴鍔�)
- UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());//鍒锋柊Token鐢ㄧ殑鍒锋柊Token鐢ㄧ殑
- boolean isUserId = UserConfigManage.getInstance().getUserId().equals(obj.getUserId());
- UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//涓庝笂涓�涓处鍙锋槸鍚﹀悓涓�涓�
+ UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());//鍒锋柊Token鐢ㄧ殑
UserConfigManage.getInstance().Save();
}
--
Gitblit v1.8.0