From cc3b8aecab8fccf9a985d74a5223be44cc2b5ace Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 30 十月 2024 16:20:39 +0800
Subject: [PATCH] 2024年10月30日16:20:36
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 592295c..45aeb0a 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;
@@ -49,6 +45,7 @@
import cn.jpush.android.api.JPushInterface;
import io.dcloud.common.util.RuningAcitvityUtil;
+import me.jessyan.autosize.AutoSize;
import me.jessyan.autosize.AutoSizeConfig;
import me.jessyan.autosize.onAdaptListener;
import me.jessyan.autosize.utils.ScreenUtils;
@@ -65,6 +62,7 @@
//澹版槑涓�涓叕鍏辩殑淇℃伅鏄犲皠,鍙綋浣滃叏灞�鍙橀噺浣跨敤;
public HashMap<String, String> mInfoMap = new HashMap<>();
+
//鍒╃敤鍗曚緥妯″紡鑾峰彇褰撳墠搴旂敤鐨勫敮涓�瀹炰緥
public static HDLApp getInstance() {
return mHDLApp;
@@ -79,7 +77,6 @@
SharedPreUtils.init(this);
getAppLanguage();
init();
-// appLocationInfo();
}
public void getAppLanguage() {
@@ -188,19 +185,24 @@
HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
@Override
public void onReLogin(int type) {
+ Log.d("====閫�鍒扮櫥褰曠晫闈�====", "====閫�鍒扮櫥褰曠晫闈�====" + type);
//type: 0:姝ｅ父閫�鍑� 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();
@@ -217,7 +219,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);
@@ -312,12 +314,14 @@
* 鏃嬭浆鍚庨珮鍙樺,鎸夋棆杞悗楂樺害閫傞厤,鎵�浠ュ搴︿笉鍐欐
*/
private void initAutoSize() {
+ AutoSize.initCompatMultiProcess(this);
boolean isBaseOnWidth = getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
AutoSizeConfig.getInstance()
- .setBaseOnWidth(isBaseOnWidth)
+ .setBaseOnWidth(true)
+ .setCustomFragment(true)
+ .setDesignWidthInDp(375)
+ .setDesignHeightInDp(812)
.setUseDeviceSize(false)
- .setDesignWidthInDp(isBaseOnWidth ? 375 : 812)
- .setDesignHeightInDp(isBaseOnWidth ? 812 : 375)
.setOnAdaptListener(new onAdaptListener() {
@Override
public void onAdaptBefore(Object target, Activity activity) {
@@ -340,7 +344,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;
}
@@ -357,4 +361,6 @@
MultiDex.install(base);
super.attachBaseContext(base);
}
+
+
}
--
Gitblit v1.8.0