From 413b905fb1af7f421b801a3d7ad0b84b57e919ab Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 15 四月 2025 08:54:11 +0800 Subject: [PATCH] 2025年04月15日08:54:09 --- app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 30 +++++++++++++++++------------- 1 files changed, 17 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 a467e5f..051456d 100644 --- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java +++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java @@ -3,7 +3,6 @@ import android.app.Application; import android.content.Context; import android.os.Environment; -import android.os.SystemClock; import android.text.TextUtils; @@ -12,6 +11,7 @@ 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; @@ -137,7 +137,6 @@ //鏆傛椂閫氳繃杩欎釜澶勭悊灏忕▼搴忓悓鏃跺鏉$浉鍚岀殑璇锋眰 if (data == null) { HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,data鏁版嵁涓簄ull銆�", true); - return; } // String key= MD5Utils.getMd5(event+data.toString()); @@ -162,6 +161,7 @@ HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,鍥炶皟浜嬩欢涓簄ull,鏃犳硶鍥炶皟浜嬩欢骞舵墽琛屼笟鍔¢�昏緫--->event=" + event + "\r\n" + "data=" + data, true); //鏈夊彲鑳芥槸绯荤粺鍥炴敹鎺塧ctivity瀵艰嚧鍥炶皟涓簄ull锛岃繖鏍锋儏鍐典笅寮哄埗杩斿洖鐧诲綍鐣岄潰锛� //todo 闀挎椂闂存病鍝嶅簲灏嗛��鍑虹櫥褰曠晫闈㈤噸鏂扮櫥褰� + HdlLogLogic.print("鍥炶皟浜嬩欢涓簄ull閫�鍑虹櫥褰�--->", true); HDLLinkPMUser.getInstance().logout(0); } } @@ -277,16 +277,20 @@ UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration(); uniMPOpenConfiguration.path = path; uniMPOpenConfiguration.extraData = jsonObject; - uniMPOpenConfiguration.splashClass = MySplashView.class; + 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); - } - } +// //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) { @@ -364,12 +368,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); } } -- Gitblit v1.8.0