From e9e9ea0e5bf22953d5c0816d0a052bdd3acf92fc Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 22 三月 2024 21:03:40 +0800
Subject: [PATCH] 2024年03月22日20:24:23
---
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 18 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 00fc088..89959a6 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
@@ -2,19 +2,18 @@
import androidx.recyclerview.widget.LinearLayoutManager;
-import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
+
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityTestMainBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
@@ -22,10 +21,10 @@
import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
+import com.hdl.sdk.link.core.callback.ModbusCallBack;
import java.util.ArrayList;
import java.util.List;
@@ -39,6 +38,7 @@
private TestTitleAdapter testTitleAdapter;
private List<OidBean> mOidList;
+ private String s = "";
@Override
public Object getContentView() {
@@ -63,17 +63,17 @@
*/
private void initView() {
- String homeId = "娴嬭瘯浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
- String homeName = "娴嬭瘯浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
+ String homeId = "homeId=" + UserConfigManage.getInstance().getHomeId();
+ String homeName = "homeName=" + UserConfigManage.getInstance().getHomeName();
viewBinding.homeIdTv.setText(homeId);
viewBinding.homeNameTv.setText(homeName);
-
}
private void initEvent() {
viewBinding.topBackBtn.setOnClickListener(this);
viewBinding.topLogBtn.setOnClickListener(this);
+ viewBinding.clickCommandTv.setOnClickListener(this);
testTitleAdapter.setItemOnClickListener(new TestTitleAdapter.OnClickListener() {
@Override
public void OnClick(int position, String title) {
@@ -84,14 +84,20 @@
TipDialog("璇峰厛閫夋嫨浣忓畢杩涜娴嬭瘯,鍚﹀垯鏃犳硶杩涜閫嗗彉鍣ㄦ寚浠ゆ祴璇�.", null);
return;
}
- GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway();
- if (gatewayBean == null && !title.equals("鎼滅储閫嗗彉鍣ㄥ垪琛�(0)") && !title.equals("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)")) {
- // TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�;
+ List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId());
+ if (list == null && !title.equals("鎼滅储銆愭墍鏈夈�戦�嗗彉鍣ㄥ垪琛�(0)") && !title.equals("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)")) {
+ // TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�
TipDialog("鎵句笉鍒颁綇瀹呯殑銆愪富閫嗗彉鍣ㄣ��,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.", null);
return;
}
+ if (list.size() == 0 && !title.equals("鎼滅储銆愭墍鏈夈�戦�嗗彉鍣ㄥ垪琛�(0)") && !title.equals("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)")) {
+ // TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�
+ TipDialog("鎵句笉鍒颁綇瀹呯殑銆愪富閫嗗彉鍣ㄣ��,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.", null);
+ return;
+ }
+
showLoading();
- startRequest(position, gatewayBean);
+ startRequest(position, list.get(0));
}
});
}
@@ -105,6 +111,11 @@
} else if (id == viewBinding.topLogBtn.getId()) {
startActivity(TestLogActivity.class);
+ } else if (id == viewBinding.clickCommandTv.getId()) {
+
+ } else if (id == viewBinding.clickSelectDeviceTv.getId()) {
+// selectDevice();
+
}
}
@@ -115,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;
}
@@ -133,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<>();
@@ -198,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
@@ -237,7 +263,7 @@
}
break;
case "鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�(6)": {
- HdlDeviceLogic.getInstance().getInverterDeviceChildDeviceList(gatewayBean.getOid(), new CloudCallBeak<List<CloudInverterChildDeviceBean>>() {
+ HdlDeviceLogic.getInstance().getInverterDeviceChildDeviceList(UserConfigManage.getInstance().getHomeId(), gatewayBean.getOid(), new CloudCallBeak<List<CloudInverterChildDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterChildDeviceBean> obj) {
gsonConvertJsonStr(obj);
@@ -245,6 +271,34 @@
@Override
public void onFailure(HDLException e) {
+ setError(e.getMsg(), e.getCode());
+ }
+ });
+ }
+ 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().initializeGateway("0B37BA09F722EEF0", new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ gsonConvertJsonStr(obj);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
setError(e.getMsg(), e.getCode());
}
});
@@ -323,6 +377,26 @@
});
}
+ /**
+ * 閫夋嫨閫嗗彉鍣ㄨ皟璇�
+ */
+ public void selectDevice(String homeId) {
+ showLoading();
+ HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
+ @Override
+ public void onSuccess(List<GatewayBean> obj) {
+ hideLoading();
+
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ hideLoading();
+ }
+ });
+ }
+
public interface Listener {
void Confirmation();
}
--
Gitblit v1.8.0