From e62bcdaa38f0f00e25610b1a6c6ba847d65640ff Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 26 六月 2023 15:44:15 +0800
Subject: [PATCH] 2023年06月26日15:44:09
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 10 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 1a16526..245bdbc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.other;
+import com.google.gson.Gson;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -34,7 +35,7 @@
}
/**
- * 鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�
+ * 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
*
* @param appId -uni灏忕▼搴忔寚瀹氱殑appId
* @param event -uni灏忕▼搴忓彂鏉ユ暟鎹�
@@ -52,9 +53,9 @@
jsonObject = new org.json.JSONObject(data.toString());
}
//浣忓畢妯″潡
- if (HDLUniMP.UNI_EVENT_HOME_CREATION.equals(event)) {
+ if (HDLUniMP.UNI_EVENT_REPLY_HOME_LIST.equals(event)) {
if (callback != null) {
- callback.invoke(null);
+ uniCallbackData(null, "0", "", callback);
}
}
HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", event + "\r\n" + data);
@@ -71,7 +72,9 @@
* @param jsonObject 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
*/
public void openUniMP(String path, JSONObject jsonObject) {
- JSONObject json = this.createdJsonDate(jsonObject);
+
+ JSONObject json = this.createdJsonDate(jsonObject, true);
+ HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", json.toString());
HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
}
@@ -87,7 +90,7 @@
HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
callBackBaseBean.setTopic(topic);
callBackBaseBean.setData(body);
- HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.UNI_APP_ID, callBackBaseBean.getJSONObject());
+ HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.UNI_APP_ID, getJSONObject(callBackBaseBean));
} catch (Exception e) {
HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢", e.getMessage());
}
@@ -103,22 +106,82 @@
/**
* 缁勮uni鍙戦�佹暟鎹牸寮�
*
- * @param data -闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ * @param data -闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ * @param isTokenAndRefreshToken (true=搴曞眰榛樿娣诲姞token鍜宺efreshToken;false=涓嶅姞)
* @return JSONObject
*/
- public JSONObject createdJsonDate(JSONObject data) {
+ private JSONObject createdJsonDate(JSONObject data, boolean isTokenAndRefreshToken) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
try {
if (data == null) {
data = new JSONObject();
}
- data.put("token", UserConfigManage.getInstance().getToken());
- data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+ if (isTokenAndRefreshToken) {
+ data.put("token", UserConfigManage.getInstance().getToken());
+ data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+ }
uniCallBackBaseBean.setData(data);
- return uniCallBackBaseBean.getJSONObject();
+ return getJSONObject(uniCallBackBaseBean);
} catch (Exception e) {
HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
}
return new JSONObject();
}
+
+
+ /**
+ * 缁勮uni鍙戦�佹暟鎹牸寮�
+ * 鍥炶皟鏁版嵁缁檜ni灏忕▼搴�,缁熶竴鍦ㄨ繖閲屽鐞�;
+ *
+ * @param obj 闄勫姞鏁版嵁
+ * @param code 鐘舵�佺爜-鎴愬姛锛�0锛夋垨鑰呭け璐ワ紙-2锛�
+ * @param msg 缁撴灉鎻忚堪鐨勪俊鎭�
+ * @param callback 鍥炶皟
+ */
+ private void uniCallbackData(Object obj, String code, String msg, DCUniMPJSCallback callback) {
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ try {
+ uniCallBackBaseBean.setCode(code);
+ uniCallBackBaseBean.setMes(msg);
+ uniCallBackBaseBean.setData(obj);
+ if (callback != null) {
+ callback.invoke(uniCallBackBaseBean);
+ }
+ } catch (Exception e) {
+ HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
+ }
+
+
+ }
+
+
+ /**
+ * 鑾峰彇uni鍙戦�佸璞�
+ *
+ * @param obj 闄勫姞鏁版嵁
+ * @param code 鐘舵�佺爜
+ * @param msg 缁撴灉鎻忚堪鐨勪俊鎭�
+ */
+ private HDLUniMP.UniCallBackBaseBean getUniCallBackBaseBean(Object obj, String code, String msg) {
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setCode(code);
+ uniCallBackBaseBean.setMes(msg);
+ uniCallBackBaseBean.setData(obj);
+ return uniCallBackBaseBean;
+ }
+
+ /**
+ * 褰撳墠瀵硅薄杞� JSONObject
+ *
+ * @return JSONObject
+ */
+ private JSONObject getJSONObject(Object obj) {
+ try {
+ String json = new Gson().toJson(obj);
+ return new JSONObject(json);
+ } catch (Exception e) {
+ return new JSONObject();
+ }
+ }
}
+
--
Gitblit v1.8.0