From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 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..511f6e9 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,16 +73,23 @@
}
}
+ @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.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopFragmentHouseListRl.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();
}
});
@@ -136,22 +143,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 +193,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 +216,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 +235,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 +250,6 @@
@Override
public void onFailure(HDLException e) {
hideLoading();
- delayedConfirmationCancelDialog.dismiss();
HdlThreadLogic.toast(_mActivity, e);
}
});
--
Gitblit v1.8.0