From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 6f15756..9f08ae4 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);
                 }
@@ -520,8 +522,8 @@
     /**
      * 缁戝畾璁よ瘉(鎵嬫満/閭)(C绔处鍙�)
      *
-     * @param memberPhone 鎵嬫満鍙凤紙缁戝畾鎵嬫満鍙穖emberEmail鍙傛暟浼犵┖锛�
-     * @param memberEmail 閭锛堢粦瀹氶偖绠眒emberPhone鍙傛暟浼犵┖锛�
+     * @param memberPhone 鎵嬫満鍙凤紙鏈粦瀹氭墜鏈哄彿鍙傛暟浼爊ull锛�
+     * @param memberEmail 閭锛堟湭缁戝畾閭鍙傛暟浼爊ull锛�
      * @param verifyCode  楠岃瘉鐮�
      */
     public void bindingAccount_C(String memberPhone, String memberEmail, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -665,6 +667,7 @@
             UserConfigManage.getInstance().setUserId(obj.getUserId());//鐢ㄦ埛id
             //b绔拰c绔畾涔夎处鍙峰瓧娈典笉涓�鏍�
             UserConfigManage.getInstance().setAccount(TextUtils.isEmpty(obj.getAccount()) ? obj.getUserPhone() : obj.getAccount());//璐﹀彿
+            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