From ba84a556dc93fcf75e6ec76f999344d3f96ad788 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 02 二月 2024 18:05:24 +0800
Subject: [PATCH] 2024年02月02日18:04:36

---
 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 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 521c6d6..8f214c8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -12,7 +12,9 @@
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.other.HdlLogLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -101,7 +103,7 @@
             @Override
             public void onClose(String appid) {
                 if (AppConfigManage.isDebug()) {
-                    HdlLogLogic.print(TAG, "鏀跺埌灏忕▼搴忛�氱煡  琚叧闂簡");
+                    HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡  琚叧闂簡");
                 }
                 //灏忕▼搴忚鍏抽棴闇�瑕佸瀹炰緥缂撳瓨鍒犻櫎鎿嶄綔
                 if (mUniMPCaches.containsKey(appid)) {
@@ -111,6 +113,12 @@
                 if (appid.equals(mCurrentAppId)) {
                     mCurrentAppId = "";
                 }
+
+                //灏忕▼搴忚鍏抽棴浜嗛�氱煡缁欏師鐢�
+                BaseEventBus baseEventBus = new BaseEventBus();
+                baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
+                EventBus.getDefault().post(baseEventBus);
+
             }
         });
 
@@ -119,7 +127,7 @@
             @Override
             public void onUniMPEventReceive(String appid, String event, Object data, DCUniMPJSCallback callback) {
 //                handelUniMPEventReceive(appid, event, data, callback);
-                HdlLogLogic.print(TAG, "鏀跺埌灏忕▼搴忛�氱煡    event=" + event);
+                HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡    event=" + event);
                 //鏆傛椂閫氳繃杩欎釜澶勭悊灏忕▼搴忓悓鏃跺鏉$浉鍚岀殑璇锋眰
                 if (data == null) {
                     return;
@@ -137,7 +145,7 @@
                     //鍥炰紶鏁版嵁缁欏皬绋嬪簭
                     JSONObject params = getAppParams();
                     callback.invoke(params);
-                    HdlLogLogic.print(TAG, "uni_GetAppParams callback:" + params.toString());
+                    HdlLogLogic.print("uni_GetAppParams callback:" + params.toString());
                 } else {
                     //闄や簡缁熶竴澶勭悊锛屽墿浣欏叾瀹冪壒瀹氬満鏅殑浜嬩欢閫氱煡
                     if (onOtherUniMPEventCallBack != null) {
@@ -185,12 +193,12 @@
     public void checkUniMPResource(String uniAppId) {
         //2.涓嶆槸绗竴娆″惎鍔ㄤ簡锛屽厛鍒ゆ柇wgt鍖呬箣鍓嶆湁涔堟湁閮ㄧ讲杩�
         if (!DCUniMPSDK.getInstance().isExistsApp(uniAppId)) {
-            HdlLogLogic.print(TAG, "DCUni wgt涔嬪墠杩樻病閮ㄧ讲杩�");
+            HdlLogLogic.print("DCUni wgt涔嬪墠杩樻病閮ㄧ讲杩�");
             //涔嬪墠娌¢儴缃茶繃閲嶆柊閮ㄧ讲
             hdlReleaseAppResourceToRunPathWithAppid(uniAppId);
 //            [self hdlReleaseAppResourceToRunPathWithAppid:uniAppId];
         } else {
-            HdlLogLogic.print(TAG, "DCUni wgt宸茬粡閮ㄧ讲杩�");
+            HdlLogLogic.print("DCUni wgt宸茬粡閮ㄧ讲杩�");
         }
     }
 
@@ -203,7 +211,7 @@
         String wgtPath = mContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS) + "/" + uniAppId + ".wgt";
         boolean b = fileIsExists(wgtPath);
         if (b) {
-            HdlLogLogic.print(TAG, "wgt鍖呮湰鍦板瓨鍦�");
+            HdlLogLogic.print("wgt鍖呮湰鍦板瓨鍦�");
             DCUniMPSDK.getInstance().releaseWgtToRunPathFromePath(uniAppId, wgtPath, new ICallBack() {
                 @Override
                 public Object onCallBack(int code, Object pArgs) {
@@ -212,13 +220,13 @@
 
                     } else {
                         //閲婃斁wgt澶辫触
-                        HdlLogLogic.print(TAG, "璧勬簮閲婃斁澶辫触");
+                        HdlLogLogic.print("璧勬簮閲婃斁澶辫触");
                     }
                     return null;
                 }
             });
         } else {
-            HdlLogLogic.print(TAG, "wgt鍖呮湰鍦颁笉瀛樺湪");
+            HdlLogLogic.print("wgt鍖呮湰鍦颁笉瀛樺湪");
         }
     }
 
@@ -253,7 +261,7 @@
     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 涓嶈兘涓虹┖");
