From 0582b05b1f9dc97a71a72e4784452e5a43510256 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 十月 2024 17:23:48 +0800
Subject: [PATCH] 2024年10月29日17:21:51

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 8884190..f8a14fd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -859,13 +859,16 @@
     /**
      * 鍒囨崲浣忓畢
      *
-     * @param houseIdBean 浣忓畢Id瀵硅薄
+     * @param houseIdBean    浣忓畢Id瀵硅薄
+     * @param checkStationId 琛ㄧず鏄惁鍚姩妫�楠岀數绔橧d鐨勯�昏緫锛坱rue琛ㄧず妫�娴�,鍚﹀垯涓嶆楠岋級
      */
-    public void switchHouse(HouseIdBean houseIdBean) {
+    public void switchHouse(HouseIdBean houseIdBean, boolean checkStationId) {
         String homeId = UserConfigManage.getInstance().getHomeId();
-        if (houseIdBean.getHomeId().equals(homeId)) {
-            HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�--->" + homeId);
-            return;
+        if (checkStationId) {
+            if (houseIdBean.getHomeId().equals(homeId)) {
+                HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�--->" + homeId);
+                return;
+            }
         }
         //璁㈤槄瑕佸叏閮ㄥ彇娑�
         if (MqttRecvClient.getInstance() != null) {
@@ -887,7 +890,7 @@
         //閲嶆柊鍒涘缓浣忓畢鏂囦欢澶�
         HdlFileLogic.getInstance().createDirectory();
         //杩涘幓浣忓畢璇︽儏鎼滅储涓�涓嬮�嗗彉鍣ㄥ垪琛�,鐩殑鏄缓绔嬮�氳閫氶亾;
-        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(houseIdBean.getHomeId(),null);
+        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(houseIdBean.getHomeId(), null);
     }
 
 
@@ -896,7 +899,8 @@
      *
      * @param homeId 浣忓畢id
      */
-    public void getResidenceInverterAllInfo(String homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
+    public void getResidenceInverterAllInfo(String
+                                                    homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
         String requestUrl = HttpApi.POST_inverter_allInfo;
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);
@@ -926,7 +930,8 @@
      * @param debugPerm     鎺堟潈鐘舵�侊紙true鍙互缁х画璋冭瘯锛�
      * @param cloudCallBeak -
      */
-    public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<
+            Boolean> cloudCallBeak) {
         String requestUrl = HttpApi.C_POST_HOME_UPDATEDEBUGPERM;
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);
@@ -950,6 +955,7 @@
         });
 
     }
+
     /**
      * 鑾峰彇鐢电珯浜や粯浜岀淮鐮侊紙B绔級
      * 鎻忚堪锛氬畨瑁呭晢鐢电珯鐨勪氦浠樹簩缁寸爜
@@ -989,7 +995,8 @@
      * @param account       C绔处鍙�
      * @param cloudCallBeak -
      */
-    public void getDeliverToAccount(String homeId, String account, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void getDeliverToAccount(String homeId, String
+            account, CloudCallBeak<Boolean> cloudCallBeak) {
         String requestUrl = HttpApi.POST_deliverToAccount;
         JsonObject json = new JsonObject();
         json.addProperty("homeId", homeId);
@@ -1013,6 +1020,7 @@
         });
 
     }
+
     /**
      * 娣诲姞鎺ㄩ�乀oken
      *

--
Gitblit v1.8.0