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/powerstation/HouseListEditActivity.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 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..b3f65a3 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
@@ -136,22 +136,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());
                                 }
                             });
 //                            //鍒犻櫎浣忓畢
@@ -228,13 +228,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 +243,6 @@
             @Override
             public void onFailure(HDLException e) {
                 hideLoading();
-                delayedConfirmationCancelDialog.dismiss();
                 HdlThreadLogic.toast(_mActivity, e);
             }
         });

--
Gitblit v1.8.0