From 157065e7a5fc1946fa1827c89499562ec2d32196 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 08 五月 2024 18:05:13 +0800
Subject: [PATCH] 2024年05月08日18:05:11
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 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..b850088 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;
@@ -68,19 +69,19 @@
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 installedCapacityMinKey = SortType.installedCapacityMin;
- private int installedCapacityMinValue;
+ private int installedCapacityMinValue;//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
private String installedCapacityMaxKey = SortType.installedCapacityMax;
- private int installedCapacityMaxValue;
+ private int installedCapacityMaxValue;//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
private String gridTypeKey = SortType.gridType;
- private String gridTypeValue;
+ private String gridTypeValue;//骞剁綉鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,FULL_GRID:骞剁綉,OFFLINE:绂荤綉)
private String powerStationStatusKey = SortType.powerStationStatus;
- private int powerStationStatusValue;
+ private int powerStationStatusValue;//鐢电珯鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,1:姝ｅ父(杩愯),2:绂荤嚎,3:寰呮帴鍏�,4:鏁呴殰)
- private long pageSize = 20;//椤垫暟
+ private final long pageSize = 20;//椤垫暟
@Override
@@ -133,12 +134,21 @@
}
});
- //娣诲姞鐢电珯
+ //鐢电珯娣诲姞
viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ }
+ });
+ //鐢电珯娣绘悳绱�
+ viewBinding.powerStationSearchClickCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, HouseSearchActivity.class);
+ startActivity(intent);
}
});
//鐢电珯璁剧疆涓嬫媺绠ご棰滆壊
@@ -173,7 +183,7 @@
}
}
});
- //杩涘叆鐢电珯璇︽儏,鍒犻櫎鐢电珯,绉诲姩鐢电珯浣嶇疆
+ //鐢电珯璇︽儏杩涘叆,鍒犻櫎鐢电珯,绉诲姩鐢电珯浣嶇疆
houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() {
@Override
public void onClick(int position, HouseIdBean houseIdBean) {
@@ -269,7 +279,7 @@
}
});
- //缂栬緫鐢电珯鎸夐挳
+ //鐢电珯缂栬緫鎸夐挳
viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -287,7 +297,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //鍙戠數鍔熺巼绛涢��
+ //鐢电珯鍙戠數鍔熺巼绛涢��
viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -298,7 +308,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //褰撴棩鍙戠數閲忕瓫閫�
+ //鐢电珯褰撴棩鍙戠數閲忕瓫閫�
viewBinding.stationDayRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -309,7 +319,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //褰撴湀鍙戠數閲忕瓫閫�
+ //鐢电珯褰撴湀鍙戠數閲忕瓫閫�
viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -320,7 +330,7 @@
value = isSelected ? SortValue.ascending : SortValue.descending;
}
});
- //鐐瑰嚮璁惧
+ //璁惧鐐瑰嚮
deviceInfoAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
@Override
public void onClick(int position, DeviceBean deviceBean) {
@@ -357,6 +367,15 @@
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);
}
});
@@ -591,7 +610,6 @@
if (isRefreshing) {
hideLoading();
}
-
}
}, _mActivity, ShowErrorMode.YES);
}
@@ -626,12 +644,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);
}
/**
--
Gitblit v1.8.0