From 0b6f27a6aeeb6eb3d5ee55b500797875c2bd5d2c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 12 三月 2024 21:08:03 +0800
Subject: [PATCH] 2024年03月12日21:07:52
---
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
index 3baa86d..ba398d4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -16,6 +16,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityTestMainBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -30,6 +31,7 @@
import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
+import com.hdl.sdk.link.core.callback.ModbusCallBack;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -44,6 +46,7 @@
private TestTitleAdapter testTitleAdapter;
private List<OidBean> mOidList;
+ private String s = "";
@Override
public Object getContentView() {
@@ -91,8 +94,8 @@
return;
}
GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway(UserConfigManage.getInstance().getHomeId());
- if (gatewayBean == null && !title.equals("鎼滅储閫嗗彉鍣ㄥ垪琛�(0)") && !title.equals("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)")) {
- // TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�;
+ if (gatewayBean == null && !title.equals("鎼滅储銆愭墍鏈夈�戦�嗗彉鍣ㄥ垪琛�(0)") && !title.equals("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)")) {
+ // TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�
TipDialog("鎵句笉鍒颁綇瀹呯殑銆愪富閫嗗彉鍣ㄣ��,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.", null);
return;
}
@@ -123,13 +126,15 @@
*/
private List<String> getTitleList() {
List<String> s = new ArrayList<>();
- s.add("鎼滅储閫嗗彉鍣ㄥ垪琛�(0)");
+ s.add("鎼滅储銆愭墍鏈夈�戦�嗗彉鍣ㄥ垪琛�(0)");
s.add("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)");
s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃(2)");
s.add("璇诲彇閫嗗彉鍣ㄨ鎯�(3)");
- s.add("娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d(4)");
+ s.add("瑙ｇ粦閫嗗彉鍣�(4)");
s.add("涓婁紶oid鍒楄〃缁欎簯绔�(5)");
s.add("鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�(6)");
+ s.add("鑾峰彇閫嗗彉鍣ㄧ殑淇℃伅(7)");
+// s.add("瑙ｇ粦閫嗗彉鍣�(8)");
return s;
}
@@ -141,8 +146,8 @@
private void startRequest(int position, GatewayBean gatewayBean) {
String title = getTitleList().get(position);
switch (title) {
- case "鎼滅储閫嗗彉鍣ㄥ垪琛�(0)": {
- HdlDeviceLogic.getInstance().searchAllGateway(new GatewayCallBack() {
+ case "鎼滅储銆愭墍鏈夈�戦�嗗彉鍣ㄥ垪琛�(0)": {
+ HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
List<GatewayBean> newGatewayBeanList = new ArrayList<>();
@@ -206,14 +211,27 @@
});
}
break;
- case "娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d(4)": {
+ case "瑙ｇ粦閫嗗彉鍣�(4)": {
TipDialog("涓�鏃︽竻闄ゆ帀閫嗗彉鍣ㄤ綇瀹卛d,閫嗗彉鍣ㄩ渶瑕侀噸鏂扮粦瀹氫綇瀹咃紝鍚﹀垯鏃犳硶娴嬭瘯閫嗗彉鍣ㄦ寚浠�;", new Listener() {
@Override
public void Confirmation() {
+
HdlDeviceLogic.getInstance().clearInverterHomeId(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- gsonConvertJsonStr(obj);
+ s += "瑙ｇ粦銆愭湰鍦般�戞垚鍔�--->";
+ HdlDeviceLogic.getInstance().delInverterDevice(UserConfigManage.getInstance().getHomeId(), gatewayBean.getDeviceId(), new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ s += "瑙ｇ粦銆愪簯绔�戞垚鍔�";
+ gsonConvertJsonStr(s);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ setError(e.getMsg(), e.getCode());
+ }
+ });
}
@Override
@@ -258,6 +276,34 @@
});
}
break;
+ case "鑾峰彇閫嗗彉鍣ㄧ殑淇℃伅(7)": {
+ TcpClient.getInstance().sendModBusDataToLinkGateway(gatewayBean.getDevice_mac(), "0000001A", TcpClient.FunctionCode.ReadMultipleRegisters, 550, "8", new ModbusCallBack() {
+ @Override
+ public void onSuccess(int[] data) {
+ gsonConvertJsonStr(data);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ setError(e.getMsg(), e.getCode());
+ }
+ });
+ }
+ break;
+ case "瑙ｇ粦閫嗗彉鍣�(8)": {
+ HdlDeviceLogic.getInstance().delInverterDevice(UserConfigManage.getInstance().getHomeId(), gatewayBean.getDeviceId(), new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ gsonConvertJsonStr(obj);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ setError(e.getMsg(), e.getCode());
+ }
+ });
+ }
+ break;
default: {
HdlThreadLogic.runMainThread(new Runnable() {
@Override
--
Gitblit v1.8.0