From ed7ae7fcc3adf66fbcc2b9481692791e9a167d04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 16:56:01 +0800
Subject: [PATCH] 2024年05月21日16:55:59
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 438a6be..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.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();
}
});
@@ -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);
--
Gitblit v1.8.0