From f96eb57f7051d52a06ec3965bbbc5ab3c0b0a3de Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 01 七月 2024 20:12:03 +0800
Subject: [PATCH] 2024年07月01日20:11:53

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   78 ++++++++++++++++++++++++++++++++------
 1 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 078e64a..f6e3974 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -1,28 +1,33 @@
 package com.hdl.photovoltaic;
 
+import android.app.Activity;
 import android.app.Application;
+import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.SystemClock;
 import android.text.TextUtils;
+import android.util.Log;
 
+
+import androidx.multidex.MultiDex;
 
 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;
@@ -32,7 +37,6 @@
 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;
 
@@ -41,6 +45,10 @@
 
 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;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 public class HDLApp extends Application {
@@ -54,6 +62,7 @@
     //澹版槑涓�涓叕鍏辩殑淇℃伅鏄犲皠,鍙綋浣滃叏灞�鍙橀噺浣跨敤;
     public HashMap<String, String> mInfoMap = new HashMap<>();
 
+
     //鍒╃敤鍗曚緥妯″紡鑾峰彇褰撳墠搴旂敤鐨勫敮涓�瀹炰緥
     public static HDLApp getInstance() {
         return mHDLApp;
@@ -62,12 +71,12 @@
     @Override
     public void onCreate() {
         super.onCreate();
-
+        // 鑾峰彇褰撳墠杩涚▼鐨凱ID
+        Log.d("杩涚▼===", android.os.Process.myPid() + "");
         mHDLApp = this;
         SharedPreUtils.init(this);
         getAppLanguage();
-        initThirdSDK();
-//        appLocationInfo();
+        init();
     }
 
     public void getAppLanguage() {
@@ -112,7 +121,7 @@
     /**
      * 鍒濆鍖栦笁鏂圭浉鍏砈DK
      */
-    public void initThirdSDK() {
+    public void init() {
         // 灏忕▼搴忚繘绋�
         if (RuningAcitvityUtil.getAppName(getBaseContext()).contains(":")) {
             return;
@@ -132,6 +141,7 @@
 //        TypeUtils.compatibleWithFieldName = true;
 //        //9.鍒濆鍖栫綉缁滃伐鍏�
 //        NetWorkUtil.init(this);
+        initAutoSize();
         //鍒濆鍖栨瀬鍏夋帹閫�
         initJPush();
         initHDLLinkPMSdk();
@@ -188,6 +198,10 @@
 
                 //娓呯┖娑堟伅缂撳瓨鏁版嵁
                 HdlMessageLogic.getInstance().clearListMessage();
+                //娓呯┖鐢电珯缂撳瓨鏁版嵁
+                HdlResidenceLogic.getInstance().clearHouseList();
+                //娓呯┖璁惧缂撳瓨鏁版嵁
+                HdlDeviceLogic.getInstance().clearDeviceList();
                 //娓呯┖缂撳瓨鏁版嵁
                 if (mInfoMap != null) {
                     mInfoMap.clear();
@@ -202,9 +216,10 @@
                 if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
                     HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
                 }
+                SystemClock.sleep(200);
                 initDCUniMPSDK();
-                Intent intent = new Intent(getInstance(), HomeLoginActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                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);
                 }
@@ -293,6 +308,35 @@
 
     }
 
+    /**
+     * 钃濇箹涓� 淇敼瀹藉害 640dp 瀹藉害鎸夌収dp銆乻p鏉ラ�傞厤
+     * 鏃嬭浆鍚庨珮鍙樺,鎸夋棆杞悗楂樺害閫傞厤,鎵�浠ュ搴︿笉鍐欐
+     */
+    private void initAutoSize() {
+        AutoSize.initCompatMultiProcess(this);
+        boolean isBaseOnWidth = getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
+        AutoSizeConfig.getInstance()
+                .setBaseOnWidth(true)
+                .setCustomFragment(true)
+                .setDesignWidthInDp(375)
+                .setDesignHeightInDp(812)
+                .setUseDeviceSize(false)
+                .setOnAdaptListener(new onAdaptListener() {
+                    @Override
+                    public void onAdaptBefore(Object target, Activity activity) {
+
+                        AutoSizeConfig.getInstance().setScreenWidth(ScreenUtils.getScreenSize(activity)[0]);
+                        AutoSizeConfig.getInstance().setScreenHeight(ScreenUtils.getScreenSize(activity)[1] +
+                                ScreenUtils.getHeightOfNavigationBar(activity) + ScreenUtils.getStatusBarHeight());
+
+                    }
+
+                    @Override
+                    public void onAdaptAfter(Object target, Activity activity) {
+
+                    }
+                });
+    }
 
     /**
      * 鍒濆鍖杣ni app mqtt
@@ -310,4 +354,12 @@
             HdlLogLogic.print("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�--->");
         }
     }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        MultiDex.install(base);
+        super.attachBaseContext(base);
+    }
+
+
 }

--
Gitblit v1.8.0