From c293e3d12571958f7ae7f28260ad3914842ecaa9 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 12 一月 2024 11:07:40 +0800
Subject: [PATCH] 2024年01月12日11:06:47
---
app/src/main/AndroidManifest.xml | 5 +++++
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 9 +++++++++
app/src/main/java/com/hdl/photovoltaic/ui/test/UniAppMqtt.java | 26 ++++++++++++--------------
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7caba69..802d952 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -199,6 +199,11 @@
</intent-filter>
</service>
+ <!--uniMqtt蹇呰鐨�,寮�鍚痬qtt1883绔彛涓�涓湇鍔�-->
+ <service
+ android:name="org.eclipse.paho.android.service.MqttService"
+ android:exported="false" />
+
<meta-data
android:name="design_height_in_dp"
android:value="812" />
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index b1b4e18..96b822e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -15,6 +15,7 @@
import android.text.TextUtils;
import android.view.View;
+import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -331,8 +332,16 @@
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
uniCallBackBaseBean.setData(response.getData());
+// if (com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().getUni()) {
+// try {
+// String t = String.format("AndroidToPC/%s/%s", System.currentTimeMillis(), HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL);
+// com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().publish(t, JSONObject.toJSON(uniCallBackBaseBean).toString());
+// } catch (Exception ignored) {
+// }
+// } else {
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
// }
+// }
} else if (msg instanceof LinkResponse) {
LinkResponse linkResponse = (LinkResponse) msg;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/UniAppMqtt.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/UniAppMqtt.java
index d6881ce..ffc2f8d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/UniAppMqtt.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/UniAppMqtt.java
@@ -37,7 +37,7 @@
return clientId;
}
- final String tag = "MqttRecvClient1";
+ final String tag = "uniToAndroid->>>MqttRecvClient--->";
/**
* 褰撳墠 mqtt client
*/
@@ -178,24 +178,25 @@
* @param payload 鍐呭
*/
public void publish(String topic, String payload) throws MqttException {
+
//鍥炲鏃讹紝mqtt涓婚涓殑鏂瑰悜瑕佸彉鍖栵紝瑕佸仛鏂瑰悜鏇挎崲
topic = topic.replace("PCToAndroid", "AndroidToPC");
+ String finalTopic = topic;
mClient.publish(topic, payload.getBytes(), 1, false, null, new IMqttActionListener() {
@Override
public void onSuccess(IMqttToken asyncActionToken) {
-
+ LogUtils.e(tag, "鍥炲涓婚--->" + finalTopic + "\r\n" + payload);
}
@Override
public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
-
+ LogUtils.e(tag, "鍥炲澶辫触--->" + finalTopic + "\r\n" + exception.getMessage());
}
});
}
/**
* 鍙栨秷璁㈤槄
- *
*/
public void unsubscribe(String topic) throws MqttException {
mClient.unsubscribe(topic, null, new IMqttActionListener() {
@@ -213,7 +214,6 @@
/**
* 鏂紑杩炴帴
- *
*/
public void disconnect() throws MqttException {
mClient.disconnect(null, new IMqttActionListener() {
@@ -233,7 +233,7 @@
* uni閫氳繃qtt浼犺繃鏉ョ殑鏁版嵁澶勭悊
*
* @param topic 涓婚
- * @param payload 鍐呭
+ * @param payload 璐熻浇鍐呭
*/
@RequiresApi(api = Build.VERSION_CODES.O)
void sendMqttToUni(final String topic, String payload) {
@@ -241,27 +241,25 @@
return;
}
String[] split = topic.split("/");
- String event = null;
- for (String s : split) {
- if (s.startsWith("uni_")) {
- event = s;
- break;
- }
+ if (split.length < 3) {
+ return;
}
-
+ //琛ㄧず澶х被
+ String request_module_topic = split[2];
MqttDCUniMPJSCallback mqttDCUniMPJSCallback = new MqttDCUniMPJSCallback();
mqttDCUniMPJSCallback.setMqttCallBack(new MqttCallBack() {
@Override
public void onResult(Object data) {
if (null != data)
try {
+ //杩斿洖鏁版嵁缁檜ni
publish(topic, data.toString());
} catch (Exception ignored) {
}
}
});
// JSON.parse(payload)
- HdlUniLogic.getInstance().onOtherUniMPEventReceive(HDLUniMP.UNI_APP_ID, topic, payload, mqttDCUniMPJSCallback);
+ HdlUniLogic.getInstance().onOtherUniMPEventReceive(HDLUniMP.UNI_APP_ID, request_module_topic, payload, mqttDCUniMPJSCallback);
}
private boolean mIsUni = false;
--
Gitblit v1.8.0