From f10cda784bede39a861566850898747c38e6c94f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 21 一月 2025 15:32:54 +0800
Subject: [PATCH] 2025年01月21日15:31:52

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java |   81 +++++++++++++++++++---------------------
 1 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
index 8564260..e6aa4bb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
@@ -14,11 +14,13 @@
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityHouseListEditBinding;
 import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.MessageStateType;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
 import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlDeviceLogic;
+import com.hdl.photovoltaic.other.HdlLogLogic;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
@@ -30,6 +32,8 @@
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +46,7 @@
     private ActivityHouseListEditBinding viewBinding;
 
     private HouseListAdapter houseListAdapter;
-    private List<HouseIdBean> houseListBeanIDList;
+    private List<HouseIdBean> houseListBeanIDList = new ArrayList<>();
 
 
     @Override
@@ -61,28 +65,38 @@
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
         initEvent();
+        if (this.houseListBeanIDList.size() == 0) {
+            downReadData(false);
+        }
     }
 
     private void initData() {
-        this.houseListBeanIDList = new ArrayList<>();
+        this.houseListBeanIDList.clear();
         this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
         for (int i = 0; i < this.houseListBeanIDList.size(); i++) {
             this.houseListBeanIDList.get(i).setDelIcon(true);
             this.houseListBeanIDList.get(i).setMove(true);
-
         }
+    }
+
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        sendEventBus();
+    }
+
+    private void sendEventBus() {
+        HdlCommonLogic.getInstance().postEventBus(ConstantManage.homepage_title_tab_switch, ConstantManage.station_edit);
+        finish();
     }
 
     private void initEvent() {
         //杩斿洖鎸夐挳
-        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+        viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                BaseEventBus baseEventBus = new BaseEventBus();
-                baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
-                baseEventBus.setType(HomepageTitleTabSwitch.powerstation.toString());
-                EventBus.getDefault().post(baseEventBus);
-                finish();
+                sendEventBus();
             }
         });
 
@@ -96,37 +110,8 @@
             }
         });
         if (houseListAdapter != null) {
-            //鐢电珯绉诲姩浣嶇疆鎸夐挳
-            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 > 1) {
-                        frontHomeId = houseListBeanIDList.get(position - 2).getHomeId();
-                    }
-                    HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() {
-                        @Override
-                        public void onSuccess(Boolean obj) {
-                            //绉诲姩鐢电珯浣嶇疆
-                            HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId());
-                            initData();//鍒濆鍖栫紦瀛樻暟鎹�
-                            houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
-                            nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌�
-                        }
 
-                        @Override
-                        public void onFailure(HDLException e) {
-                            HdlThreadLogic.toast(_mActivity, e);
-                        }
-                    });
-                }
-            });
-
-            //鐢电珯绉诲姩浣嶇疆鎸夐挳
+            //鐢电珯鍒犻櫎浣嶇疆鎸夐挳
             houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() {
                 @Override
                 public void onDelClick(int position, HouseIdBean houseIdBean) {
@@ -185,10 +170,10 @@
     }
 
     private void initView() {
-        viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
-        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
-        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_editing);
+        viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
+        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_editing);
         LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
         houseListAdapter = new HouseListAdapter(_mActivity);
         viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
@@ -196,6 +181,7 @@
         houseListAdapter.setList(this.houseListBeanIDList);
         this.nullDataUpdateUi(houseListBeanIDList);
     }
+
 
     /**
      * 鍒犻櫎鐢电珯,閫嗗彉鍣�
@@ -254,6 +240,9 @@
      * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
      */
     private void downReadData(boolean isRefreshing) {
+        if (!isRefreshing) {
+            showLoading();
+        }
         //鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
         HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
             @Override
@@ -264,6 +253,8 @@
                         if (isRefreshing) {
                             //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
                             viewBinding.fragmentHouseSrl.setRefreshing(false);
+                        } else {
+                            hideLoading();
                         }
                         if (list != null && list.size() > 0) {
                             //鏇存柊缂撳瓨
@@ -290,7 +281,10 @@
                         if (isRefreshing) {
                             //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
                             viewBinding.fragmentHouseSrl.setRefreshing(false);
+                        } else {
+                            hideLoading();
                         }
+
 
                     }
                 }, _mActivity, ShowErrorMode.YES);
@@ -309,6 +303,7 @@
         }
     }
 
+
     /**
      * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮�
      */

--
Gitblit v1.8.0