From 88fa5aa9631b263e6e3d99d9ee787f73e78c6fda Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 17 五月 2024 14:54:53 +0800
Subject: [PATCH] 2024年05月17日14:54:51

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 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 8188d93..aa5901a 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
@@ -73,9 +73,19 @@
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        BaseEventBus baseEventBus = new BaseEventBus();
+        baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
+        baseEventBus.setType(HomepageTitleTabSwitch.powerstation.toString());
+        EventBus.getDefault().post(baseEventBus);
+        finish();
+    }
+
     private void initEvent() {
         //杩斿洖鎸夐挳
-        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 BaseEventBus baseEventBus = new BaseEventBus();
@@ -136,22 +146,22 @@
                     String homeName = "\"" + houseIdBean.getHomeName() + "\"";
                     delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName));
                     delayedConfirmationCancelDialog.show();
-                    delayedConfirmationCancelDialog.startCountdown(3);
+                    delayedConfirmationCancelDialog.startCountdown(4);
                     delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() {
                         @Override
                         public void Confirm() {
-
+                            delayedConfirmationCancelDialog.dismiss();
                             showLoading(getString(R.string.deleting_please_wait));
                             HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                                 @Override
                                 public void onSuccess(List<GatewayBean> list) {
-                                    deleteResidence(houseIdBean.getHomeId(), delayedConfirmationCancelDialog);
+                                    deleteResidence(houseIdBean.getHomeId());
                                     initializeInverter(list);
                                 }
 
                                 @Override
                                 public void onFailure(HDLException e) {
-                                    deleteResidence(houseIdBean.getHomeId(), delayedConfirmationCancelDialog);
+                                    deleteResidence(houseIdBean.getHomeId());
                                 }
                             });
 //                            //鍒犻櫎浣忓畢
@@ -186,7 +196,7 @@
 
     private void initView() {
         viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
-        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
         viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
         viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_editing);
         LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
@@ -209,7 +219,7 @@
         }
         for (int i = 0; i < list.size(); i++) {
             GatewayBean gatewayBean = list.get(i);
-            HdlDeviceLogic.getInstance().initializeGateway(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
+            HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                 @Override
                 public void onSuccess(Boolean obj) {
 //                                HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + cloudInverterDeviceBean.getOsn(),true);
@@ -228,13 +238,12 @@
      *
      * @param homeId 鐢电珯id
      */
-    private void deleteResidence(String homeId, DelayedConfirmationCancelDialog delayedConfirmationCancelDialog) {
+    private void deleteResidence(String homeId) {
         //鍒犻櫎浣忓畢
         HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean obj) {
                 hideLoading();
-                delayedConfirmationCancelDialog.dismiss();
                 HdlResidenceLogic.getInstance().delHouseId(homeId);
                 initData();//鍒濆鍖栫紦瀛樻暟鎹�
                 houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
@@ -244,7 +253,6 @@
             @Override
             public void onFailure(HDLException e) {
                 hideLoading();
-                delayedConfirmationCancelDialog.dismiss();
                 HdlThreadLogic.toast(_mActivity, e);
             }
         });

--
Gitblit v1.8.0