From 3e904bfa8a1bb53dcf461e5c717f9b808e179245 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 08 一月 2025 16:27:48 +0800
Subject: [PATCH] 2025年01月08日16:27:46
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 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 b6e4a7f..459be73 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -7,12 +7,17 @@
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.config.UserConfigManage;
+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;
+import org.greenrobot.eventbus.EventBus;
import org.json.JSONException;
import org.json.JSONObject;
@@ -90,12 +95,14 @@
private void removeCallBack() {
DCUniMPSDK.getInstance().setUniMPOnCloseCallBack(null);
DCUniMPSDK.getInstance().setOnUniMPEventCallBack(null);
+
}
/**
* 鐩戝惉鐩稿叧鍥炶皟
*/
private void registerCallBack() {
+ DCUniMPSDK.getInstance();
//1.璁剧疆灏忕▼搴忚鍏抽棴浜嬩欢鐩戝惉
DCUniMPSDK.getInstance().setUniMPOnCloseCallBack(new IUniMPOnCloseCallBack() {
@Override
@@ -111,6 +118,13 @@
if (appid.equals(mCurrentAppId)) {
mCurrentAppId = "";
}
+
+ //灏忕▼搴忚鍏抽棴浜嗛�氱煡缁欏師鐢�
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
+ baseEventBus.setType(LowerTagType.power_station.toString());
+ EventBus.getDefault().post(baseEventBus);
+
}
});
@@ -122,6 +136,8 @@
HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡 event=" + event);
//鏆傛椂閫氳繃杩欎釜澶勭悊灏忕▼搴忓悓鏃跺鏉＄浉鍚岀殑璇锋眰
if (data == null) {
+ HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,data鏁版嵁涓簄ull銆�", true);
+
return;
}
// String key= MD5Utils.getMd5(event+data.toString());
@@ -137,11 +153,16 @@
//鍥炰紶鏁版嵁缁欏皬绋嬪簭
JSONObject params = getAppParams();
callback.invoke(params);
- HdlLogLogic.print( "uni_GetAppParams callback:" + params.toString());
+ HdlLogLogic.print("uni_GetAppParams callback:" + params.toString());
} else {
//闄や簡缁熶竴澶勭悊锛屽墿浣欏叾瀹冪壒瀹氬満鏅殑浜嬩欢閫氱煡
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);
}
}
}
@@ -218,7 +239,7 @@
}
});
} else {
- HdlLogLogic.print( "wgt鍖呮湰鍦颁笉瀛樺湪");
+ HdlLogLogic.print("wgt鍖呮湰鍦颁笉瀛樺湪");
}
}
@@ -241,19 +262,10 @@
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");
- HdlLogLogic.print( "灏忕▼搴廔D 涓嶈兘涓虹┖");
+ HdlLogLogic.print("灏忕▼搴廔D 涓嶈兘涓虹┖");
return;
}
try {
@@ -265,14 +277,26 @@
UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
uniMPOpenConfiguration.path = path;
uniMPOpenConfiguration.extraData = jsonObject;
+ if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 0) {
+ uniMPOpenConfiguration.splashClass = CSplashView.class;
+ } else {
+ uniMPOpenConfiguration.splashClass = BSplashView.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());
}
}
@@ -327,7 +351,7 @@
mUniMPCaches.put(uniMP.getAppid(), uniMP);
} catch (Exception e) {
e.printStackTrace();
- HdlLogLogic.print( "鎵撳紑澶辫触===" + e.getMessage());
+ HdlLogLogic.print("鎵撳紑澶辫触===" + e.getMessage());
}
}
@@ -336,20 +360,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("鍙戦�侀�氱煡鎴愬姛锛歟vent锛�" + event + " data锛�" + new Gson().toJson(data));
+ mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, 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);
}
}
@@ -402,7 +426,7 @@
public void checkRemoveOtherUniMPEventCallBack(IOnOtherUniMPEventCallBack onOtherUniMPEventCallBack) {
if (this.onOtherUniMPEventCallBack == onOtherUniMPEventCallBack) {
this.onOtherUniMPEventCallBack = null;
- HdlLogLogic.print("onOtherUniMPEventCallBack remove callback");
+ HdlLogLogic.print("onOtherUniMPEventCallBack remove callback", true);
}
}
--
Gitblit v1.8.0