From 14de918a79943e4961b09fa01ed320c6cad41f2e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 17:14:51 +0800
Subject: [PATCH] Revert "Revert "Merge branch 'hxb' into wjc""
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 94 +++++++++++++++++++++++++++++++++++------------
1 files changed, 70 insertions(+), 24 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 a3e2047..0e69701 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -3,7 +3,7 @@
import com.google.gson.Gson;
import com.google.gson.JsonObject;
-import com.hdl.photovoltaic.ui.bean.LoginBean;
+import com.hdl.photovoltaic.ui.bean.LoginUserBean;
import com.hdl.photovoltaic.ui.bean.LoginUserRegionBean;
import com.hdl.photovoltaic.bean.HttpResponsePack;
import com.hdl.photovoltaic.config.AppConfigManage;
@@ -17,12 +17,17 @@
import java.util.regex.Pattern;
/**
- * 鐧婚檰鐣岄潰鐨勯�昏緫
+ * 鐧诲綍鐣岄潰鐨勯�昏緫
*/
public class HdlAccountLogic {
private static volatile HdlAccountLogic sHdlAccountLogic;
+ /**
+ * 鑾峰彇褰撳墠瀵硅薄
+ *
+ * @return HdlAccountLogic
+ */
public static synchronized HdlAccountLogic getInstance() {
if (sHdlAccountLogic == null) {
synchronized (HdlAccountLogic.class) {
@@ -48,14 +53,12 @@
HttpClient.getInstance().requestFullHttp(full, jsonObject.toString(), true, true, new BaseSuccessFailureCallBeak() {
@Override
public void onSuccess(HttpResponsePack httpResponsePack) {
- if (httpResponsePack.getData() != null) {
+ if (httpResponsePack != null && httpResponsePack.getData() != null) {
Gson gson = new Gson();
String json = gson.toJson(httpResponsePack.getData());
LoginUserRegionBean loginUserRegionBean = new Gson().fromJson(json, LoginUserRegionBean.class);
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(loginUserRegionBean);
- } else {
- cloudCallBeak.onFailure(new Exception());
}
}
}
@@ -70,14 +73,14 @@
}
/**
- * 鐧诲綍
+ * 鐧诲綍(B绔处鍙�)
* 閫氳繃璐﹀彿鍜屽瘑鐮�
*
* @param account 鎵嬫満鎴栬�呴偖绠�
* @param loginPwd 瀵嗙爜
* @param cloudCallBeak -
*/
- public void loginByPassword(String account, String loginPwd, CloudCallBeak<LoginBean> cloudCallBeak) {
+ public void loginByPassword(String account, String loginPwd, CloudCallBeak<LoginUserBean> cloudCallBeak) {
String requestUrl = HttpApi.POST_Login;
JsonObject json = new JsonObject();
json.addProperty("account", account);
@@ -88,15 +91,13 @@
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
@Override
public void onSuccess(HttpResponsePack httpResponsePack) {
- if (httpResponsePack.getData() != null) {
+ if (httpResponsePack != null && httpResponsePack.getData() != null) {
Gson gson = new Gson();
String json = gson.toJson(httpResponsePack.getData());
- LoginBean loginBean = new Gson().fromJson(json, LoginBean.class);
- saveUserData(loginBean);
+ LoginUserBean loginUserBean = new Gson().fromJson(json, LoginUserBean.class);
+ saveUserData(loginUserBean);
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(loginBean);
- } else {
- cloudCallBeak.onFailure(new Exception());
+ cloudCallBeak.onSuccess(loginUserBean);
}
}
}
@@ -110,6 +111,50 @@
});
}
+ /**
+ * 鍒锋柊Token(B绔处鍙�)
+ *
+ * @param account 鎵嬫満鎴栬�呴偖绠�
+ * @param loginPwd 瀵嗙爜
+ * @param cloudCallBeak -
+ */
+ public void refreshToken(String account, String loginPwd, CloudCallBeak<LoginUserBean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Login;
+ JsonObject json = new JsonObject();
+ json.addProperty("grantType", "refresh_token");
+// json.addProperty("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ @Override
+ public void onSuccess(HttpResponsePack httpResponsePack) {
+ if (httpResponsePack != null && httpResponsePack.getData() != null) {
+ Gson gson = new Gson();
+ String json = gson.toJson(httpResponsePack.getData());
+ LoginUserBean loginUserBean = new Gson().fromJson(json, LoginUserBean.class);
+ saveUserData(loginUserBean);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(loginUserBean);
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(Exception exception) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(exception);
+ }
+ }
+ });
+ }
+
+
+ /**
+ * 閫�鍑虹櫥褰曟椂璋冪敤锛屾竻闄ゆ帹閫佹暟鎹�
+ */
+ public void SignOutClearData() {
+ String requestUrl = HttpApi.POST_GET_IMAGE_LOGOUT;
+ //閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄�
+ }
public boolean isPhone(String phone) {
Pattern p = Pattern.compile("^((13[0-9])|(14[0|5|6|7|9])|(15[0-3])|(15[5-9])|(16[6|7])|(17[2|3|5|6|7|8])|(18[0-9])|(19[1|8|9]))\\d{8}$");
@@ -123,22 +168,23 @@
}
/**
- * 鐧诲綍鎴愬姛淇濆瓨
+ * 鐧诲綍鎴愬姛淇濆瓨鐧诲綍淇℃伅
*/
- private void saveUserData(LoginBean obj) {
+ private void saveUserData(LoginUserBean obj) {
if (obj != null) {
- UserConfigManage.getInstance().setLogin(true);
- UserConfigManage.getInstance().setAcceiptPolicy(true);
- UserConfigManage.getInstance().setLoginDateTime(System.currentTimeMillis());
- UserConfigManage.getInstance().setUserId(obj.getUserId());
- UserConfigManage.getInstance().setAccount(obj.getAccount());
- UserConfigManage.getInstance().setToken(obj.getAccessToken());
- UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());
- UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());
+ UserConfigManage.getInstance().setLogin(true);//鏄惁鐧诲綍
+ UserConfigManage.getInstance().setAcceiptPolicy(true);//鏄惁閫夋嫨闅愮鏀跨瓥
+ UserConfigManage.getInstance().setLoginDateTime(System.currentTimeMillis());//鐧诲綍鏃堕棿
+ UserConfigManage.getInstance().setUserId(obj.getUserId());//鐢ㄦ埛id
+ UserConfigManage.getInstance().setAccount(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().setTheSameLoginAccount(isUserId);//涓庝笂涓�涓处鍙锋槸鍚﹀悓涓�涓�
}
}
+
}
--
Gitblit v1.8.0