From fdcfe6ef562cc3e8bbd6fcf2faedfbd9571f4490 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 01 四月 2024 14:33:42 +0800
Subject: [PATCH] 解决小程序白屏的问题

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   51 +++++++++++++++++++--------------------------------
 1 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 4c71607..4b6c7f4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -1,9 +1,12 @@
 package com.hdl.photovoltaic;
 
 import android.app.Application;
+import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
+
+import androidx.multidex.MultiDex;
 
 import com.hdl.hdlhttp.HxHttpConfig;
 import com.hdl.linkpm.sdk.HDLLinkPMSdk;
@@ -28,6 +31,7 @@
 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;
@@ -114,7 +118,7 @@
      */
     public void initThirdSDK() {
         // 灏忕▼搴忚繘绋�
-        if (RuningAcitvityUtil.getAppName(getBaseContext()).contains("unimp")) {
+        if (RuningAcitvityUtil.getAppName(getBaseContext()).contains(":")) {
             return;
         }
         if (isInitThirdSDK) {
@@ -143,7 +147,7 @@
         //鐩戝惉缃戠粶鐘舵�佸彉鍖�
         this.networkMonitoring();
         //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
-        this.initLocalAssetsData();
+//        this.initLocalAssetsData();
 
     }
 
@@ -192,19 +196,17 @@
                 if (mInfoMap != null) {
                     mInfoMap.clear();
                 }
-
-                //鏂紑mqtt杩炴帴
-                if (MqttRecvClient.getInstance() != null) {
-                    MqttRecvClient.getInstance().stop();
-                }
+//                //鏂紑mqtt杩炴帴
+//                if (MqttRecvClient.getInstance() != null) {
+//                    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) {
@@ -301,7 +303,7 @@
      */
     private void initUniMqtt() {
         try {
-            String ip = NetworkUtils.getIPAddress(this);
+            String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this);
             if (TextUtils.isEmpty(ip)) {
                 return;
             }
@@ -313,24 +315,9 @@
         }
     }
 
-    /**
-     * 鍒濆鍖杕qtt瀹㈡埛绔�
-     */
-    public void initMqttClient() {
-
-        HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
-            @Override
-            public void onSuccess(MqttInfo info) {
-                if (info != null) {
-                    MqttRecvClient.init(HDLApp.getInstance(), info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
-                }
-            }
-
-            @Override
-            public void onFailure(HDLException e) {
-                HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
-            }
-        });
+    @Override
+    protected void attachBaseContext(Context base) {
+        MultiDex.install(base);
+        super.attachBaseContext(base);
     }
-
 }

--
Gitblit v1.8.0