From a8e0bddc9903d854808e9526600128e95560faa3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 30 十月 2023 18:21:25 +0800
Subject: [PATCH] 2023年10月30日18:21:12
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 13 ++++++-------
1 files changed, 6 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 4f16261..15c910f 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
@@ -5,7 +5,6 @@
import android.content.pm.PackageManager;
import android.hardware.camera2.CameraManager;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
@@ -35,7 +34,7 @@
import java.util.List;
/**
- * 鐢电珯鍒楄〃鐣岄潰
+ * (浣忓畢)鐢电珯鍒楄〃-鐣岄潰
*/
public class HouseListFragment extends CustomBaseFragment {
@@ -100,7 +99,7 @@
@Override
public void onRefresh() {
updateUIData(true);
- Log.d("HouseListFragment", "涓嬫媺鍒锋柊");
+ HdlLogLogic.print("HouseListFragment", "涓嬫媺鍒锋柊");
}
});
houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() {
@@ -109,18 +108,18 @@
//鐐瑰嚮浣忓畢璇︽儏
HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===" + new Gson().toJson(houseIdBean));
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
- String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId();
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId()+"&homeName="+houseIdBean.getHomeName();
HdlUniLogic.getInstance().openUniMP(path, null);
}
});
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station_鎴戠殑鐢电珯);
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station);
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add);
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
- houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList);
+ houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList,_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter);
@@ -160,7 +159,7 @@
MqttRecvClient.getInstance().removeAllTopic();
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
- //杩涘幓浣忓畢璇︽儏璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡
+ //杩涘幓浣忓畢璇︽儏uni璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡
for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().size(); i++) {
//String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().get(i).getGatewayId();
//瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙ｆ瀽瀛楃涓�,鍙嬁getGatewayId()鍊�;
--
Gitblit v1.8.0