From e1577f14dc7ac4fe8b8df851e63ae7e3aebf72a7 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 31 十月 2024 16:02:14 +0800 Subject: [PATCH] 2024年10月31日16:02:10 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index 72ec8c5..9539e49 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -12,6 +12,7 @@ import androidx.multidex.MultiDex; +import com.google.gson.Gson; import com.hdl.hdlhttp.HxHttpConfig; import com.hdl.linkpm.sdk.HDLLinkPMSdk; import com.hdl.linkpm.sdk.user.HDLLinkPMUser; @@ -20,9 +21,12 @@ 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.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlMessageLogic; +import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.ui.LoginActivity; import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; @@ -59,6 +63,7 @@ //澹版槑涓�涓叕鍏辩殑淇℃伅鏄犲皠,鍙綋浣滃叏灞�鍙橀噺浣跨敤; public HashMap<String, String> mInfoMap = new HashMap<>(); + //鍒╃敤鍗曚緥妯″紡鑾峰彇褰撳墠搴旂敤鐨勫敮涓�瀹炰緥 public static HDLApp getInstance() { return mHDLApp; @@ -67,14 +72,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() { @@ -183,19 +186,24 @@ HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() { @Override public void onReLogin(int type) { + HdlLogLogic.print("閫�鍒扮櫥褰曠晫闈�---" + type, true); //type: 0:姝e父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑� //鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰 AppManagerUtils.getAppManager().finishAllActivity(); - HDLSDKSPUtils.clear(); +// HDLSDKSPUtils.clear();//搴曞眰鑷繁娓呯┖ //閲嶆柊鐧婚檰,榛樿鍚屾剰闅愮鏀跨瓥 - UserConfigManage.getInstance().setAcceiptPolicy(true); + UserConfigManage.getInstance().setAcceiptPolicy(false); //閲嶆柊璁惧畾涓�涓椂闂� UserConfigManage.getInstance().setLoginDateTime(0); UserConfigManage.getInstance().Save(); //娓呯┖娑堟伅缂撳瓨鏁版嵁 HdlMessageLogic.getInstance().clearListMessage(); + //娓呯┖鐢电珯缂撳瓨鏁版嵁 + HdlResidenceLogic.getInstance().clearHouseList(); + //娓呯┖璁惧缂撳瓨鏁版嵁 + HdlDeviceLogic.getInstance().clearDeviceList(); //娓呯┖缂撳瓨鏁版嵁 if (mInfoMap != null) { mInfoMap.clear(); @@ -337,7 +345,7 @@ */ private void initUniMqtt() { try { - String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this); + String ip = "192.168.1.100";//NetworkUtils.getIPAddress(this); if (TextUtils.isEmpty(ip)) { return; } @@ -354,7 +362,6 @@ MultiDex.install(base); super.attachBaseContext(base); } - } -- Gitblit v1.8.0