From e604e1797744977f599dad9f543db3e7477fe115 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 七月 2023 14:35:58 +0800
Subject: [PATCH] 2023年07月12日14:35:48
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 100 +++++++++++++++++++++++--------------------------
1 files changed, 47 insertions(+), 53 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 27d9bfd..136372c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -3,14 +3,15 @@
import com.google.gson.Gson;
import com.google.gson.JsonObject;
-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;
+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.callback.ILoginCallBack;
+import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
-import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import java.util.regex.Matcher;
@@ -46,27 +47,19 @@
*
* @param i_account 璐﹀彿
*/
- public void regionByAccount(String i_account, CloudCallBeak<LoginUserRegionBean> cloudCallBeak) {
- JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("account", i_account);
- String full = AppConfigManage.getAPPRegionUrl() + HttpApi.POST_RegionByUserAccount;
- HttpClient.getInstance().requestFullHttp(full, jsonObject.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ public void regionByAccount(String i_account, CloudCallBeak<HDLUserRegionBean> cloudCallBeak) {
+ HDLLinkPMUser.getInstance().regionByAccount(i_account, new IRegionByAccountCallBack() {
@Override
- public void onSuccess(HttpResponsePack httpResponsePack) {
- 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);
- }
+ public void onSuccess(HDLUserRegionBean regionBean) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(regionBean);
}
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException error) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(error);
}
}
});
@@ -76,39 +69,35 @@
* 鐧诲綍(B绔处鍙�)
* 閫氳繃璐﹀彿鍜屽瘑鐮�
*
- * @param account 鎵嬫満鎴栬�呴偖绠�
- * @param loginPwd 瀵嗙爜
- * @param cloudCallBeak -
+ * @param account 鎵嬫満鎴栬�呴偖绠�
+ * @param loginPwd 瀵嗙爜
+ * @param callBack -
*/
- public void loginByPassword(String account, String loginPwd, CloudCallBeak<LoginUserBean> cloudCallBeak) {
+ public void loginByPassword(String account, String loginPwd, ILoginCallBack callBack) {
String requestUrl = HttpApi.POST_Login;
JsonObject json = new JsonObject();
json.addProperty("account", account);
json.addProperty("loginPwd", loginPwd);
// json.addProperty("platform", "APP");
json.addProperty("grantType", "password");
-
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ HDLLinkPMUser.getInstance().loginByPassword(account, loginPwd, new ILoginCallBack() {
@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);
- }
+ public void onSuccess(HDLLoginBean loginBean) {
+
+ if (callBack != null) {
+ saveUserData(loginBean);
+ callBack.onSuccess(loginBean);
}
}
@Override
- public void onFailure(Exception exception) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ public void onFailure(HDLException error) {
+ if (callBack != null) {
+ callBack.onFailure(error);
}
}
});
+
}
/**
@@ -118,34 +107,39 @@
* @param loginPwd 瀵嗙爜
* @param cloudCallBeak -
*/
- public void refreshToken(String account, String loginPwd, CloudCallBeak<LoginUserBean> cloudCallBeak) {
+ public void refreshToken(String account, String loginPwd, CloudCallBeak<HDLLoginBean> cloudCallBeak) {
String requestUrl = HttpApi.POST_Login;
JsonObject json = new JsonObject();
json.addProperty("grantType", "refresh_token");
-
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+// json.addProperty("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@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);
- }
+ public void onSuccess(String jsonStr) {
+ Gson gson = new Gson();
+ HDLLoginBean loginBean = gson.fromJson(jsonStr, HDLLoginBean.class);
+// saveUserData(loginBean);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(loginBean);
}
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(e);
}
}
});
}
+
+ /**
+ * 閫�鍑虹櫥褰曟椂璋冪敤锛屾竻闄ゆ帹閫佹暟鎹�
+ */
+ 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}$");
@@ -161,7 +155,7 @@
/**
* 鐧诲綍鎴愬姛淇濆瓨鐧诲綍淇℃伅
*/
- private void saveUserData(LoginUserBean obj) {
+ private void saveUserData(HDLLoginBean obj) {
if (obj != null) {
UserConfigManage.getInstance().setLogin(true);//鏄惁鐧诲綍
UserConfigManage.getInstance().setAcceiptPolicy(true);//鏄惁閫夋嫨闅愮鏀跨瓥
--
Gitblit v1.8.0