From d7ff801372431e64aee8f68ece4b8532cffb2207 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 七月 2024 18:32:49 +0800
Subject: [PATCH] 2024年07月02日18:32:40

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java |  138 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 130 insertions(+), 8 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 9afe853..9912143 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -54,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) {
@@ -91,6 +92,7 @@
             public void onSuccess(HDLLoginBean loginBean) {
 
                 if (callBack != null) {
+                    loginBean.setAccount(account);
                     saveUserData(loginBean);
                     callBack.onSuccess(loginBean);
                 }
@@ -220,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) {
@@ -331,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   璇█绫诲瀷
@@ -341,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)) {
@@ -502,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
 
@@ -585,6 +703,10 @@
             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鐢ㄧ殑

--
Gitblit v1.8.0