From dc785ad3133f7718ad7a096c70483b2eced94172 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 10:33:37 +0800
Subject: [PATCH] Merge branch 'hxb' into wjc
---
app/src/main/java/com/hdl/photovoltaic/utils/ThroughUtils.java | 117 +++++++++++++++++++++++++++++++++++++++
local.properties | 2
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 13 ++++
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 1
4 files changed, 132 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 693ae32..98d51cd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -108,4 +108,17 @@
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杩炴帴鏈嶅姟绔け璐�");
+// }
+// }
+
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 3179558..2d40f33 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -113,6 +113,7 @@
}
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
+
//鍙戦�乵odbus鍗忚
// HDLModBusConnect.getInstance().Send(uniToAndroidBean.getGatewayOid(), null, );
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/ThroughUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/ThroughUtils.java
new file mode 100644
index 0000000..d621f55
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/ThroughUtils.java
@@ -0,0 +1,117 @@
+//package com.hdl.photovoltaic.utils;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.hdl.photovoltaic.other.HdlUniLogic;
+//import com.hdl.photovoltaic.uni.HDLUniMP;
+//import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+//import com.hdl.sdk.link.common.event.EventListener;
+//import com.hdl.sdk.link.core.bean.ZigbeeResponse;
+//import com.hdl.sdk.link.core.connect.HDLZigbeeConnect;
+//
+///**
+// * Created by hxb on 2022/1/18.
+// * 鍘熺敓閫忎紶鍒皍ni app
+// */
+//public class ThroughUtils {
+//
+// final String tag = ThroughUtils.class.getName();
+//
+// /**
+// * 鏄惁uni鏂瑰紡锛屽惁鍒檓qtt鏂瑰紡
+// */
+// private boolean isUni=true;
+//
+//
+// /**
+// * instance
+// */
+// private volatile static ThroughUtils instance;
+//
+// /**
+// * getInstance
+// *
+// * @return Through
+// */
+// public static synchronized ThroughUtils getInstance() {
+// if (instance == null) {
+// synchronized (ThroughUtils.class) {
+// if (instance == null) {
+// instance = new ThroughUtils();
+// }
+// }
+// }
+// return instance;
+// }
+//
+// EventListener throughEventListener;
+//
+// /**
+// * 娉ㄥ唽鏂拌澶囧叆缃戠洃鍚�
+// */
+// public void registerThroughListener() {
+// //娉ㄥ唽鐩戝惉浜嬩欢
+// if (throughEventListener == null) {
+// throughEventListener = new EventListener() {
+// @Override
+// public void onMessage(Object msg) {
+// if (msg instanceof ZigbeeResponse) {
+// ZigbeeResponse zigbeeResponse = (ZigbeeResponse) msg;
+// try {
+// HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+// callBackBaseBean.setTopic(zigbeeResponse.getTopic());
+// callBackBaseBean.setData(zigbeeResponse.getData());
+// if (zigbeeResponse.getTopic().startsWith("ZbDataPassthrough")) {
+// //濡傛灉涓嶆槸浣跨敤mqtt鏂瑰紡锛屽氨浣跨敤uni app鎺ㄩ�佹柟寮�
+// if (isUni()) {
+// HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean);
+// HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.UNI_EVENT_ZigBeePassthrough, JSONObject.toJSON(callBackBaseBean));
+// } else {//浣跨敤mqtt鏂瑰紡
+// //AndroidToPC/鍞竴鏍囪瘑/uni_event"
+// UniAppMqtt.getInstance().publish(String.format("AndroidToPC/%s/%s", System.currentTimeMillis(), HDLUniMP.UNI_EVENT_ZigBeePassthrough), JSONObject.toJSON(callBackBaseBean).toString());
+// }
+// }
+// else if(zigbeeResponse.getTopic().contains("DeviceStatusReport/")){
+// //濡傛灉涓嶆槸浣跨敤mqtt鏂瑰紡锛屽氨浣跨敤uni app鎺ㄩ�佹柟寮�
+// if (isUni()) {
+// HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.EVENT_DeviceStatusReportPassthrough, JSONObject.toJSON(callBackBaseBean));
+// } else {//浣跨敤mqtt鏂瑰紡
+// //AndroidToPC/鍞竴鏍囪瘑/uni_event"
+// UniAppMqtt.getInstance().publish(String.format("AndroidToPC/%s/%s", System.currentTimeMillis(), HDLUniMP.EVENT_DeviceStatusReportPassthrough), JSONObject.toJSON(callBackBaseBean).toString());
+// }
+// }
+//
+// } catch (Exception e) {
+//
+// }
+// }
+// }
+// };
+// HDLZigbeeConnect.getInstance().registerListener(throughEventListener);
+// }
+// }
+//
+// /**
+// * 绉婚櫎鍏ㄥ眬鐩戝惉
+// */
+// public void removeThroughListener()
+// {
+// HDLZigbeeConnect.getInstance().removeListener(throughEventListener);
+// throughEventListener=null;
+// }
+//
+// /**
+// * 鏄惁uni鏂瑰紡锛屽惁鍒檓qtt鏂瑰紡
+// * @return
+// */
+// public boolean isUni() {
+// return isUni;
+// }
+//
+// /**
+// * 鏄惁uni鏂瑰紡锛屽惁鍒檓qtt鏂瑰紡
+// * @param uni
+// */
+// public void setUni(boolean uni) {
+// isUni = uni;
+// }
+//}
diff --git a/local.properties b/local.properties
index 4142787..f1350c6 100644
--- a/local.properties
+++ b/local.properties
@@ -5,4 +5,4 @@
# For customization when using a Version Control System, please read the
# header note.
#Wed Jun 28 17:38:10 CST 2023
-sdk.dir=/Users/wenjucheng/Library/Android/sdk
+sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx/platform-tools
--
Gitblit v1.8.0