From 3e904bfa8a1bb53dcf461e5c717f9b808e179245 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 08 一月 2025 16:27:48 +0800
Subject: [PATCH] 2025年01月08日16:27:46
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 5efd394..f437064 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -222,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) {
@@ -318,6 +319,41 @@
CUserInfo cUserInfo = gson.fromJson(jsonStr, CUserInfo.class);
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(cUserInfo);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+ /**
+ * 涓嬭浇瀛愯处鍙峰ご鍍�(C绔处鍙�)
+ *
+ * @param childAccountId 瀛愯处鍙穒d
+ * @param childId 瀛愯处鍙�(鎴愬憳)id鏌ユ壘瀛愯处鍙锋帴鍙ｈ幏鍙栧埌鐨勬暟鎹甶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);
}
}
@@ -657,7 +693,8 @@
if (obj != null) {
boolean isUserId = UserConfigManage.getInstance().getUserId().equals(obj.getUserId());
UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//涓庝笂涓�涓处鍙锋槸鍚﹀悓涓�涓�
- if (!UserConfigManage.getInstance().isTheSameLoginAccount()) {
+ //UserConfigManage.getInstance().getUserId()琛ㄧず绗竴娆″畨瑁呯櫥褰�
+ if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserId()) && !UserConfigManage.getInstance().isTheSameLoginAccount()) {
//涓嶅悓璐﹀彿,鍒犻櫎涔嬪墠鐨勬棫璐﹀彿鏃ュ織淇℃伅;
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
}
@@ -667,9 +704,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