From 9e875b253959eff8f6af567308ad804fe69d0a62 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 03 十一月 2023 18:04:57 +0800
Subject: [PATCH] 2023年11月03日18:04:44
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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..7717a37 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -75,7 +75,7 @@
}
/**
- * 鐧诲綍(B绔处鍙�)
+ * 鐧诲綍(B,C绔处鍙�)
* 閫氳繃璐﹀彿鍜屽瘑鐮�
*
* @param account 鎵嬫満鎴栬�呴偖绠�
@@ -83,13 +83,13 @@
* @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) {
@@ -118,7 +118,7 @@
* @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, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_FORGET_PROGRAM_PWD;
JsonObject json = new JsonObject();
if (isPhone) {
@@ -155,7 +155,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 +183,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,7 +220,7 @@
*
* @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();
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -256,7 +256,7 @@
* @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>() {
@Override
@@ -281,7 +281,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 +309,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>() {
@@ -344,13 +344,13 @@
* @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,7 +401,7 @@
* @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, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_GET_OAUTH_REGISTER;
JsonObject json = new JsonObject();
if (isPhone) {
@@ -443,7 +443,7 @@
* @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, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_FORGET_PROGRAM_PWD;
JsonObject json = new JsonObject();
if (isPhone) {
@@ -481,7 +481,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);//鑰佸瘑鐮�
@@ -510,7 +510,7 @@
/**
- * 鍙戦�侀獙璇佺爜
+ * 鍙戦�侀獙璇佺爜(B鍜孋绔叡鐢�)
*
* @param isPhone true琛ㄧず鎵嬫満鍙�,鍚﹀垯鏄偖绠�
* @param account 璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
@@ -575,16 +575,21 @@
*/
private void saveUserData(HDLLoginBean obj) {
if (obj != null) {
+ boolean isUserId = UserConfigManage.getInstance().getUserId().equals(obj.getUserId());
+ UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//涓庝笂涓�涓处鍙锋槸鍚﹀悓涓�涓�
+ if (!UserConfigManage.getInstance().isTheSameLoginAccount()) {
+ //涓嶅悓璐﹀彿,鍒犻櫎涔嬪墠鐨勬棫璐﹀彿鏃ュ織淇℃伅;
+ HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
+ }
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().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().Save();
}
--
Gitblit v1.8.0