From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 927a8b1..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) {
@@ -530,7 +532,7 @@
if (!TextUtils.isEmpty(memberPhone)) {
json.addProperty("memberPhone", memberPhone);//鎵嬫満鍙�
}
- if (!TextUtils.isEmpty(memberPhone)) {
+ if (!TextUtils.isEmpty(memberEmail)) {
json.addProperty("memberEmail", memberEmail);//閭
}
json.addProperty("verifyCode", verifyCode);//楠岃瘉鐮�
@@ -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