From f7d89d0364769209c7af15c97204bdae55ac7505 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 17:29:53 +0800
Subject: [PATCH] 2024年05月22日17:29:51
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 8 +++-----
app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 2 +-
app/build.gradle | 2 +-
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 42 ++++++++++++++++++++++++++++++++++++++++++
6 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index fddfe1e..787df88 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,7 +131,7 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.2'
- implementation 'com.hdl.android:debugsdk:1.0.23'
+ implementation 'com.hdl.android:debugsdk:1.0.24'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index 5d4748c..957b41b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -1134,6 +1134,48 @@
}
/**
+ * 璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ *
+ * @param list 浜戠涓婄殑閫嗗彉鍣ㄥ垪琛�
+ * @param homeId 浣忓畢id
+ * @param cloudCallBeak 鍥炶皟
+ */
+ public void setDeviceRemoteInfo(List<CloudInverterDeviceBean> list, String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+ AtomicInteger atomicInteger = new AtomicInteger(0);
+ for (int i = 0; i < list.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+ //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
+ getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+ @Override
+ public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ }
+ }
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触---msg---" + e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
+ }
+
+ }
+
+ /**
* 閫氳繃sid鏌ヨ閫嗗彉鍣�
*
* @param list 浜戠涓婇�嗗彉鍣ㄥ垪琛�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
index 0546b48..8772c42 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
@@ -47,7 +47,7 @@
DeviceBean deviceBean = this.mList.get(position);
holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName());
- holder.device_details_sn_tv.setText(deviceBean.getOsn());
+ holder.device_details_sn_tv.setText("SN:"+deviceBean.getOsn());
holder.device_label_run_state_value_tv.setText(deviceBean.getSystemStatusDesc());
holder.device_label_power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kW));
holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kWh));
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java
index 1961544..e3e9e22 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java
@@ -41,7 +41,7 @@
DeviceBean deviceBean = this.mList.get(position);
holder.device_search_name_tv.setText(deviceBean.getHomeNameAndDeviceName());
- holder.device_search_sn_tv.setText(deviceBean.getOsn());
+ holder.device_search_sn_tv.setText("SN:"+deviceBean.getOsn());
holder.device_search_location_tv.setText(deviceBean.getHomeAddress());
setTextViewStyle(holder.device_search_state_tv, deviceBean.getDeviceStatus());
holder.itemView.setTag(position);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
index d12f38d..0edaeab 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
@@ -131,7 +131,7 @@
}
public String getOsn() {
- return osn == null ? "" : "SN:" + osn;
+ return osn == null ? "" : osn;
}
public void setOsn(String osn) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
index 3ae9b1c..75f3d09 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -169,7 +169,7 @@
@Override
public void onClick(View v) {
setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.allTv.getTag().toString());
+ mStateValue = GridType.All;
}
});
viewBinding.gridConnectedTv.setOnClickListener(new View.OnClickListener() {
@@ -177,7 +177,7 @@
@Override
public void onClick(View v) {
setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.gridConnectedTv.getTag().toString());
+ mStateValue = GridType.FULL_GRID;
}
});
viewBinding.offNetworkTv.setOnClickListener(new View.OnClickListener() {
@@ -185,7 +185,7 @@
@Override
public void onClick(View v) {
setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.offNetworkTv.getTag().toString());
+ mStateValue = GridType.OFFLINE;
}
});
@@ -209,8 +209,6 @@
minValue = min_max[0];
maxValue = min_max[1];
}
- } else {
- mStateValue = value;
}
viewBinding.minEt.setText(minValue);
--
Gitblit v1.8.0