From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 02 十二月 2024 10:29:09 +0800
Subject: [PATCH] 2024年12月02日10:29:05

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java |  148 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 134 insertions(+), 14 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 7717a37..dfcc18d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -5,15 +5,12 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
 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;
@@ -57,7 +54,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) {
@@ -94,6 +92,7 @@
             public void onSuccess(HDLLoginBean loginBean) {
 
                 if (callBack != null) {
+                    loginBean.setAccount(account);
                     saveUserData(loginBean);
                     callBack.onSuccess(loginBean);
                 }
@@ -223,6 +222,7 @@
     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) {
@@ -258,7 +258,7 @@
      */
     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) {
@@ -334,6 +334,62 @@
     }
 
     /**
+     * 涓嬭浇瀛愯处鍙峰ご鍍�(C绔处鍙�)
+     *
+     * @param childAccountId 瀛愯处鍙穒d
+     * @param childId        瀛愯处鍙�(鎴愬憳)id鏌ユ壘瀛愯处鍙锋帴鍙h幏鍙栧埌鐨勬暟鎹甶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 +400,7 @@
      * @param memberSex      鐢ㄦ埛鎬у埆
      * @param cloudCallBeak  -
      */
-    public void updateMemberInfo_C(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)) {
@@ -505,6 +555,71 @@
 
     }
 
+    /**
+     * 缁戝畾璁よ瘉(鎵嬫満/閭)(C绔处鍙�)
+     *
+     * @param memberPhone 鎵嬫満鍙凤紙鏈粦瀹氭墜鏈哄彿鍙傛暟浼爊ull锛�
+     * @param memberEmail 閭锛堟湭缁戝畾閭鍙傛暟浼爊ull锛�
+     * @param verifyCode  楠岃瘉鐮�
+     */
+    public void bindingAccount_C(String memberPhone, String memberEmail, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
+        String requestUrl = HttpApi.C_POST_MEMBERINFO_BINDWITHACCOUNT;
+        JsonObject json = new JsonObject();
+        if (!TextUtils.isEmpty(memberPhone)) {
+            json.addProperty("memberPhone", memberPhone);//鎵嬫満鍙�
+        }
+        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);
+                }
+            }
+        });
+
+
+    }
+
+
+    /**
+     * 瑙g粦璁よ瘉(鎵嬫満/閭)(C绔处鍙�)
+     *
+     * @param unBindLabel 瑙g粦鏍囪瘑锛圥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
 
@@ -554,9 +669,10 @@
     /**
      * 閫�鍑虹櫥褰曟椂璋冪敤锛屾竻闄ゆ帹閫佹暟鎹�
      */
-    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) {
@@ -587,9 +703,13 @@
             UserConfigManage.getInstance().setUserId(obj.getUserId());//鐢ㄦ埛id
             //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鐢ㄧ殑
+            UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());//鍒锋柊Token鐢ㄧ殑
             UserConfigManage.getInstance().Save();
         }
 

--
Gitblit v1.8.0