From 3ea2633e2113e35c431e165b4c94dca66ca191ae Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 30 六月 2023 17:27:37 +0800
Subject: [PATCH] Merge branch 'hxb' into wjc
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 774c06a..64956a6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -1,11 +1,22 @@
package com.hdl.photovoltaic;
+import android.Manifest;
import android.app.Application;
+import android.content.pm.PackageManager;
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
+import com.hdl.sdk.link.HDLLinkLocalSdk;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
+import com.hdl.sdk.link.core.connect.HDLUdpConnect;
+import com.hdl.sdk.link.core.utils.QueueUtils;
import java.util.HashMap;
import java.util.Objects;
@@ -30,8 +41,10 @@
@Override
public void onCreate() {
+
super.onCreate();
mHDLApp = this;
+ initThirdSDK();
}
public void setInfoMap(String key, String value) {
@@ -81,27 +94,34 @@
// NetWorkUtil.init(this);
// //10.鍒濆鍖栨瀬鍏夋帹閫�
// initJPush();
+ HDLLinkLocalSdk.getInstance().init(getInstance());
+ initSocket();
}
/**
* 鍒濆鍖朥niMPSDK 灏忕▼搴廠DK
*/
private void initDCUniMPSDK() {
- DCSDKInitConfig config = new DCSDKInitConfig.Builder()
- .setCapsule(false)//璁剧疆鏄惁浣跨敤鑳跺泭鎸夐挳
- .setEnableBackground(false)//寮�鍚悗鍙拌繍琛�
- .build();
- DCUniMPSDK.getInstance().initialize(this, config, new IDCUniMPPreInitCallback() {
- @Override
- public void onInitFinished(boolean b) {
-
- HdlLogLogic.print("unimp", "UniMPSDK 鍒濆鍖栧畬鎴�----" + b);
- }
- });
-
- //鍒濆鍖朥niMPSDKManager
- HDLUniMPSDKManager.getInstance().init(HDLApp.getInstance());
-
+ HDLUniMPSDKManager.getInstance().initDCUniMPSDK(this);
}
+ //鍒濆鍖杝ocket鍙婂惎鍔ㄥ鐞嗘帴鏀跺埌鏁版嵁鐨勫鐞嗘柟娉�
+ private void initSocket() {
+ QueueUtils.getInstance().start();
+ HDLUdpConnect.getInstance().initUdp();
+ }
+
+// /**
+// * 鍒濆鍖杣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杩炴帴鏈嶅姟绔け璐�");
+// }
+// }
+
}
--
Gitblit v1.8.0