From f37af7140e197ed69db9dc8014a86f544a94ed4b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 二月 2025 14:53:27 +0800
Subject: [PATCH] 2025年02月12日14:53:24
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 81 ++++++++++++++++++++++++----------------
1 files changed, 49 insertions(+), 32 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 019000b..d8587be 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -168,7 +168,7 @@
jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
-
+ jsonObject.addProperty("appLanguage", UserConfigManage.getInstance().getCurrentAppLanguage());
jsonObject.addProperty("token", HDLLinkPMUser.getInstance().getAccessToken());
jsonObject.addProperty("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
@@ -780,31 +780,47 @@
}
}
break;
+ //uni鑾峰彇鍥剧墖
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_SELECTED_IMAGE: {
+
+ }
+ break;
}
- } else if (HDLUniMP.UNI_EVENT_REPLY_COMMON_MODEL.equals(topic)) {
+ } else if (HDLUniMP.UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD.equals(topic)) {
//缃戠粶璇锋眰妯″潡
- if (type.equals(HDLUniMP.UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD)) {
- String url = getKeyValue("url", getKeyValue("data", data));
- JsonObject jObject = new JsonObject();
- String body = getKeyValue("body", getKeyValue("data", data));
- if (!TextUtils.isEmpty(body)) {
- try {
- jObject = new Gson().fromJson(body, JsonObject.class);
- } catch (Exception ignored) {
+ JsonObject jObject = new JsonObject();
+ String body = getKeyValue("data", data);
+ if (!TextUtils.isEmpty(body)) {
+ try {
+ jObject = new Gson().fromJson(body, JsonObject.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HttpClient.getInstance().requestHttp(type, jObject.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ //鏈湴缂撳瓨鏁版嵁
+ if (callback != null) {
+ try {
+ if (jsonStr.startsWith("{")) {
+ uniSuccessCallback(mode_type, new Gson().fromJson(jsonStr, JsonObject.class), callback);
+ } else if (jsonStr.startsWith("[")) {
+ uniSuccessCallback(mode_type, new Gson().fromJson(jsonStr, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(mode_type, jsonStr, callback);
+ }
+ } catch (Exception e) {
+ uniSuccessCallback(mode_type, jsonStr, callback);
+ }
}
}
- HttpClient.getInstance().requestHttp(url, jObject.toString(), new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String jsonStr) {
- uniSuccessCallback(mode_type, jsonStr, callback);
- }
- @Override
- public void onFailure(HDLException e) {
- uniExceptionCallback(mode_type, e, callback);
- }
- });
- }
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(mode_type, e, callback);
+ }
+ });
+
}
} catch (Exception e) {
@@ -2832,17 +2848,18 @@
if (data == null) {
data = new JSONObject();
}
- if (isTokenAndRefreshToken) {
- //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,浣嗛渶瑕佸師鐢熸彁渚涜繖浜涙暟鎹�
- data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
- data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
- if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
- AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
- }
- data.put("serverAddress", AppConfigManage.getUserRegionUrl());
- data.put("appKey", AppConfigManage.getAppKey());
- data.put("appSecret", AppConfigManage.getAppSecret());
- }
+// if (isTokenAndRefreshToken) {
+// //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,浣嗛渶瑕佸師鐢熸彁渚涜繖浜涙暟鎹�
+// data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
+// data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
+// if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
+// AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
+// }
+// data.put("serverAddress", AppConfigManage.getUserRegionUrl());
+// data.put("appKey", AppConfigManage.getAppKey());
+// data.put("appSecret", AppConfigManage.getAppSecret());
+// }
+ data.put("appLanguage", UserConfigManage.getInstance().getCurrentAppLanguage());
uniCallBackBaseBean.setData(data);
return getJSONObject(uniCallBackBaseBean);
} catch (Exception e) {
--
Gitblit v1.8.0