From e5d41b6ef7818b287fb4f4882e841438a186f063 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 三月 2024 16:09:58 +0800
Subject: [PATCH] 2024年03月21日16:09:50
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | 10 ++++------
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 11 ++++++-----
2 files changed, 10 insertions(+), 11 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..b794a8e 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
@@ -140,18 +140,18 @@
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);
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index dea8cc6..354d541 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -143,17 +143,18 @@
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());
}
});
@@ -424,14 +425,14 @@
*
* @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();//鍒濆鍖栫紦瀛樻暟鎹�
houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
@@ -441,7 +442,7 @@
@Override
public void onFailure(HDLException e) {
hideLoading();
- delayedConfirmationCancelDialog.dismiss();
+
HdlThreadLogic.toast(_mActivity, e);
}
});
--
Gitblit v1.8.0