From ecaff4ffd05c630ac32e49daf3b9b8904052b0fe Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 29 十二月 2023 15:16:07 +0800
Subject: [PATCH] 备份一下
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 90 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 36 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 2d5e97f..8f7ee04 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
@@ -2,11 +2,9 @@
import android.Manifest;
import android.content.Context;
-import android.content.Intent;
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;
@@ -21,18 +19,15 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
+import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
-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.HouseIdBean;
-import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
-import com.hdl.photovoltaic.ui.device.FastScanActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -93,8 +88,12 @@
// Intent intent = new Intent();
// intent.setClass(_mActivity, FastScanActivity.class);
// startActivity(intent);
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION
+ + "&token=" + UserConfigManage.getInstance().getToken()
+ + "&refreshToken=" + UserConfigManage.getInstance().getRefreshToken()
+ + "®ionUrl=" + AppConfigManage.getUserRegionUrl();
// // 鎵撳紑灏忕▼搴忛〉闈�
- HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
@Override
@@ -117,7 +116,7 @@
@Override
public void onClick(int position, HouseIdBean houseIdBean) {
//鐐瑰嚮浣忓畢璇︽儏
- HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===" + new Gson().toJson(houseIdBean), false);
+ HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏--->" + new Gson().toJson(houseIdBean), false);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS
+ "?homeId=" + houseIdBean.getHomeId()
@@ -138,6 +137,9 @@
houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList, _mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter);
+
+
+ this.nullDataUpdateUi(houseListBeanIDList);
}
@@ -167,27 +169,28 @@
}
} else if (HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT.equals(eventBus.getType())) {
+ //todo 鐜板湪榛樿鍒锋柊鍏ㄩ儴
//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);
- }
- }
+// 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);
+// }
+// }
}
@@ -196,18 +199,20 @@
if (MqttRecvClient.getInstance() != null) {
MqttRecvClient.getInstance().removeAllTopic();
}
+ updateUIData(false);
+
} 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()鍊�;
- //String topic = "/user/" + gatewayId+"/1";
- //杩涘幓浣忓畢璇︽儏寮�濮嬭闃呬富棰�
- MqttRecvClient.getInstance().checkAndsubscribeAllTopics("");
- }
+// for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().size(); i++) {
+ //String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().get(i).getGatewayId();
+ //瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙ｆ瀽瀛楃涓�,鍙嬁getGatewayId()鍊�;
+ //String topic = "/user/" + gatewayId+"/1";
+ //杩涘幓浣忓畢璇︽儏寮�濮嬭闃呬富棰�
+ MqttRecvClient.getInstance().checkAndsubscribeAllTopics("");
+// }
} else if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
- if (eventBus.getType().equals(HdlCommonLogic.HomepageTitleTabSwitch.powerstation.toString())) {
+ if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) {
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愮數绔欍��");
}
}
@@ -240,6 +245,7 @@
}
}
+ nullDataUpdateUi(list);
}
}, _mActivity, ShowErrorMode.YES);
@@ -310,4 +316,16 @@
}
+ /**
+ * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮�
+ */
+ private void nullDataUpdateUi(List<HouseIdBean> list) {
+ if (list != null && list.size() > 0) {
+ viewBinding.nullListTv.setVisibility(View.GONE);
+ } else {
+ viewBinding.nullListTv.setVisibility(View.VISIBLE);
+ }
+ }
+
+
}
--
Gitblit v1.8.0