From 0a18a8180bc6040c941b07df1be1f7b726b4c155 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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 5e51376..f6ab151 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -6,6 +6,9 @@
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.view.MotionEvent;
import android.view.View;
import com.google.gson.Gson;
@@ -19,6 +22,9 @@
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.LinkResponse;
+import com.hdl.sdk.link.core.bean.ModbusResponse;
+
+import java.nio.charset.StandardCharsets;
public class MyPowerStationActivity extends CustomBaseActivity {
@@ -100,6 +106,7 @@
}
}
+
public void requestPermissions() {
String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
if (ary.length > 0) {
@@ -150,8 +157,9 @@
allTopicsListener = new EventListener() {
@Override
public void onMessage(Object msg) {
- if (msg instanceof LinkResponse) {
- LinkResponse response = (LinkResponse) msg;
+
+ if (msg instanceof ModbusResponse) {
+ ModbusResponse response = (ModbusResponse) msg;
if (response.getTopic() == null) {
return;
}
--
Gitblit v1.8.0