From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 02 十二月 2024 10:29:09 +0800 Subject: [PATCH] 2024年12月02日10:29:05 --- app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 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 18bbbef..0da104a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java +++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java @@ -8,9 +8,11 @@ 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; @@ -119,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); } @@ -157,6 +160,9 @@ onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback); } else { HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,鍥炶皟浜嬩欢涓簄ull,鏃犳硶鍥炶皟浜嬩欢骞舵墽琛屼笟鍔¢�昏緫--->event=" + event + "\r\n" + "data=" + data, true); + //鏈夊彲鑳芥槸绯荤粺鍥炴敹鎺塧ctivity瀵艰嚧鍥炶皟涓簄ull锛岃繖鏍锋儏鍐典笅寮哄埗杩斿洖鐧诲綍鐣岄潰锛� + //todo 闀挎椂闂存病鍝嶅簲灏嗛��鍑虹櫥褰曠晫闈㈤噸鏂扮櫥褰� + HDLLinkPMUser.getInstance().logout(0); } } } @@ -271,16 +277,16 @@ UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration(); uniMPOpenConfiguration.path = path; uniMPOpenConfiguration.extraData = jsonObject; - uniMPOpenConfiguration.splashClass=MySplashView.class; + 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); - } - } +// //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) { @@ -358,12 +364,12 @@ if (mUniMPCaches.containsKey(uniAppId)) { if (mUniMPCaches.get(uniAppId) != null) { mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, data); - HdlLogLogic.print("Android--->閫氱煡---uni--->涓婚:" + topic + "--->鍙戦�佹暟鎹�:" + new Gson().toJson(data)); + HdlLogLogic.print("Android---閫氱煡---uni---涓婚:" + topic + "---鍙戦�佹暟鎹�:" + new Gson().toJson(data)); } else { - HdlLogLogic.print("Android--->閫氱煡---uni--->澶辫触--->灏忕▼搴忓璞′负绌�:" + uniAppId); + HdlLogLogic.print("Android---閫氱煡---uni---澶辫触---灏忕▼搴忓璞′负绌�:" + uniAppId); } } else { - HdlLogLogic.print("Android--->閫氱煡---uni--->澶辫触--->灏忕▼搴忓璞′负绌�:" + uniAppId); + HdlLogLogic.print("Android---閫氱煡---uni--->澶辫触---卢灏忕▼搴忓璞′负绌�:" + uniAppId); } } @@ -416,7 +422,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