From 9eef1c69f214882b5ada2dae2a55df21bdd3058b Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 26 六月 2023 16:02:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 17a4e7e..9373411 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
@@ -20,6 +20,8 @@
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding;
+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;
@@ -44,6 +46,7 @@
private CameraManager manager;
private List<HouseListBean> houseListBeanList = null;
+
@Override
public Object getContentView() {
@@ -70,7 +73,7 @@
@Override
public void onClick(View v) {
// 鎵撳紑灏忕▼搴忛〉闈�
- HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_HOME_CREATION, null);
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
}
});
//璁剧疆涓嬫媺绠ご棰滆壊
@@ -81,6 +84,19 @@
viewBinding.fragmentHouseSrl.setRefreshing(false);
Log.d("HouseListFragment", "涓嬫媺鍒锋柊");
+ }
+ });
+ houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() {
+ @Override
+ public void onClick(int position) {
+ //鐐瑰嚮浣忓畢璇︽儏
+ HdlLogLogic.print("====鐐瑰嚮浣忓畢璇︽儏" + position);
+ if (houseListBeanList == null || houseListBeanList.size() <= 0) {
+ return;
+ }
+ HouseListBean houseListBean = houseListBeanList.get(position);
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseListBean.getHomeId();
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
});
}
@@ -99,11 +115,12 @@
private void initData() {
this.houseListBeanList = new ArrayList<>();
- for (int i = 0; i < 11; i++) {
- HouseListBean houseListBean = new HouseListBean();
- houseListBean.setHomeName("鐢电珯" + i);
- this.houseListBeanList.add(houseListBean);
- }
+// for (int i = 0; i < 11; i++) {
+// HouseListBean houseListBean = new HouseListBean();
+// houseListBean.setHomeName("鐢电珯" + i);
+// this.houseListBeanList.add(houseListBean);
+// }
+ this.houseListBeanList.addAll(HdlResidenceLogic.getInstance().getHouseInfoBeanList());
}
@@ -133,6 +150,5 @@
}
}
-
}
--
Gitblit v1.8.0