From 48e53c091965c3510d97ad4fa94e7bea736c90f6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 14:37:18 +0800
Subject: [PATCH] 2024年05月30日14:37:13

---
 app/src/main/res/layout/fragment_me.xml                                              |    3 ++-
 app/src/main/res/layout/fragment_house_list.xml                                      |    3 ++-
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java   |   10 +++++++++-
 app/src/main/res/layout/fragment_home_page.xml                                       |    1 +
 app/src/main/res/values/strings.xml                                                  |    1 +
 app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java |    6 +++++-
 app/src/main/res/layout/fragment_message.xml                                         |    1 +
 app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java          |    2 +-
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java     |    6 +++++-
 app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java                 |    3 +++
 10 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
index 95928d5..afa02c2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
@@ -93,7 +93,11 @@
     public void getStatistics(String type, String time, CloudCallBeak<List<StatisticsBean>> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Home_page_statistics;
         JsonObject json = new JsonObject();
-        json.addProperty("dataType", "GE");//鍙戠數閲忥紙GE 锛� 鍙戠數閲� ;POWER 锛� 鍙戠數鍔熺巼锛�
+        if (TimeType.day.equals(type)) {
+            json.addProperty("dataType", "POWER");//鍙戠數閲忥紙GE 锛� 鍙戠數閲� ;POWER 锛� 鍙戠數鍔熺巼锛�
+        } else {
+            json.addProperty("dataType", "GE");//鍙戠數閲忥紙GE 锛� 鍙戠數閲� ;POWER 锛� 鍙戠數鍔熺巼锛�
+        }
         json.addProperty("type", type);//绫诲瀷
         if (!TextUtils.isEmpty(time)) {
             if (!UserConfigManage.getInstance().isZh()) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index fa9bc5a..5e259e1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -373,6 +373,9 @@
         this.bottomViewChangeOfStyle();
     }
 
+    /**
+     * 搴曢儴妯″潡鏍峰紡鏀瑰彉
+     */
     private void bottomViewChangeOfStyle() {
         if (this.currentFragmentIndex == 0) {
             //棣栭〉鐣岄潰
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 23c31b7..c584bba 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
@@ -33,7 +33,7 @@
     private String systemStatusDesc;//鐘舵��
 
     private String inv;//inv鐘舵��
-    private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
+    private int deviceStatus;// 锛� 杩炴帴涓紝2 锛� 鏁呴殰锛�3 锛� 杩愯锛�4 锛� 绂荤嚎
     private String addresses;//瀛愮綉鍙�/璁惧鍙�
     private List<DeviceAttributeBean> status;
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
index bee47e2..a0a4a62 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
@@ -196,12 +196,16 @@
         searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
             @Override
             public void onClick(int position, CloudInverterDeviceBean deviceBean) {
+                if (deviceBean.getDeviceStatus() == 4) {
+                    HdlThreadLogic.toast(_mActivity, R.string.device_off);
+                    return;
+                }
                 //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
                 HDLLinkConfig.getInstance().setHomeId(deviceBean.getHomeId());
                 HDLLinkConfig.getInstance().setLocalSecret(deviceBean.getLocalSecret());
                 List<CloudInverterDeviceBean> newList = new ArrayList<>();
                 newList.add(deviceBean);
-                //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
+                //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝鎷垮埌鍚庣紦瀛樺埌鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
                 HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                     @Override
                     public void onSuccess(List<GatewayBean> obj) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index d470d94..cbb05a7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -48,6 +48,7 @@
 import com.hdl.sdk.link.common.exception.HDLLinkException;
 import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
 import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
 
@@ -426,9 +427,16 @@
 //                gatewayBean.setHomeId(deviceBean.getHomeId());
 //                gatewayBean.setSpk(deviceBean.getSpk());
 //                gatewayBean.setDeviceType(deviceBean.getDeviceType());
+                if (deviceBean.getDeviceStatus() == 4) {
+                    HdlThreadLogic.toast(_mActivity, R.string.device_off);
+                    return;
+                }
+                //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
+                HDLLinkConfig.getInstance().setHomeId(deviceBean.getHomeId());
+                HDLLinkConfig.getInstance().setLocalSecret(deviceBean.getLocalSecret());
                 List<CloudInverterDeviceBean> newList = new ArrayList<>();
                 newList.add(deviceBean);
-                // //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
+                //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝鎷垮埌鍚庣紦瀛樺埌鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
                 HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                     @Override
                     public void onSuccess(List<GatewayBean> obj) {
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index cad2c06..517d0ee 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/bj"
     tools:context=".ui.home.HomePageFragment">
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index bacf98c..72e15a0 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/house_list_parent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/bj">
     <!--澶撮儴鏍囩-->
     <RelativeLayout
         android:id="@+id/title_cl"
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index c61cadf..e3bfa61 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/me_parent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/bj">
 
     <TextView
         android:id="@+id/me_title_tv"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 94de602..6c955ca 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/message_parent"
     android:layout_width="match_parent"
+    android:background="@drawable/bj"
     android:layout_height="match_parent">
     <!--澶撮儴鏍囩-->
     <RelativeLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7424c44..ae83604 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -306,5 +306,6 @@
     <string name="active_power">鏈夊姛鍔熺巼</string>
     <string name="t">鍚�</string>
     <string name="number">妫�</string>
+    <string name="device_off">璁惧宸茬绾�!</string>
 
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0