From b24f21463d4d1692fe22666625253108cd106300 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 05 六月 2024 09:13:43 +0800
Subject: [PATCH] Merge branch 'dev' into feature/v1.4.0

---
 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 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 9f1abdf..626e270 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -265,7 +265,7 @@
      * @param jsonObject 闄勫姞鏁版嵁
      * @param callBack   鐩戝惉灏忕▼搴廜therUniMPEvent浜嬩欢
      */
-    public void openUniMP(String uniAppId, String path, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
+    public void openUniMPDelay(String uniAppId, String path, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
         if (TextUtils.isEmpty(uniAppId)) {
             HdlThreadLogic.toast(mContext, "uni Id null");
             HdlLogLogic.print("灏忕▼搴廔D 涓嶈兘涓虹┖");
@@ -300,6 +300,34 @@
         }
     }
 
+    public void openUniMP(String uniAppId, String path, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
+        if (TextUtils.isEmpty(uniAppId)) {
+            HdlThreadLogic.toast(mContext, "uni Id null");
+            HdlLogLogic.print("灏忕▼搴廔D 涓嶈兘涓虹┖");
+            return;
+        }
+        try {
+            setOnOtherUniMPEventCallBack(callBack);
+            uniMP = null;
+            if (TextUtils.isEmpty(path)) {
+                uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId);
+            } else {
+                UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
+                uniMPOpenConfiguration.path = path;
+                uniMPOpenConfiguration.extraData = jsonObject;
+                uniMPOpenConfiguration.splashClass=MySplashView.class;
+                uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
+            }
+            mCurrentAppId = uniAppId;//璁板綍褰撳墠灏忕▼搴�
+            mUniMPCaches.put(uniMP.getAppid(), uniMP);
+        } catch (Exception e) {
+            e.printStackTrace();
+            HdlThreadLogic.toast(HDLApp.getInstance(), R.string.uni_open_error);
+//            initDCUniMPSDK(HDLApp.getInstance());
+            HdlLogLogic.print("鎵撳紑澶辫触===" + e.getMessage());
+        }
+    }
+
     /**
      * 鍒濆鍖朥niMPSDK 灏忕▼搴廠DK
      */

--
Gitblit v1.8.0