From 0077e2137a77e6e671e95529165e10b3ed1289bb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 十二月 2023 16:09:09 +0800
Subject: [PATCH] 2023年12月25日16:08:58
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
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 9568c1e..2d5e97f 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
@@ -6,6 +6,7 @@
import android.content.pm.PackageManager;
import android.hardware.camera2.CameraManager;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.View;
import androidx.annotation.NonNull;
@@ -15,7 +16,9 @@
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.ConstantManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.enums.ShowErrorMode;
@@ -116,7 +119,11 @@
//鐐瑰嚮浣忓畢璇︽儏
HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===" + new Gson().toJson(houseIdBean), false);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
- String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS
+ + "?homeId=" + houseIdBean.getHomeId()
+ + "&homeName=" + houseIdBean.getHomeName()
+ + "&powerStationStatus=" + houseIdBean.getPowerStationStatus()
+ + "&serverAddress=" + AppConfigManage.getUserRegionUrl();
HdlUniLogic.getInstance().openUniMP(path, null);
}
@@ -137,11 +144,6 @@
private void initData() {
this.houseListBeanIDList = new ArrayList<>();
-// for (int i = 0; i < 11; i++) {
-// HouseListBean houseListBean = new HouseListBean();
-// houseListBean.setHomeName("鐢电珯" + i);
-// this.houseListBeanList.add(houseListBean);
-// }
this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
}
@@ -153,14 +155,40 @@
@Override
public void onEventMessage(BaseEventBus eventBus) {
super.onEventMessage(eventBus);
- if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) {
- //uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡
- updateUIData(false);
- if (eventBus.getData() != null) {
- Gson gson = new Gson();
- String json = eventBus.getData().toString();
- HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class);
- HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
+ if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(eventBus.getTopic())) {
+ if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) {
+ //uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡
+ updateUIData(false);
+ if (eventBus.getData() != null) {
+ Gson gson = new Gson();
+ String json = eventBus.getData().toString();
+ HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
+
+ }
+ } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT.equals(eventBus.getType())) {
+ //uin缂栬緫浣忓畢閫氱煡
+ String homeId = HdlUniLogic.getInstance().getKeyValue("homeId", eventBus.getData());
+ String home_name = HdlUniLogic.getInstance().getKeyValue("powerStationName", eventBus.getData());
+ if (TextUtils.isEmpty(homeId) || TextUtils.isEmpty(home_name)) {
+ return;
+ }
+ int index = -1;
+ for (int i = 0; i < houseListBeanIDList.size(); i++) {
+ HouseIdBean houseIdBean = houseListBeanIDList.get(i);
+ if (houseIdBean.getHomeId().equals(homeId)) {
+ index = i;
+ houseIdBean.setHomeName(home_name);
+ break;
+ }
+ }
+ if (index > -1) {
+ if (houseInfoAdapter != null) {
+ //鏇存柊鍗曚釜鏁版嵁
+ houseInfoAdapter.notifyItemChanged(index);
+ }
+ }
+
}
} else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getType())) {
--
Gitblit v1.8.0