From 43c0a28db7e43959561036dbde0eb5cb37a7e324 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 10 五月 2024 18:25:40 +0800
Subject: [PATCH] 2024年05月10日18:25:29

---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index 054dc51..c39a689 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -108,9 +108,13 @@
             houseListAdapter.setMoveOnclickListener(new HouseListAdapter.OnMoveClickListener() {
                 @Override
                 public void onMoveClick(int position, HouseIdBean houseIdBean) {
+                    if (position == 0) {
+                        HdlThreadLogic.toast(_mActivity, getString(R.string.already_the_first_one));
+                        return;
+                    }
                     String frontHomeId = "";
-                    if (position > 0) {
-                        frontHomeId = houseListBeanIDList.get(position - 1).getHomeId();
+                    if (position > 1) {
+                        frontHomeId = houseListBeanIDList.get(position - 2).getHomeId();
                     }
                     HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() {
                         @Override
@@ -118,6 +122,7 @@
                             //绉诲姩鐢电珯浣嶇疆
                             HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId());
                             initData();//鍒濆鍖栫紦瀛樻暟鎹�
+                            setAllItemEdit(is_edit);
                             houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
                             nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌�
                         }
@@ -256,7 +261,7 @@
                 JsonObject jsonObject = new JsonObject();
                 jsonObject.addProperty("homeId", houseIdBean.getHomeId());
                 jsonObject.addProperty("homeName", houseIdBean.getHomeName());
-                jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus());
+                jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus()+"");
                 HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                 uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
                 uniCallBackBaseBean.setData(jsonObject);

--
Gitblit v1.8.0