From f49ce86fe82047d2dd94adf65316013729d090a0 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 14 三月 2024 10:28:29 +0800 Subject: [PATCH] 2024年03月14日10:28:25 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index 7f19bb9..2c483d6 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -7,15 +7,20 @@ import com.hdl.hdlhttp.HxHttpConfig; import com.hdl.linkpm.sdk.HDLLinkPMSdk; +import com.hdl.linkpm.sdk.core.exception.HDLException; +import com.hdl.linkpm.sdk.home.type.HomeType; import com.hdl.linkpm.sdk.user.HDLLinkPMUser; import com.hdl.linkpm.sdk.user.callback.IOnReloginListener; import com.hdl.linkpm.sdk.utils.HDLSDKSPUtils; +import com.hdl.photovoltaic.bean.MqttInfo; import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.enums.NetworkType; +import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlMessageLogic; +import com.hdl.photovoltaic.other.HdlMqttLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.ui.HomeLoginActivity; import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; @@ -56,14 +61,13 @@ @Override public void onCreate() { - super.onCreate(); + mHDLApp = this; SharedPreUtils.init(this); getAppLanguage(); initThirdSDK(); // appLocationInfo(); - } public void getAppLanguage() { @@ -117,7 +121,6 @@ return; } isInitThirdSDK = true; - // //5.鍒濆鍖朆ugly // CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true); //6.鍒濆鍖朌CUniMPSDK @@ -136,6 +139,7 @@ initSocket(); //4.鍒濆鍖朞KHttpLog 鏄惁寮�鍚� setOKHttpLogOpen(isLogEnabled); +// initMqttClient(); //鐩戝惉缃戠粶鐘舵�佸彉鍖� this.networkMonitoring(); //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠� @@ -181,21 +185,25 @@ //閲嶆柊璁惧畾涓�涓椂闂� UserConfigManage.getInstance().setLoginDateTime(0); UserConfigManage.getInstance().Save(); + //娓呯┖娑堟伅缂撳瓨鏁版嵁 HdlMessageLogic.getInstance().clearListMessage(); + //娓呯┖缂撳瓨鏁版嵁 + if (mInfoMap != null) { + mInfoMap.clear(); + } //鏂紑mqtt杩炴帴 if (MqttRecvClient.getInstance() != null) { - MqttRecvClient.getInstance().stop(); + MqttRecvClient.getInstance().disConnect(); } //鏂紑鎵�鏈塼cp杩炴帴涓旀竻绌鸿繛鎺ョ紦瀛� // TODO: 10/10/23 // TcpSocketBoot.stopAllConnectLinkGateway(); -// if(null!=HDLUniMPSDKManager.getInstance().getUniMP()){ -// LogUtils.d("asdfasdfasdfsdf鎴戣鍒犻櫎鍟�"); -// HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP(); -// } -// initDCUniMPSDK(); + if (null != HDLUniMPSDKManager.getInstance().getUniMP()) { + HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP(); + } + initDCUniMPSDK(); Intent intent = new Intent(getInstance(), HomeLoginActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); if (type == 1) { @@ -303,5 +311,4 @@ HdlLogLogic.print("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�--->"); } } - } -- Gitblit v1.8.0