From a8a25a3ae373115f9342c766a7ee241e8ca8f479 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 七月 2025 15:20:34 +0800
Subject: [PATCH] 2025年07月15日15:20:32

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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 c435338..2d9a54f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -13,12 +13,14 @@
 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.enums.LogoutType;
 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 com.hdl.photovoltaic.utils.SharedPreUtils;
 
 import java.io.File;
 import java.lang.reflect.Type;
@@ -72,7 +74,7 @@
             @Override
             public void onFailure(HDLException error) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(error);
+                    cloudCallBeak.onFailure(HttpClient.getException(error));
                 }
             }
         });
@@ -107,7 +109,7 @@
             @Override
             public void onFailure(HDLException error) {
                 if (callBack != null) {
-                    callBack.onFailure(error);
+                    callBack.onFailure(HttpClient.getException(error));
                 }
             }
         });
@@ -499,6 +501,7 @@
      * @param account       璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
      * @param loginPwd      瀵嗙爜
      * @param verifyCode    楠岃瘉鐮�
+     * @param phonePrefix   鎵嬫満鍙峰墠缂�
      * @param cloudCallBeak -
      */
     public void registerAccount_C(boolean isPhone, String account, String loginPwd, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -542,6 +545,7 @@
      * @param account       璐﹀彿 (鎵嬫満鎴栬�呴偖绠�)
      * @param loginPwd      鏂板瘑鐮�
      * @param verifyCode    楠岃瘉鐮�
+     * @param phonePrefix   鎵嬫満鍙峰墠缂�
      * @param cloudCallBeak -
      */
     public void changePassword_C(boolean isPhone, String account, String loginPwd, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -612,6 +616,7 @@
      *
      * @param memberPhone 鎵嬫満鍙凤紙鏈粦瀹氭墜鏈哄彿鍙傛暟浼爊ull锛�
      * @param memberEmail 閭锛堟湭缁戝畾閭鍙傛暟浼爊ull锛�
+     * @param phonePrefix 鎵嬫満鍙峰墠缂�
      * @param verifyCode  楠岃瘉鐮�
      */
     public void bindingAccount_C(String memberPhone, String memberEmail, String verifyCode, String phonePrefix, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -812,6 +817,25 @@
     }
 
     /**
+     * 閫�鍑虹櫥褰�
+     */
+    public void logout(LogoutType logoutType) {
+        HdlResidenceLogic.getInstance().pushDel(new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String obj) {
+//                SharedPreUtils.putBoolean("pushAddCache", true);
+                HDLLinkPMUser.getInstance().logout(logoutType.getValue());
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+//                SharedPreUtils.putBoolean("pushAddCache", false);
+                HDLLinkPMUser.getInstance().logout(logoutType.getValue());
+            }
+        });
+    }
+
+    /**
      * 鐧诲綍鎴愬姛淇濆瓨鐧诲綍淇℃伅
      */
     private void saveUserData(HDLLoginBean obj) {
@@ -838,6 +862,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