From 2ea20ee815b2b95be3e02f93d2ca178e5b852442 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 15 十二月 2023 14:17:52 +0800
Subject: [PATCH] 2023年12月15日14:17:49
---
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 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 fb0f354..b76ce88 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
@@ -85,7 +85,7 @@
return;
}
GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway();
- if (gatewayBean == null && !title.equals("鎼滅储閫嗗彉鍣ㄥ垪琛�")) {
+ if (gatewayBean == null && !title.equals("鎼滅储閫嗗彉鍣ㄥ垪琛�(0)") && !title.equals("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)")) {
// TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�;
TipDialog("鎵句笉鍒颁綇瀹呯殑銆愪富閫嗗彉鍣ㄣ��,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.", null);
return;
@@ -115,12 +115,13 @@
*/
private List<String> getTitleList() {
List<String> s = new ArrayList<>();
- s.add("鎼滅储閫嗗彉鍣ㄥ垪琛�");
- s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃");
- s.add("璇诲彇閫嗗彉鍣ㄨ鎯�");
- s.add("娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d");
- s.add("涓婁紶oid鍒楄〃缁欎簯绔�");
- s.add("鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�");
+ s.add("鎼滅储閫嗗彉鍣ㄥ垪琛�(0)");
+ s.add("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)");
+ s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃(2)");
+ s.add("璇诲彇閫嗗彉鍣ㄨ鎯�(3)");
+ s.add("娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d(4)");
+ s.add("涓婁紶oid鍒楄〃缁欎簯绔�(5)");
+ s.add("鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�(6)");
return s;
}
@@ -132,8 +133,28 @@
private void startRequest(int position, GatewayBean gatewayBean) {
String title = getTitleList().get(position);
switch (title) {
- case "鎼滅储閫嗗彉鍣ㄥ垪琛�": {
- HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
+ case "鎼滅储閫嗗彉鍣ㄥ垪琛�(0)": {
+ HdlDeviceLogic.getInstance().searchAllGateway(new GatewayCallBack() {
+ @Override
+ public void onSuccess(List<GatewayBean> gatewayBeanList) {
+ List<GatewayBean> newGatewayBeanList = new ArrayList<>();
+ for (int i = 0; i < gatewayBeanList.size(); i++) {
+ if (HdlDeviceLogic.getInstance().isGatewaySpk(gatewayBeanList.get(i).getGatewayType())) {
+ newGatewayBeanList.add(gatewayBeanList.get(i));
+ }
+ }
+ gsonConvertJsonStr(newGatewayBeanList);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ setError(e.getMsg(), e.getCode());
+ }
+ });
+ }
+ break;
+ case "鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)": {
+ HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
gsonConvertJsonStr(gatewayBeanList);
@@ -147,7 +168,7 @@
}
break;
- case "鑾峰彇閫嗗彉鍣╫id鍒楄〃": {
+ case "鑾峰彇閫嗗彉鍣╫id鍒楄〃(2)": {
HdlDeviceLogic.getInstance().getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
@Override
public void onSuccess(List<OidBean> obj) {
@@ -163,7 +184,7 @@
}
break;
- case "璇诲彇閫嗗彉鍣ㄨ鎯�": {
+ case "璇诲彇閫嗗彉鍣ㄨ鎯�(3)": {
HdlDeviceLogic.getInstance().getGatewayInfo(gatewayBean.getDevice_mac(), new LinkCallBack<GatewayBean>() {
@Override
public void onSuccess(GatewayBean obj) {
@@ -177,7 +198,7 @@
});
}
break;
- case "娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d": {
+ case "娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d(4)": {
TipDialog("涓�鏃︽竻闄ゆ帀閫嗗彉鍣ㄤ綇瀹卛d,閫嗗彉鍣ㄩ渶瑕侀噸鏂扮粦瀹氫綇瀹咃紝鍚﹀垯鏃犳硶娴嬭瘯閫嗗彉鍣ㄦ寚浠�;", new Listener() {
@Override
public void Confirmation() {
@@ -196,7 +217,7 @@
});
}
break;
- case "涓婁紶oid鍒楄〃缁欎簯绔�": {
+ case "涓婁紶oid鍒楄〃缁欎簯绔�(5)": {
if (this.mOidList == null || this.mOidList.size() == 0) {
hideLoading();
HdlThreadLogic.toast(this, "娌℃湁oid鍒楄〃鏁版嵁锛岃鍏堣幏鍙栭�嗗彉鍣╫id鍒楄〃鏁版嵁锛屽啀閲嶆柊涓婁紶.");
@@ -215,7 +236,7 @@
});
}
break;
- case "鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�": {
+ case "鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�(6)": {
HdlDeviceLogic.getInstance().getInverterDeviceChildDeviceList(gatewayBean.getOid(), new CloudCallBeak<List<CloudInverterChildDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterChildDeviceBean> obj) {
--
Gitblit v1.8.0