From 89e91f91b49676be534eb0005d02beae7b8343ba Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 22 四月 2024 10:56:01 +0800 Subject: [PATCH] 2024年04月22日10:55:54 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index ab24dac..3011dbc 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -1,9 +1,13 @@ package com.hdl.photovoltaic; import android.app.Application; +import android.content.Context; import android.content.Intent; +import android.os.SystemClock; import android.text.TextUtils; + +import androidx.multidex.MultiDex; import com.hdl.hdlhttp.HxHttpConfig; import com.hdl.linkpm.sdk.HDLLinkPMSdk; @@ -28,6 +32,7 @@ import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.utils.NetworkUtils; import com.hdl.photovoltaic.utils.SharedPreUtils; +import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; import com.hdl.sdk.link.HDLLinkLocalSdk; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import com.hdl.sdk.link.core.connect.HDLUdpConnect; @@ -143,7 +148,7 @@ //鐩戝惉缃戠粶鐘舵�佸彉鍖� this.networkMonitoring(); //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠� - this.initLocalAssetsData(); +// this.initLocalAssetsData(); } @@ -192,20 +197,20 @@ if (mInfoMap != null) { mInfoMap.clear(); } - - //鏂紑mqtt杩炴帴 - if (MqttRecvClient.getInstance() != null) { - MqttRecvClient.getInstance().disConnect(); - } +// //鏂紑mqtt杩炴帴 +// if (MqttRecvClient.getInstance() != null) { +// MqttRecvClient.getInstance().disConnect(); +// } //鏂紑鎵�鏈塼cp杩炴帴涓旀竻绌鸿繛鎺ョ紦瀛� // TODO: 10/10/23 // TcpSocketBoot.stopAllConnectLinkGateway(); if (null != HDLUniMPSDKManager.getInstance().getUniMP()) { HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP(); } + SystemClock.sleep(200); initDCUniMPSDK(); Intent intent = new Intent(getInstance(), HomeLoginActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TOP); if (type == 1) { intent.putExtra("isJpush", true); } @@ -311,4 +316,10 @@ HdlLogLogic.print("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�--->"); } } + + @Override + protected void attachBaseContext(Context base) { + MultiDex.install(base); + super.attachBaseContext(base); + } } -- Gitblit v1.8.0