From d46bfdd7ea07d9630e1f0f686d77775342550025 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 17 五月 2024 16:51:57 +0800
Subject: [PATCH] 2024年05月17日16:51:48
---
app/src/main/res/layout/item_station.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 74 ++++++++++++++++++++++++++++++++++++
app/src/main/res/drawable/selected_8_38c494.xml | 5 ++
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 7 +--
4 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 3425d20..540949f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -7,7 +7,6 @@
import androidx.fragment.app.FragmentTransaction;
import android.Manifest;
-import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -48,7 +47,7 @@
import com.hdl.photovoltaic.ui.home.HomePageFragment;
import com.hdl.photovoltaic.ui.me.MeFragment;
import com.hdl.photovoltaic.ui.message.MessageFragment;
-import com.hdl.photovoltaic.ui.powerstation.HouseListFragment;
+import com.hdl.photovoltaic.ui.powerstation.HouseAndDeviceFragment;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
@@ -132,7 +131,7 @@
mFragmentManager = getSupportFragmentManager();
//纰庣墖鍒濆鍖�
HomePageFragment mHomePageFragment = new HomePageFragment();
- HouseListFragment mHouseListFragment = new HouseListFragment();
+ HouseAndDeviceFragment mHouseAndDeviceFragment = new HouseAndDeviceFragment();
MessageFragment mMessageFragment = new MessageFragment();
MeFragment mMeFragment = new MeFragment();
if (savedInstanceState != null) {
@@ -149,7 +148,7 @@
} else {
//姝ｅ父鍚姩鏃惰皟鐢�
fragmentList.add(mHomePageFragment);
- fragmentList.add(mHouseListFragment);
+ fragmentList.add(mHouseAndDeviceFragment);
fragmentList.add(mMessageFragment);
fragmentList.add(mMeFragment);
showFragment();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
similarity index 88%
rename from app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index f94d30b..22a168f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -4,8 +4,11 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -54,7 +57,7 @@
/**
* 鐢电珯鍜岃澶�-鐣岄潰
*/
-public class HouseListFragment extends CustomBaseFragment {
+public class HouseAndDeviceFragment extends CustomBaseFragment {
private FragmentHouseListBinding viewBinding;
private HouseInfoAdapter houseInfoAdapter;
@@ -136,6 +139,38 @@
viewBinding.powerStationLabelParent.setVisibility(View.GONE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);//璁惧鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
loadNextPageDeviceList(true, 1, true);
+ }
+ });
+ //鍏ㄩ儴
+ viewBinding.powerStationAllIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectedStationStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+ }
+ });
+ //鏁呴殰
+ viewBinding.powerStationFaultsIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectedStationStyle(viewBinding.powerStationFaultsIl.parentLl, viewBinding.powerStationFaultsIl.stationTotalTv, viewBinding.powerStationFaultsIl.stationTitleTv, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+ }
+ });
+ //绂荤嚎
+ viewBinding.hpowerStationOfflineIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectedStationStyle(viewBinding.hpowerStationOfflineIl.parentLl, viewBinding.hpowerStationOfflineIl.stationTotalTv, viewBinding.hpowerStationOfflineIl.stationTitleTv, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+ }
+ });
+ //寰呮帴鍏�
+ viewBinding.powerStationConnectedIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ selectedStationStyle(viewBinding.powerStationConnectedIl.parentLl, viewBinding.powerStationConnectedIl.stationTotalTv, viewBinding.powerStationConnectedIl.stationTitleTv, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
@@ -413,6 +448,8 @@
viewBinding.powerStationFaultsIl.stationTitleTv.setText(getString(R.string.my_power_station_malfunction));
viewBinding.hpowerStationOfflineIl.stationTitleTv.setText(getString(R.string.my_power_station_off_line));
viewBinding.powerStationConnectedIl.stationTitleTv.setText(getString(R.string.to_be_added));
+
+ selectedStationStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
//鐢电珯鏍囩
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
@@ -428,6 +465,41 @@
}
+ /**
+ * 鏄剧ず閫変腑鐘舵�佹牱寮�
+ *
+ * @param linearLayout 缁勪欢
+ * @param numberTv 缁勪欢
+ * @param titleTv 缁勪欢
+ * @param isShowSelectedStatus 鏄惁鏄剧ず鐘舵�佹牱寮�
+ */
+ private void selectedStationStyle(LinearLayout linearLayout, TextView numberTv, TextView titleTv, boolean isShowSelectedStatus) {
+ viewBinding.powerStationAllIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.powerStationFaultsIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.hpowerStationOfflineIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.powerStationConnectedIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+
+ viewBinding.powerStationAllIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
+ viewBinding.powerStationAllIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
+
+ viewBinding.powerStationFaultsIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
+ viewBinding.powerStationFaultsIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
+
+ viewBinding.hpowerStationOfflineIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
+ viewBinding.hpowerStationOfflineIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
+
+ viewBinding.powerStationConnectedIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
+ viewBinding.powerStationConnectedIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
+
+
+ if (isShowSelectedStatus) {
+ linearLayout.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.selected_8_38c494));
+ numberTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ titleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ }
+
+ }
+
private void initData() {
if (isClickPowerStationLabel) {
this.houseListBeanIDList = new ArrayList<>();
diff --git a/app/src/main/res/drawable/selected_8_38c494.xml b/app/src/main/res/drawable/selected_8_38c494.xml
new file mode 100644
index 0000000..a28f836
--- /dev/null
+++ b/app/src/main/res/drawable/selected_8_38c494.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="@dimen/dp_8" />
+ <solid android:color="@color/text_38C494" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_station.xml b/app/src/main/res/layout/item_station.xml
index 835724b..09389d1 100644
--- a/app/src/main/res/layout/item_station.xml
+++ b/app/src/main/res/layout/item_station.xml
@@ -6,6 +6,7 @@
android:layout_height="56dp">
<LinearLayout
+ android:id="@+id/parent_ll"
android:layout_width="@dimen/dp_74"
android:layout_height="match_parent"
android:background="@drawable/station_status_no_ffffff"
--
Gitblit v1.8.0