From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 390 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 246 insertions(+), 144 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index 24c5d53..d5a58ef 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -1,20 +1,20 @@
package com.hdl.photovoltaic.ui.powerstation;
import android.Manifest;
-import android.app.Dialog;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.location.LocationManager;
+import android.os.AsyncTask;
import android.os.Bundle;
-import android.os.SystemClock;
import android.provider.Settings;
+import android.text.TextUtils;
import android.util.Log;
import android.view.View;
-import android.view.Window;
import android.widget.ImageView;
+import android.widget.LinearLayout;
import android.widget.RelativeLayout;
+import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
@@ -45,7 +45,6 @@
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlDialogLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
-import com.hdl.photovoltaic.other.HdlOtaLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
@@ -57,11 +56,12 @@
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
-import com.hdl.photovoltaic.utils.ProcessManagerUtils;
import com.hdl.photovoltaic.utils.URLEncodingUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.DefaultFilteringDialog;
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
+import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout;
+import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
@@ -106,7 +106,7 @@
private String screeningConditionStatus = DebugStatus.All;//绛涢�夋潯浠剁姸鎬�
private String powerStationStatusValue = PowerStationStatus.All;//鐢电珯鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,1:姝ｅ父(杩愯),2:绂荤嚎,3:寰呮帴鍏�,4:鏁呴殰)
- private final long pageSize = 20;//椤垫暟
+ private final long pageSize = 100;//涓�椤靛ぇ灏�
/**
* 杩樺師鏉′欢鐨勫垵濮嬪寲鐘舵��
@@ -128,7 +128,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- getStatusOverview();
+// getStatusOverview();
initData();
//鍒濆鍖�
initView();
@@ -169,11 +169,12 @@
viewBinding.allLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (powerStationStatusValue.equals(PowerStationStatus.All)) {
+ return;
+ }
powerStationStatusValue = PowerStationStatus.All;
- viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
- viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -181,11 +182,12 @@
viewBinding.faultsLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (powerStationStatusValue.equals(PowerStationStatus.malfunction)) {
+ return;
+ }
powerStationStatusValue = PowerStationStatus.malfunction;
- viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
- viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ stationStatusStyle(viewBinding.faultsLl, viewBinding.faultsDesTv);
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -193,11 +195,12 @@
viewBinding.offlineLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (powerStationStatusValue.equals(PowerStationStatus.off)) {
+ return;
+ }
powerStationStatusValue = PowerStationStatus.off;
- viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
- viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ stationStatusStyle(viewBinding.offlineLl, viewBinding.offlineDesTv);
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -205,11 +208,12 @@
viewBinding.connectedLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (powerStationStatusValue.equals(PowerStationStatus.connecting)) {
+ return;
+ }
powerStationStatusValue = PowerStationStatus.connecting;
- viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
+ stationStatusStyle(viewBinding.connectedLl, viewBinding.connectedDesTv);
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -251,43 +255,10 @@
installedCapacityMinValue = min;//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
installedCapacityMaxValue = max;//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
screeningConditionStatus = state;//璋冭瘯鐘舵��(鍏ㄩ儴;璋冭瘯涓�;璋冭瘯瀹屾垚;宸蹭氦浠�;鎺堟潈璋冭瘯)
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
- }
- });
-
- //鐢电珯璁剧疆涓嬫媺绠ご棰滆壊
- viewBinding.fragmentHouseSrl.setColorSchemeResources(R.color.text_FF245EC3);
- //鐢电珯涓嬫媺璇诲彇
- viewBinding.fragmentHouseSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
- @Override
- public void onRefresh() {
- viewBinding.fragmentHouseSrl.setRefreshing(false);
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
- getStatusOverview();
- }
- });
- //鐢电珯涓婃媺璇诲彇
- viewBinding.fragmentHouseSrlListRc.addOnScrollListener(new RecyclerView.OnScrollListener() {
- @Override
- public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-// super.onScrolled(recyclerView, dx, dy);
-
- LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
- if (layoutManager == null) {
- return;
- }
- int visibleItemCount = layoutManager.getChildCount();
- int totalItemCount = layoutManager.getItemCount();
- int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition();
- if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
- if (!isHouseLoadingMore) {
- // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("---婊戝姩鍒颁簡搴曢儴");
- loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, ++currentHouseListPage, false);
- }
- }
}
});
//鐢电珯璇︽儏杩涘叆,鍒犻櫎鐢电珯,绉诲姩鐢电珯浣嶇疆
@@ -387,43 +358,27 @@
}
});
-// //鐢电珯缂栬緫鎸夐挳
-// viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
-// @Override
-// public void onClick(View v) {
-// startActivity(HouseListEditActivity.class);
-// }
-// });
- //鐢电珯鍚嶇О绛涢��
+ //PV绛涢��
viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
boolean isSelected = !v.isSelected();
- screenIconState(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected);
- key = SortType.homeNameSort;
+ screeningConditionStyle(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected);
+ key = SortType.installedCapacitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
- //鐢电珯鍙戠數鍔熺巼绛涢��
+ //棰濆畾鍔熺巼绛涢��
viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
boolean isSelected = !v.isSelected();
- screenIconState(viewBinding.stationPowerRl, viewBinding.stationPowerIv, isSelected);
- key = SortType.powerSort;
+ screeningConditionStyle(viewBinding.stationPowerRl, viewBinding.stationPowerIv, isSelected);
+ key = SortType.invPowerSort;
value = isSelected ? SortValue.ascending : SortValue.descending;
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
- }
- });
- //鐢电珯褰撴棩鍙戠數閲忕瓫閫�
- viewBinding.stationDayRl.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- boolean isSelected = !v.isSelected();
- screenIconState(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected);
- key = SortType.todayElectricitySort;
- value = isSelected ? SortValue.ascending : SortValue.descending;
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -432,9 +387,22 @@
@Override
public void onClick(View v) {
boolean isSelected = !v.isSelected();
- screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected);
+ screeningConditionStyle(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected);
key = SortType.batteryCapacitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
+ getStatusOverview();
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
+ }
+ });
+ //鐢电珯褰撴棩鍙戠數閲忕瓫閫�
+ viewBinding.stationDayRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ boolean isSelected = !v.isSelected();
+ screeningConditionStyle(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected);
+ key = SortType.todayElectricitySort;
+ value = isSelected ? SortValue.ascending : SortValue.descending;
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -469,7 +437,17 @@
HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> obj) {
+
GatewayBean newGatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceBean.getOsn());
+ if (newGatewayBean == null) {
+ HdlThreadLogic.toast(_mActivity, getString(R.string.device_off));
+ return;
+ }
+ if (TextUtils.isEmpty(newGatewayBean.getGatewayId()) || TextUtils.isEmpty(newGatewayBean.getAesKey())) {
+ //杩欓噷鍙敮鎸佽繙绋嬭皟璇曪紝杩滅▼鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強gatewayId锛�
+ HdlThreadLogic.toast(_mActivity, getString(R.string.Device_failed_to_certificate) + "(124004)");
+ return;
+ }
String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(newGatewayBean));
String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;
HdlUniLogic.getInstance().openUniMP(path, null);
@@ -480,38 +458,6 @@
}
});
- }
- });
- //璁惧璁剧疆涓嬫媺绠ご棰滆壊
- viewBinding.fragmentDeviceSrl.setColorSchemeResources(R.color.text_FF245EC3);
- //璁惧涓嬫媺璇诲彇
- viewBinding.fragmentDeviceSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
- @Override
- public void onRefresh() {
- viewBinding.fragmentDeviceSrl.setRefreshing(false);
- loadNextPageDeviceList(false, 1, true);
- }
- });
- //璁惧涓婃媺璇诲彇
- viewBinding.fragmentDeviceSrlListRc.addOnScrollListener(new RecyclerView.OnScrollListener() {
- @Override
- public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-// super.onScrolled(recyclerView, dx, dy);
-
- LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
- if (layoutManager == null) {
- return;
- }
- int visibleItemCount = layoutManager.getChildCount();
- int totalItemCount = layoutManager.getItemCount();
- int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition();
- if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
- if (!isDeviceLoadingMore) {
- // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("---婊戝姩鍒颁簡搴曢儴");
- loadNextPageDeviceList(false, ++currentDeviceListPage, false);
- }
- }
}
});
//璁惧鎼滅储
@@ -526,14 +472,36 @@
}
+
/**
- * 鏇存柊绛涢�夋潯浠剁姸鎬�
+ * 鏇存柊绛涢�夌數绔欑姸鎬佹牱寮�
+ *
+ * @param ll 缁勪欢鍚嶇О
+ * @param tv 缁勪欢鍚嶇О
+ */
+ private void stationStatusStyle(LinearLayout ll, TextView tv) {
+ viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+
+ ll.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
+ tv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
+
+ }
+
+ /**
+ * 鏇存柊绛涢�夋潯浠剁姸鎬佹牱寮�
*
* @param relativeLayout 缁勪欢鍚嶇О
* @param imageView 缁勪欢鍚嶇О
* @param isSelected 鐘舵��
*/
- private void screenIconState(RelativeLayout relativeLayout, ImageView imageView, boolean isSelected) {
+ private void screeningConditionStyle(RelativeLayout relativeLayout, ImageView imageView, boolean isSelected) {
viewBinding.stationNameRl.setSelected(false);
viewBinding.stationNameIv.setSelected(false);
viewBinding.stationPowerRl.setSelected(false);
@@ -546,13 +514,12 @@
imageView.setSelected(isSelected);
}
+
private void initView() {
viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
viewBinding.deviceLabelParent.setVisibility(View.GONE);
- viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
- viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
//鐢电珯鏍囩
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
@@ -563,7 +530,12 @@
deviceInfoAdapter = new DeviceInfoAdapter(_mActivity);
viewBinding.fragmentDeviceSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
viewBinding.fragmentDeviceSrlListRc.setAdapter(deviceInfoAdapter);
+ //
// this.nullDataUpdateUi();
+ //涓嬫媺鍒锋柊浣忓畢鐨勯�昏緫
+ pullToRefreshHome();
+ //涓嬫媺鍒锋柊璁惧鐨勯�昏緫
+ pullToRefreshDevice();
}
@@ -665,6 +637,7 @@
// if (MqttRecvClient.getInstance() != null) {
// MqttRecvClient.getInstance().removeAllTopic();
// }
+
loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
@@ -679,8 +652,8 @@
}
String homeId = eventBus.getData().toString();
//杩涘幓浣忓畢璇︽儏uni璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡
- for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).size(); i++) {
- String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).get(i).getGatewayId();
+ for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId, null).size(); i++) {
+ String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId, null).get(i).getGatewayId();
//瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙ｆ瀽瀛楃涓�,鍙嬁getGatewayId()鍊�;
String topic = "/user/" + gatewayId + "/#";
//杩涘幓浣忓畢璇︽儏寮�濮嬭闃呬富棰�
@@ -706,27 +679,27 @@
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
initializationState();
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
} else if (eventBus.getType().equals(ConstantManage.station_page)) {
+ // 鍙栨秷绮樻�т簨浠�
+ EventBus.getDefault().removeStickyEvent(eventBus);
+ isClickPowerStationLabel = true;
+ selectedTitleLabelStyle();
+ powerStationStatusValue = eventBus.getData() == null ? "" : eventBus.getData().toString();
//閫氳繃棣栭〉鐢电珯杩涙潵鐨�
if (eventBus.getData().equals(PowerStationStatus.All)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.allLl.performClick();
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
} else if (eventBus.getData().equals(PowerStationStatus.malfunction)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.faultsLl.performClick();
+ stationStatusStyle(viewBinding.faultsLl, viewBinding.faultsDesTv);
} else if (eventBus.getData().equals(PowerStationStatus.off)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.offlineLl.performClick();
+ stationStatusStyle(viewBinding.offlineLl, viewBinding.offlineDesTv);
} else if (eventBus.getData().equals(PowerStationStatus.connecting)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.connectedLl.performClick();
+ stationStatusStyle(viewBinding.connectedLl, viewBinding.connectedDesTv);
}
+ getStatusOverview();
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
} else if (eventBus.getType().equals(ConstantManage.station_edit)) {
//缂栬緫鍚庢洿鏂颁竴涓嬩綇瀹呭垪琛�
//loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
@@ -745,7 +718,7 @@
* 鐢电珯鐘舵�佹瑙�
*/
private void getStatusOverview() {
- HdlResidenceLogic.getInstance().getStatusOverview(new CloudCallBeak<StatusOverviewBean>() {
+ HdlResidenceLogic.getInstance().getStatusOverview(screeningConditionStatus, installedCapacityMinValue, installedCapacityMaxValue, new CloudCallBeak<StatusOverviewBean>() {
@Override
public void onSuccess(StatusOverviewBean statusOverviewBean) {
if (statusOverviewBean == null) {
@@ -768,7 +741,7 @@
/**
* 鍒锋柊UI锛堢數绔欙級
*
- * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
+ * @param isRefreshing 鏄惁鏄剧ず鍔犺浇妗嗭紙true鏄剧ず锛宖alse涓嶆樉绀猴級
* @param key 鍙戠數鍔熺巼鎺掑簭(powerSort);
* 浠婃棩鍙戠數閲忔帓搴�(todayElectricitySort);
* 鍒涘缓鏃堕棿鎺掑簭(createTimeSort);
@@ -838,7 +811,7 @@
if (isRefreshing) {
hideLoading();
}
-
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
}
@@ -848,7 +821,7 @@
/**
* 鍒锋柊UI锛堣澶囷級
*
- * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
+ * @param isRefreshing 鏄惁鏄剧ず鍔犺浇妗嗭紙true鏄剧ず锛宖alse涓嶆樉绀猴級
* @param pageNo 椤电爜
* @param isClear true琛ㄧず娓呯┖缂撳瓨
*/
@@ -907,6 +880,7 @@
if (isRefreshing) {
hideLoading();
}
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
}
@@ -943,12 +917,12 @@
boolean is_data;
String tipText = "";
if (isClickPowerStationLabel) {
- is_data = houseListBeanIDList != null && houseListBeanIDList.size() > 0;
+ is_data = houseListBeanIDList != null && !houseListBeanIDList.isEmpty();
tipText = getString(R.string.my_power_station_data_null);
HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.homeNullDataIc.getRoot(), viewBinding.homeNullDataIc.nullDataGifAnimationIv, viewBinding.homeNullDataIc.nullDataTv, tipText, is_data);
} else {
- is_data = deviceInfoList != null && deviceInfoList.size() > 0;
+ is_data = deviceInfoList != null && !deviceInfoList.isEmpty();
tipText = getString(R.string.no_equipment);
HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, tipText, is_data);
@@ -1039,8 +1013,8 @@
public void requestPermissions(OnCallBeak onCallBeak) {
- //ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅
- //ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
+ //ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅
+ //ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
if (ary.length > 0) {
this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
@@ -1090,4 +1064,132 @@
}
}
-}
\ No newline at end of file
+
+
+ /**
+ * 涓嬫媺鍒锋柊銆愪綇瀹呫�戠殑閫昏緫
+ */
+ protected void pullToRefreshHome() {
+ viewBinding.fragmentHouseSrl.setDelegate(new BGARefreshLayout.BGARefreshLayoutDelegate() {
+ @Override
+ public void onBGARefreshLayoutBeginRefreshing(BGARefreshLayout refreshLayout) {
+ new AsyncTask<Void, Void, Void>() {
+
+ @Override
+ protected Void doInBackground(Void... params) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ // 鎵ц浠诲姟锛堝鏇存柊UI銆佽烦杞瓑锛�
+ viewBinding.fragmentHouseSrl.endRefreshing();
+ //鍔犺浇鏈�鏂版暟鎹畬鎴�
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
+ getStatusOverview();
+ }
+ }.execute();
+
+
+ }
+
+
+ @Override
+ public boolean onBGARefreshLayoutBeginLoadingMore(BGARefreshLayout refreshLayout) {
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... params) {
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ viewBinding.fragmentHouseSrl.endLoadingMore();
+ if (!isHouseLoadingMore) {
+ // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, ++currentHouseListPage, false);
+ }
+ }
+ }.execute();
+ return true;
+ }
+ });
+ HDLRefreshViewHolder hdlRefreshViewHolder = new HDLRefreshViewHolder(_mActivity, true);
+ hdlRefreshViewHolder.setPullDownImageResource(R.mipmap.loading_44);
+ hdlRefreshViewHolder.setChangeToReleaseRefreshAnimResId(R.drawable.loading_refresh);
+ hdlRefreshViewHolder.setRefreshingAnimResId(R.drawable.loading_refresh_end);
+ viewBinding.fragmentHouseSrl.setRefreshViewHolder(hdlRefreshViewHolder);
+ }
+
+ /**
+ * 涓嬫媺鍒锋柊銆愯澶囥�戠殑閫昏緫
+ */
+ protected void pullToRefreshDevice() {
+ viewBinding.fragmentDeviceSrl.setDelegate(new BGARefreshLayout.BGARefreshLayoutDelegate() {
+ @Override
+ public void onBGARefreshLayoutBeginRefreshing(BGARefreshLayout refreshLayout) {
+
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... params) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ viewBinding.fragmentDeviceSrl.endRefreshing();
+ loadNextPageDeviceList(false, 1, true);
+ }
+ }.execute();
+ }
+
+ @Override
+ public boolean onBGARefreshLayoutBeginLoadingMore(BGARefreshLayout refreshLayout) {
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... params) {
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ // 鎵ц浠诲姟锛堝鏇存柊UI銆佽烦杞瓑锛�
+ viewBinding.fragmentDeviceSrl.endLoadingMore();
+ if (!isDeviceLoadingMore) {
+ // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
+ loadNextPageDeviceList(false, ++currentDeviceListPage, false);
+ }
+ }
+ }.execute();
+ return true;
+ }
+ });
+ HDLRefreshViewHolder hdlRefreshViewHolder = new HDLRefreshViewHolder(_mActivity, true);
+ hdlRefreshViewHolder.setPullDownImageResource(R.mipmap.loading_44);
+ hdlRefreshViewHolder.setChangeToReleaseRefreshAnimResId(R.drawable.loading_refresh);
+ hdlRefreshViewHolder.setRefreshingAnimResId(R.drawable.loading_refresh_end);
+ viewBinding.fragmentDeviceSrl.setRefreshViewHolder(hdlRefreshViewHolder);
+ }
+
+
+}
--
Gitblit v1.8.0