From 53cfbb7c949edc8e3d0b624e251afbad1a1c74ca Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 08 一月 2024 18:03:18 +0800
Subject: [PATCH] 2024年01月08日18:03:16

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   61 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index a61232e..5bcb757 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -14,6 +14,8 @@
 import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.enums.NetworkType;
+import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.ui.HomeLoginActivity;
 import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
 import com.hdl.photovoltaic.utils.AppManagerUtils;
@@ -34,6 +36,7 @@
 
 import cn.jpush.android.api.JPushInterface;
 import io.dcloud.common.util.RuningAcitvityUtil;
+import io.dcloud.common.util.net.NetWork;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 public class HDLApp extends Application {
@@ -97,6 +100,10 @@
         return "";
     }
 
+    public void removeKey(String key) {
+        mInfoMap.remove(key);
+    }
+
     /**
      * 鍒濆鍖栦笁鏂圭浉鍏砈DK
      */
@@ -114,14 +121,14 @@
 //        CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true);
         //6.鍒濆鍖朌CUniMPSDK
         initDCUniMPSDK();
-
+//        this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙�
 //        //7.鍒濆鍖栬嚜瀹氫箟IconToast
 //        ToastUtils.getInstance().initIconToast(this);
 //        //8.瀵筬astjson杩涜璁剧疆锛岃В鍐砯astjosn杞崲鎴愬瓧绗︿覆鏃堕瀛楁瘝澶у皬鍐欓棶棰�
 //        TypeUtils.compatibleWithFieldName = true;
 //        //9.鍒濆鍖栫綉缁滃伐鍏�
 //        NetWorkUtil.init(this);
-//        //10.鍒濆鍖栨瀬鍏夋帹閫�
+        //鍒濆鍖栨瀬鍏夋帹閫�
         initJPush();
         initHDLLinkPMSdk();
         HDLLinkLocalSdk.getInstance().init(getInstance());
@@ -130,6 +137,9 @@
         setOKHttpLogOpen(isLogEnabled);
         //鐩戝惉缃戠粶鐘舵�佸彉鍖�
         this.networkMonitoring();
+        //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
+        this.initLocalAssetsData();
+
     }
 
 
@@ -245,18 +255,41 @@
     }
 
 
-//    /**
-//     * 鍒濆鍖杣ni app mqtt
-//     */
-//    private void initUniMqtt() {
-//        try {
-//            Through.getInstance().setUni(false);
-//            //IP 鍦板潃瑕佹牴鎹疄闄呯殑鏇存敼
-//            UniAppMqtt.getInstance().initMqtt(this, "tcp://192.168.3.124:1883", "Android_" + android.os.Build.BRAND + "_" + this.hashCode(), new String[]{"PCToAndroid/#"});
-//        } catch (Exception e) {
-//            LogUtils.e("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�");
-//        }
-//    }
+    /**
+     * 璇诲彇鍔犺浇鏈湴閰嶇疆鏂囦欢鏁版嵁
+     */
+    private void initLocalAssetsData() {
+        //鏁版嵁澶氭湁鐐瑰崱,鎵�浠ュ姞浜嗙嚎绋�
+        HdlThreadLogic.runSubThread(new Runnable() {
+            @Override
+            public void run() {
+                //鑾峰彇鍥藉鐪佸競鏁版嵁
+                LocalManageUtil.getLocationInfo(getInstance());
+                //鑾峰彇缁忕含搴�
+                LocalManageUtil.getLongLatInfo(getInstance());
+            }
+        });
+
+
+    }
+
+
+    /**
+     * 鍒濆鍖杣ni app mqtt
+     */
+    private void initUniMqtt() {
+        try {
+            String ip = NetworkUtils.getIPAddress(this);
+            if (TextUtils.isEmpty(ip)) {
+                return;
+            }
+            //IP 鍦板潃瑕佹牴鎹疄闄呯殑鏇存敼
+            com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().initMqtt(this, "tcp://" + ip + ":1883", "Android_" + android.os.Build.BRAND + "_" + this.hashCode(), new String[]{"PCToAndroid/#"});
+            com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().setUni(true);
+        } catch (Exception e) {
+            HdlLogLogic.print("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�--->");
+        }
+    }
 
 
 }

--
Gitblit v1.8.0