From a59bbb7890e107a681f677765f2600e278c06a0d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 09 十月 2023 10:16:37 +0800
Subject: [PATCH] 2023年10月09日10:16:35
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 bd3064f..779e64f 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
@@ -12,6 +12,9 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.config.ConstantManage;
@@ -20,11 +23,13 @@
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
+import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
@@ -32,6 +37,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * 鐢电珯鍒楄〃鐣岄潰
+ */
public class HouseListFragment extends CustomBaseFragment {
public static final String SORT_TYPE_1 = "powerSort";//鍙戠數鍔熺巼鎺掑簭
@@ -103,8 +111,8 @@
@Override
public void onClick(int position, HouseIdBean houseIdBean) {
//鐐瑰嚮浣忓畢璇︽儏
- HdlLogLogic.print("====鐐瑰嚮浣忓畢璇︽儏" + position);
- HdlResidenceLogic.getInstance().switchHouse(houseIdBean.getHomeId());
+ HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===" + new Gson().toJson(houseIdBean));
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId();
HdlUniLogic.getInstance().openUniMP(path, null);
}
@@ -139,6 +147,12 @@
//鏀跺埌EventBUs閫氱煡
if (ConstantManage.EVENTBUS_POST_HOME_CREATED.equals(eventBus.getType())) {
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);
+ }
}
}
@@ -167,6 +181,7 @@
houseInfoAdapter.setList(list);
houseInfoAdapter.notifyDataSetChanged();
}
+
}
}
}, _mActivity, ShowErrorMode.YES);
@@ -174,7 +189,7 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
--
Gitblit v1.8.0