From 3e904bfa8a1bb53dcf461e5c717f9b808e179245 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 08 一月 2025 16:27:48 +0800
Subject: [PATCH] 2025年01月08日16:27:46
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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 c62de4f..d3c5326 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,9 +1,16 @@
package com.hdl.photovoltaic.ui.powerstation;
+import android.app.Dialog;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.os.SystemClock;
+import android.util.Log;
import android.view.View;
+import android.view.Window;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
@@ -16,6 +23,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.ConstantManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
@@ -29,6 +37,7 @@
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
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;
@@ -39,6 +48,7 @@
import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.photovoltaic.utils.ProcessManagerUtils;
import com.hdl.photovoltaic.utils.URLEncodingUtils;
import com.hdl.photovoltaic.widget.DefaultFilteringDialog;
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
@@ -198,6 +208,7 @@
viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
}
@@ -268,11 +279,11 @@
@Override
public void onClick(int position, HouseIdBean houseIdBean) {
//鐐瑰嚮浣忓畢璇︽儏
- HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏---" + new Gson().toJson(houseIdBean), false);
+ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(0);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
HdlUniLogic.getInstance().openUniMP(path, null);
-
+ HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏---" + new Gson().toJson(houseIdBean), false);
}
@Override
@@ -372,8 +383,7 @@
@Override
public void onClick(View v) {
boolean isSelected = !v.isSelected();
- viewBinding.stationNameRl.setSelected(isSelected);
- viewBinding.stationNameIv.setSelected(isSelected);
+ screenIconState(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected);
key = SortType.homeNameSort;
value = isSelected ? SortValue.ascending : SortValue.descending;
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
@@ -384,8 +394,7 @@
@Override
public void onClick(View v) {
boolean isSelected = !v.isSelected();
- viewBinding.stationPowerRl.setSelected(isSelected);
- viewBinding.stationPowerIv.setSelected(isSelected);
+ screenIconState(viewBinding.stationPowerRl, viewBinding.stationPowerIv, isSelected);
key = SortType.powerSort;
value = isSelected ? SortValue.ascending : SortValue.descending;
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
@@ -396,8 +405,7 @@
@Override
public void onClick(View v) {
boolean isSelected = !v.isSelected();
- viewBinding.stationDayRl.setSelected(isSelected);
- viewBinding.stationDayIv.setSelected(isSelected);
+ screenIconState(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected);
key = SortType.todayElectricitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
@@ -408,8 +416,7 @@
@Override
public void onClick(View v) {
boolean isSelected = !v.isSelected();
- viewBinding.stationMonthRl.setSelected(isSelected);
- viewBinding.stationMonthIv.setSelected(isSelected);
+ screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected);
key = SortType.monthElectricitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
@@ -503,6 +510,26 @@
}
+ /**
+ * 鏇存柊绛涢�夋潯浠剁姸鎬�
+ *
+ * @param relativeLayout 缁勪欢鍚嶇О
+ * @param imageView 缁勪欢鍚嶇О
+ * @param isSelected 鐘舵��
+ */
+ private void screenIconState(RelativeLayout relativeLayout, ImageView imageView, boolean isSelected) {
+ viewBinding.stationNameRl.setSelected(false);
+ viewBinding.stationNameIv.setSelected(false);
+ viewBinding.stationPowerRl.setSelected(false);
+ viewBinding.stationPowerIv.setSelected(false);
+ viewBinding.stationDayRl.setSelected(false);
+ viewBinding.stationDayIv.setSelected(false);
+ viewBinding.stationMonthRl.setSelected(false);
+ viewBinding.stationMonthIv.setSelected(false);
+ relativeLayout.setSelected(isSelected);
+ imageView.setSelected(isSelected);
+ }
+
private void initView() {
viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
viewBinding.deviceLabelParent.setVisibility(View.GONE);
@@ -520,7 +547,7 @@
deviceInfoAdapter = new DeviceInfoAdapter(_mActivity);
viewBinding.fragmentDeviceSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
viewBinding.fragmentDeviceSrlListRc.setAdapter(deviceInfoAdapter);
- this.nullDataUpdateUi();
+// this.nullDataUpdateUi();
}
@@ -647,6 +674,7 @@
MqttRecvClient.getInstance().checkAndsubscribeAllTopics(topicHome);//璁㈤槄銆愮數绔欍�戞秷鎭�
+
} else if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
--
Gitblit v1.8.0