From 14de918a79943e4961b09fa01ed320c6cad41f2e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 17:14:51 +0800
Subject: [PATCH] Revert "Revert "Merge branch 'hxb' into wjc""
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index c434570..521c6d6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -27,6 +27,7 @@
import io.dcloud.feature.sdk.Interface.IUniMP;
import io.dcloud.feature.sdk.Interface.IUniMPOnCloseCallBack;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
+import io.dcloud.feature.unimp.config.UniMPOpenConfiguration;
public class HDLUniMPSDKManager {
@@ -243,12 +244,13 @@
/**
* 鎵撳紑灏忕▼搴�
*
- * @param uniAppId 灏忕▼搴廔D
- * @param path 鎸囧畾璺緞
- * 渚嬶細pages/component/scroll-view/scroll-view?a=1&b=2&c=3
- * @param callBack 鐩戝惉灏忕▼搴廜therUniMPEvent浜嬩欢
+ * @param uniAppId 灏忕▼搴廔D
+ * @param path 鎸囧畾璺緞
+ * 渚嬶細pages/component/scroll-view/scroll-view?a=1&b=2&c=3
+ * @param jsonObject 闄勫姞鏁版嵁
+ * @param callBack 鐩戝惉灏忕▼搴廜therUniMPEvent浜嬩欢
*/
- public void openUniMP(String uniAppId, String path, IOnOtherUniMPEventCallBack callBack) {
+ public void openUniMP(String uniAppId, String path, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
if (TextUtils.isEmpty(uniAppId)) {
HdlThreadLogic.toast(mContext, "uni Id null");
HdlLogLogic.print(TAG, "灏忕▼搴廔D 涓嶈兘涓虹┖");
@@ -260,9 +262,10 @@
if (TextUtils.isEmpty(path)) {
uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId);
} else {
-// UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
-// uniMPOpenConfiguration.path = path;
- uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, path);
+ UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
+ uniMPOpenConfiguration.path = path;
+ uniMPOpenConfiguration.extraData = jsonObject;
+ uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
}
mCurrentAppId = uniAppId;//璁板綍褰撳墠灏忕▼搴�
mUniMPCaches.put(uniMP.getAppid(), uniMP);
@@ -317,9 +320,9 @@
}
try {
setOnOtherUniMPEventCallBack(callBack);
-// UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
-// uniMPOpenConfiguration.extraData = arguments;
- uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, arguments);
+ UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
+ uniMPOpenConfiguration.extraData = arguments;
+ uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
mCurrentAppId = uniAppId;//璁板綍褰撳墠灏忕▼搴�
mUniMPCaches.put(uniMP.getAppid(), uniMP);
} catch (Exception e) {
--
Gitblit v1.8.0