From 7bb1c6a82b35290b4b28d53977fad2fe4080d3db Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 31 五月 2024 12:01:58 +0800 Subject: [PATCH] 2024年05月31日12:01:45 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index f81c9d7..f6e3974 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -14,33 +14,29 @@ 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.LowerTagType; import com.hdl.photovoltaic.enums.NetworkType; -import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlMessageLogic; -import com.hdl.photovoltaic.other.HdlMqttLogic; +import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; -import com.hdl.photovoltaic.ui.HomeLoginActivity; +import com.hdl.photovoltaic.ui.LoginActivity; import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; import com.hdl.photovoltaic.utils.AppManagerUtils; 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; import com.hdl.sdk.link.core.utils.QueueUtils; -import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; import org.greenrobot.eventbus.EventBus; @@ -66,6 +62,7 @@ //澹版槑涓�涓叕鍏辩殑淇℃伅鏄犲皠,鍙綋浣滃叏灞�鍙橀噺浣跨敤; public HashMap<String, String> mInfoMap = new HashMap<>(); + //鍒╃敤鍗曚緥妯″紡鑾峰彇褰撳墠搴旂敤鐨勫敮涓�瀹炰緥 public static HDLApp getInstance() { return mHDLApp; @@ -74,14 +71,12 @@ @Override public void onCreate() { super.onCreate(); - // 鑾峰彇褰撳墠杩涚▼鐨凱ID Log.d("杩涚▼===", android.os.Process.myPid() + ""); mHDLApp = this; SharedPreUtils.init(this); getAppLanguage(); init(); -// appLocationInfo(); } public void getAppLanguage() { @@ -203,6 +198,10 @@ //娓呯┖娑堟伅缂撳瓨鏁版嵁 HdlMessageLogic.getInstance().clearListMessage(); + //娓呯┖鐢电珯缂撳瓨鏁版嵁 + HdlResidenceLogic.getInstance().clearHouseList(); + //娓呯┖璁惧缂撳瓨鏁版嵁 + HdlDeviceLogic.getInstance().clearDeviceList(); //娓呯┖缂撳瓨鏁版嵁 if (mInfoMap != null) { mInfoMap.clear(); @@ -219,7 +218,7 @@ } SystemClock.sleep(200); initDCUniMPSDK(); - Intent intent = new Intent(getInstance(), HomeLoginActivity.class); + Intent intent = new Intent(getInstance(), LoginActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); if (type == 1) { intent.putExtra("isJpush", true); @@ -361,7 +360,6 @@ MultiDex.install(base); super.attachBaseContext(base); } - } -- Gitblit v1.8.0