From 88fa5aa9631b263e6e3d99d9ee787f73e78c6fda Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 17 五月 2024 14:54:53 +0800
Subject: [PATCH] 2024年05月17日14:54:51
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 166 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 124 insertions(+), 42 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 ca77b32..0fa9abd 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
@@ -1,5 +1,6 @@
package com.hdl.photovoltaic.ui.powerstation;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.View;
@@ -33,8 +34,10 @@
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
import com.hdl.photovoltaic.ui.bean.DeviceBean;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.photovoltaic.widget.DefaultFilteringDialog;
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -68,19 +71,13 @@
private boolean isClickPowerStationLabel = true;//(鐢电珯鏍囩=true锛岃澶囨爣绛�=false)
private String key = SortValue.all;
- private String value = SortValue.all;
+ private String value = SortValue.all;//descending:闄嶅簭,ascending:鍗囧簭
+ private String installedCapacityMinValue = "";//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+ private String installedCapacityMaxValue = "";//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
+ private String gridTypeValue = "";//骞剁綉鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,FULL_GRID:骞剁綉,OFFLINE:绂荤綉)
+ private String powerStationStatusValue = "";//鐢电珯鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,1:姝ｅ父(杩愯),2:绂荤嚎,3:寰呮帴鍏�,4:鏁呴殰)
-
- private String installedCapacityMinKey = SortType.installedCapacityMin;
- private int installedCapacityMinValue;
- private String installedCapacityMaxKey = SortType.installedCapacityMax;
- private int installedCapacityMaxValue;
- private String gridTypeKey = SortType.gridType;
- private String gridTypeValue;
- private String powerStationStatusKey = SortType.powerStationStatus;
- private int powerStationStatusValue;
-
- private long pageSize = 20;//椤垫暟
+ private final long pageSize = 20;//椤垫暟
@Override
@@ -91,6 +88,9 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ //鏀惧湪杩欓噷涔熷锛岃繖閲屽彧鏄鍒涘缓涓�娆�
+// loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+// getStatusOverview();
initData();
//鍒濆鍖�
initView();
@@ -110,9 +110,11 @@
isClickPowerStationLabel = true;
viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style);
viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style);
- viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
- viewBinding.deviceLabelParent.setVisibility(View.GONE);//璁惧鏍囩闅愯棌
- loadNextPageHouseList(true, 1, true);
+ viewBinding.editIv.setVisibility(View.VISIBLE);//缂栬緫鍥炬爣闅愯棌
+ viewBinding.addIv.setVisibility(View.VISIBLE);//娣诲姞鍥炬爣闅愯棌
+ viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
+ viewBinding.deviceLabelParent.setVisibility(View.GONE);//璁惧鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
//璁惧鏍囩
@@ -127,13 +129,13 @@
viewBinding.powerStationLabel.setTextAppearance(R.style.Text16Style);
viewBinding.editIv.setVisibility(View.GONE);//缂栬緫鍥炬爣闅愯棌
viewBinding.addIv.setVisibility(View.GONE);//娣诲姞鍥炬爣闅愯棌
- viewBinding.powerStationLabelParent.setVisibility(View.GONE);//鐢电珯鏍囩闅愯棌
- viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);
+ viewBinding.powerStationLabelParent.setVisibility(View.GONE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
+ viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);//璁惧鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
loadNextPageDeviceList(true, 1, true);
}
});
- //娣诲姞鐢电珯
+ //鐢电珯娣诲姞
viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -141,6 +143,34 @@
}
});
+ //鐢电珯鎼滅储
+ viewBinding.powerStationSearchClickCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, HouseSearchActivity.class);
+ startActivity(intent);
+ }
+ });
+ //榛樿閫夋嫨鍙傛暟鍥炬爣
+ viewBinding.powerStationDefaultConditionIv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ DefaultFilteringDialog defaultFilteringDialog = new DefaultFilteringDialog(_mActivity);
+ defaultFilteringDialog.show();
+ defaultFilteringDialog.initState(installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue);
+ defaultFilteringDialog.setOnClickListener(new DefaultFilteringDialog.OnClickListener() {
+ @Override
+ public void confirm(String min, String max, String state) {
+ installedCapacityMinValue = min;//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+ installedCapacityMaxValue = max;//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
+ gridTypeValue = state;//骞剁綉鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,FULL_GRID:骞剁綉,OFFLINE:绂荤綉)
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+ }
+ });
+ }
+ });
+
//鐢电珯璁剧疆涓嬫媺绠ご棰滆壊
viewBinding.fragmentHouseSrl.setColorSchemeResources(R.color.text_FF245EC3);
//鐢电珯涓嬫媺璇诲彇
@@ -148,7 +178,7 @@
@Override
public void onRefresh() {
viewBinding.fragmentHouseSrl.setRefreshing(false);
- loadNextPageHouseList(true, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
//鐢电珯涓婃媺璇诲彇
@@ -167,18 +197,18 @@
if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
if (!isHouseLoadingMore) {
// 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
- loadNextPageHouseList(false, ++currentHouseListPage, false);
+ HdlLogLogic.print("---婊戝姩鍒颁簡搴曢儴");
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, ++currentHouseListPage, false);
}
}
}
});
- //杩涘叆鐢电珯璇︽儏,鍒犻櫎鐢电珯,绉诲姩鐢电珯浣嶇疆
+ //鐢电珯璇︽儏杩涘叆,鍒犻櫎鐢电珯,绉诲姩鐢电珯浣嶇疆
houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() {
@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() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
HdlUniLogic.getInstance().openUniMP(path, null);
@@ -269,7 +299,7 @@
}
});
- //缂栬緫鐢电珯鎸夐挳
+ //鐢电珯缂栬緫鎸夐挳
viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -287,7 +317,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //鍙戠數鍔熺巼绛涢��
+ //鐢电珯鍙戠數鍔熺巼绛涢��
viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -298,7 +328,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //褰撴棩鍙戠數閲忕瓫閫�
+ //鐢电珯褰撴棩鍙戠數閲忕瓫閫�
viewBinding.stationDayRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -309,7 +339,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //褰撴湀鍙戠數閲忕瓫閫�
+ //鐢电珯褰撴湀鍙戠數閲忕瓫閫�
viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -320,7 +350,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //鐐瑰嚮璁惧
+ //璁惧鐐瑰嚮
deviceInfoAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
@Override
public void onClick(int position, DeviceBean deviceBean) {
@@ -353,10 +383,19 @@
if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
if (!isDeviceLoadingMore) {
// 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
+ HdlLogLogic.print("---婊戝姩鍒颁簡搴曢儴");
loadNextPageDeviceList(false, ++currentDeviceListPage, false);
}
}
+ }
+ });
+ //璁惧娣绘悳绱�
+ viewBinding.deviceSearchCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, DeviceSearchActivity.class);
+ startActivity(intent);
}
});
@@ -389,6 +428,8 @@
this.deviceInfoList.add(new DeviceBean());
// this.deviceInfoList.addAll(HdlDeviceLogic.getInstance().getListDevice());
}
+
+
}
/**
@@ -402,7 +443,7 @@
if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(eventBus.getTopic())) {
if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) {
//uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡
- loadNextPageHouseList(false, 1, true);
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
if (eventBus.getData() != null) {
Gson gson = new Gson();
String json = eventBus.getData().toString();
@@ -441,7 +482,7 @@
if (MqttRecvClient.getInstance() != null) {
MqttRecvClient.getInstance().removeAllTopic();
}
- loadNextPageHouseList(false, 1, true);
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
//杩涘幓浣忓畢璇︽儏uni璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡
@@ -456,18 +497,59 @@
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) {
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愮數绔欍��");
- loadNextPageHouseList(true, 1, true);
+// HdlThreadLogic.runSubThread(new Runnable() {
+// @Override
+// public void run() {
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+ getStatusOverview();
+// }
+// });
+
}
}
+ }
+
+ /**
+ * 鐢电珯鐘舵�佹瑙�
+ */
+ private void getStatusOverview() {
+ HdlResidenceLogic.getInstance().getStatusOverview(new CloudCallBeak<StatusOverviewBean>() {
+ @Override
+ public void onSuccess(StatusOverviewBean statusOverviewBean) {
+ if (statusOverviewBean == null) {
+ return;
+ }
+ viewBinding.screeningConditionNumber1Tv.setText(statusOverviewBean.getTotal());
+ viewBinding.screeningConditionNumber2Tv.setText(statusOverviewBean.getFault());
+ viewBinding.screeningConditionNumber3Tv.setText(statusOverviewBean.getOffline());
+ viewBinding.screeningConditionNumber4Tv.setText(statusOverviewBean.getConnecting());
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
}
/**
* 鍒锋柊UI锛堢數绔欙級
*
- * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
+ * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
+ * @param key 鍙戠數鍔熺巼鎺掑簭(powerSort);
+ * 浠婃棩鍙戠數閲忔帓搴�(todayElectricitySort);
+ * 鍒涘缓鏃堕棿鎺掑簭(createTimeSort);
+ * @param keyValue (descending:闄嶅簭
+ * ascending:鍗囧簭),
+ * @param installedCapacityMin 鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+ * @param installedCapacityMax 鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
+ * @param gridType 骞剁綉鐘舵�� (鍏ㄩ儴 锛�"";FULL_GRID 锛� 骞剁綉;OFFLINE 锛氱缃�)
+ * @param powerStationStatus 鐢电珯鐘舵�� (鍏ㄩ儴 锛�"";1 锛� 姝ｅ父;2 锛� 绂荤嚎; 3 锛� 寰呮帴鍏�;4 锛� 鏁呴殰)
+ * @param pageNo 椤电爜
+ * @param isClear 鏄惁娓呴櫎鏁版嵁
*/
- private void loadNextPageHouseList(boolean isRefreshing, long pageNo, boolean isClear) {
+ private void loadNextPageHouseList(boolean isRefreshing, String key, String keyValue, String installedCapacityMin, String installedCapacityMax, String gridType, String powerStationStatus, long pageNo, boolean isClear) {
if (isClear) {
clearData();
}
@@ -483,7 +565,7 @@
}
//鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
- HdlResidenceLogic.getInstance().getResidenceIdList(key, value, pageNo, pageSize, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
+ HdlResidenceLogic.getInstance().getResidenceIdList(key, keyValue, installedCapacityMin, installedCapacityMax, gridType, powerStationStatus, pageNo, pageSize, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
@Override
public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
HdlThreadLogic.runMainThread(new Runnable() {
@@ -591,7 +673,6 @@
if (isRefreshing) {
hideLoading();
}
-
}
}, _mActivity, ShowErrorMode.YES);
}
@@ -626,12 +707,15 @@
*/
private void nullDataUpdateUi() {
boolean is_data;
+ String tipText = "";
if (isClickPowerStationLabel) {
is_data = houseListBeanIDList != null && houseListBeanIDList.size() > 0;
+ tipText = getString(R.string.my_power_station_data_null);
} else {
is_data = deviceInfoList != null && deviceInfoList.size() > 0;
+ tipText = getString(R.string.no_equipment);
}
- HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.nullDataIc.getRoot(), viewBinding.nullDataIc.nullDataGifAnimationIv, viewBinding.nullDataIc.nullDataTv, getString(R.string.my_power_station_data_null), is_data);
+ HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.nullDataIc.getRoot(), viewBinding.nullDataIc.nullDataGifAnimationIv, viewBinding.nullDataIc.nullDataTv, tipText, is_data);
}
/**
@@ -646,7 +730,7 @@
}
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
- HdlDeviceLogic.getInstance().initializeGateway(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
+ HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
// HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + cloudInverterDeviceBean.getOsn(),true);
@@ -673,9 +757,8 @@
@Override
public void onSuccess(Boolean obj) {
hideLoading();
- //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;
- initializeInverter(list);
- HdlResidenceLogic.getInstance().delHouseId(homeId);
+ initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍙兘鏄湰鍦板彂閫佷簡(瑕佹悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾),鍒犻櫎鐢电珯鎴愬姛鍚�,浜戠瑙ｇ粦閫嗗彉鍣ㄧ殑鍏崇郴锛�
+ HdlResidenceLogic.getInstance().delHouseId(homeId);//鍒犻櫎鐢电珯缂撳瓨
initData();//鍒濆鍖栫紦瀛樻暟鎹�
houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
nullDataUpdateUi();//妫�娴嬫暟鎹槸鍚︿负绌�
@@ -684,7 +767,6 @@
@Override
public void onFailure(HDLException e) {
hideLoading();
-
HdlThreadLogic.toast(_mActivity, e);
}
});
--
Gitblit v1.8.0