+            HdlLogLogic.print("灏忕▼搴廔D 涓嶈兘涓虹┖");
             return;
         }
         try {
@@ -273,7 +281,7 @@
             e.printStackTrace();
             HdlThreadLogic.toast(HDLApp.getInstance(), R.string.uni_open_error);
             initDCUniMPSDK(HDLApp.getInstance());
-            HdlLogLogic.print(TAG, "鎵撳紑澶辫触" + e.getMessage());
+            HdlLogLogic.print("鎵撳紑澶辫触===" + e.getMessage());
         }
     }
 
@@ -292,7 +300,7 @@
             @Override
             public void onInitFinished(boolean b) {
 
-                HdlLogLogic.print("unimp", "UniMPSDK 鍒濆鍖栧畬鎴�----" + b);
+                HdlLogLogic.print("UniMPSDK 鍒濆鍖栧畬鎴�----" + b);
             }
         });
 
@@ -315,7 +323,7 @@
      */
     public void openUniMP(String uniAppId, JSONObject arguments, IOnOtherUniMPEventCallBack callBack) {
         if (TextUtils.isEmpty(uniAppId)) {
-            HdlLogLogic.print(TAG, "灏忕▼搴廔D 涓嶈兘涓虹┖");
+            HdlLogLogic.print("灏忕▼搴廔D 涓嶈兘涓虹┖");
             return;
         }
         try {
@@ -327,7 +335,7 @@
             mUniMPCaches.put(uniMP.getAppid(), uniMP);
         } catch (Exception e) {
             e.printStackTrace();
-            HdlLogLogic.print(TAG, "鎵撳紑澶辫触" + e.getMessage());
+            HdlLogLogic.print("鎵撳紑澶辫触===" + e.getMessage());
         }
     }
 
@@ -336,20 +344,20 @@
      * 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
      *
      * @param uniAppId 灏忕▼搴忔寚瀹�
-     * @param event    灏忕▼搴忔寚瀹氫富棰�
+     * @param topic    灏忕▼搴忔寚瀹氫富棰�
      * @param data     String鎴朖SON
      */
-    public void sendUniMPEvent(String uniAppId, String event, Object data) {
+    public void sendUniMPEvent(String uniAppId, String topic, Object data) {
 
         if (mUniMPCaches.containsKey(uniAppId)) {
             if (mUniMPCaches.get(uniAppId) != null) {
-                mUniMPCaches.get(uniAppId).sendUniMPEvent(event, data);
-                HdlLogLogic.print(TAG, "鍙戦�侀�氱煡鎴愬姛锛歟vent锛�" + event + " data锛�" + new Gson().toJson(data));
+                mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, data);
+                HdlLogLogic.print("鍙戦�侀�氱煡鎴愬姛锛歟vent锛�" + topic + " data锛�" + new Gson().toJson(data));
             } else {
-                HdlLogLogic.print(TAG, "鍙戦�佸け璐ワ紝灏忕▼搴忓璞′负绌猴細" + uniAppId);
+                HdlLogLogic.print("鍙戦�佸け璐ワ紝灏忕▼搴忓璞′负绌猴細" + uniAppId);
             }
         } else {
-            HdlLogLogic.print(TAG, "鍙戦�佸け璐ワ紝鎵句笉鍒板搴旂殑灏忕▼搴忥細" + uniAppId);
+            HdlLogLogic.print("鍙戦�佸け璐ワ紝鎵句笉鍒板搴旂殑灏忕▼搴忥細" + uniAppId);
         }
 
     }
@@ -363,7 +371,7 @@
      */
     public void sendUniMPEventToCurrentOpenAppId(String event, Object data) {
         if (TextUtils.isEmpty(mCurrentAppId)) {
-            HdlLogLogic.print(TAG, "褰撳墠娌℃墦寮�鐨勫皬绋嬪簭");
+            HdlLogLogic.print("褰撳墠娌℃墦寮�鐨勫皬绋嬪簭");
             return;
         }
         sendUniMPEvent(mCurrentAppId, event, data);
@@ -391,7 +399,7 @@
 
     public void setOnOtherUniMPEventCallBack(IOnOtherUniMPEventCallBack onOtherUniMPEventCallBack) {
         this.onOtherUniMPEventCallBack = onOtherUniMPEventCallBack;
-        HdlLogLogic.print("onOtherUniMPEventCallBack", "set callback");
+        HdlLogLogic.print("onOtherUniMPEventCallBack set callback");
     }
 
     /**
@@ -402,7 +410,7 @@
     public void checkRemoveOtherUniMPEventCallBack(IOnOtherUniMPEventCallBack onOtherUniMPEventCallBack) {
         if (this.onOtherUniMPEventCallBack == onOtherUniMPEventCallBack) {
             this.onOtherUniMPEventCallBack = null;
-            HdlLogLogic.print("onOtherUniMPEventCallBack", "remove callback");
+            HdlLogLogic.print("onOtherUniMPEventCallBack remove callback");
         }
     }
 

--
Gitblit v1.8.0