From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 22 八月 2024 13:43:47 +0800
Subject: [PATCH] 2024年08月22日13:43:45
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 b120252..61e066b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -3,13 +3,16 @@
import android.app.Application;
import android.content.Context;
import android.os.Environment;
+import android.os.SystemClock;
import android.text.TextUtils;
import com.google.gson.Gson;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -98,7 +101,8 @@
/**
* 鐩戝惉鐩稿叧鍥炶皟
*/
- private void registerCallBack() {DCUniMPSDK.getInstance();
+ private void registerCallBack() {
+ DCUniMPSDK.getInstance();
//1.璁剧疆灏忕▼搴忚鍏抽棴浜嬩欢鐩戝惉
DCUniMPSDK.getInstance().setUniMPOnCloseCallBack(new IUniMPOnCloseCallBack() {
@Override
@@ -117,7 +121,8 @@
//灏忕▼搴忚鍏抽棴浜嗛�氱煡缁欏師鐢�
BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
+ baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
+ baseEventBus.setType(LowerTagType.power_station.toString());
EventBus.getDefault().post(baseEventBus);
}
@@ -131,6 +136,8 @@
HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡 event=" + event);
//鏆傛椂閫氳繃杩欎釜澶勭悊灏忕▼搴忓悓鏃跺鏉＄浉鍚岀殑璇锋眰
if (data == null) {
+ HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,data鏁版嵁涓簄ull銆�", true);
+
return;
}
// String key= MD5Utils.getMd5(event+data.toString());
@@ -149,8 +156,13 @@
HdlLogLogic.print("uni_GetAppParams callback:" + params.toString());
} else {
//闄や簡缁熶竴澶勭悊锛屽墿浣欏叾瀹冪壒瀹氬満鏅殑浜嬩欢閫氱煡
- if (onOtherUniMPEventCallBack != null) {
+ if (onOtherUniMPEventCallBack!= null) {
onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback);
+ } else {
+ HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,鍥炶皟浜嬩欢涓簄ull,鏃犳硶鍥炶皟浜嬩欢骞舵墽琛屼笟鍔￠�昏緫--->event=" + event + "\r\n" + "data=" + data, true);
+ //鏈夊彲鑳芥槸绯荤粺鍥炴敹鎺塧ctivity瀵艰嚧鍥炶皟涓簄ull锛岃繖鏍锋儏鍐典笅寮哄埗杩斿洖鐧诲綍鐣岄潰锛�
+ //todo 闀挎椂闂存病鍝嶅簲灏嗛��鍑虹櫥褰曠晫闈㈤噸鏂扮櫥褰�
+ HDLLinkPMUser.getInstance().logout(0);
}
}
}
@@ -250,15 +262,6 @@
return true;
}
- /**
- * 鎵撳紑灏忕▼搴�
- *
- * @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, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
if (TextUtils.isEmpty(uniAppId)) {
HdlThreadLogic.toast(mContext, "uni Id null");
@@ -274,14 +277,22 @@
UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
uniMPOpenConfiguration.path = path;
uniMPOpenConfiguration.extraData = jsonObject;
+ uniMPOpenConfiguration.splashClass = MySplashView.class;
uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
+ }
+ //android14鏈変簺璁惧鏈夐棶棰橈紝闇�瑕佺瓑寰�
+ if (android.os.Build.VERSION.SDK_INT >= 34) {
+ if (TextUtils.isEmpty(mCurrentAppId)) {
+ //绗竴娆＄敤瑕佷紤鐪�
+ SystemClock.sleep(1000);
+ }
}
mCurrentAppId = uniAppId;//璁板綍褰撳墠灏忕▼搴�
mUniMPCaches.put(uniMP.getAppid(), uniMP);
} catch (Exception e) {
e.printStackTrace();
HdlThreadLogic.toast(HDLApp.getInstance(), R.string.uni_open_error);
- initDCUniMPSDK(HDLApp.getInstance());
+// initDCUniMPSDK(HDLApp.getInstance());
HdlLogLogic.print("鎵撳紑澶辫触===" + e.getMessage());
}
}
@@ -353,12 +364,12 @@
if (mUniMPCaches.containsKey(uniAppId)) {
if (mUniMPCaches.get(uniAppId) != null) {
mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, data);
- HdlLogLogic.print("鍙戦�侀�氱煡鎴愬姛锛歟vent锛�" + topic + " data锛�" + new Gson().toJson(data));
+ HdlLogLogic.print("Android--->閫氱煡---uni--->涓婚:" + topic + "--->鍙戦�佹暟鎹�:" + new Gson().toJson(data));
} else {
- HdlLogLogic.print("鍙戦�佸け璐ワ紝灏忕▼搴忓璞′负绌猴細" + uniAppId);
+ HdlLogLogic.print("Android--->閫氱煡---uni--->澶辫触--->灏忕▼搴忓璞′负绌�:" + uniAppId);
}
} else {
- HdlLogLogic.print("鍙戦�佸け璐ワ紝鎵句笉鍒板搴旂殑灏忕▼搴忥細" + uniAppId);
+ HdlLogLogic.print("Android--->閫氱煡---uni--->澶辫触--->灏忕▼搴忓璞′负绌�:" + uniAppId);
}
}
--
Gitblit v1.8.0