From 1a758b1bfbff1b910cd912c4e7434bf8f63a210a Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 10 四月 2024 10:50:01 +0800 Subject: [PATCH] 2024年04月10日10:49:56 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 14 +++++++------- 1 files changed, 7 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..94c8235 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -28,6 +28,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 +144,7 @@ //鐩戝惉缃戠粶鐘舵�佸彉鍖� this.networkMonitoring(); //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠� - this.initLocalAssetsData(); +// this.initLocalAssetsData(); } @@ -192,11 +193,10 @@ 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(); @@ -205,7 +205,7 @@ } 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); } -- Gitblit v1.8.0