From 4e65f5254a4e74dbbe691e5edba2775d6d66c0b0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 30 四月 2024 14:41:39 +0800
Subject: [PATCH] 2024年04月30日14:41:34
---
app/src/main/res/drawable/ascending_descending_order_select.xml | 6
app/src/main/res/layout/fragment_house_list.xml | 819 ++++++++++++++++++++++++++++-----------------------
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 6
app/src/main/res/values/styles.xml | 7
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 5
app/src/main/res/layout/activity_my_power_station.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 69 ++++
7 files changed, 536 insertions(+), 377 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index d1a4ce8..0442ecb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -15,6 +15,7 @@
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.utils.GlideUtils;
@@ -53,7 +54,7 @@
HouseIdBean houseIdBean = this.mList.get(position);
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
//瑁呮満瀹归噺
- String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + houseIdBean.getInstalledCapacity() + "kW";
+ String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + houseIdBean.getInstalledCapacity() + HdlDeviceLogic.kW;
holder.capacityTv.setText(capacity);
String kw = "0";
try {
@@ -69,7 +70,7 @@
kw = "0.0";
}
//鍙戠數鍔熺巼
- String power = mContext.getString(R.string.power_station_generated_power) + kw + "kW";
+ String power = mContext.getString(R.string.power_station_generated_power) + kw + HdlDeviceLogic.kW;
holder.powerTv.setText(power);
holder.item_parent_rl.setTag(position);
setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index 4f54f95..a20daaa 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.ui.bean;
+import android.text.TextUtils;
+
import com.hdl.photovoltaic.R;
import java.io.Serializable;
@@ -76,7 +78,7 @@
}
public String getInstalledCapacity() {
- return installedCapacity == null ? "0" : installedCapacity;
+ return TextUtils.isEmpty(installedCapacity) ? "0" : installedCapacity;
}
public void setInstalledCapacity(String installedCapacity) {
@@ -84,7 +86,7 @@
}
public String getPower() {
- return power == null ? "0" : power;
+ return TextUtils.isEmpty(power) ? "0" : power;
}
public void setPower(String power) {
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 a8f2ed3..ae48a10 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
@@ -70,6 +70,30 @@
private void initEvent() {
+ //鐢电珯鏍囩
+ viewBinding.powerStationLabel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style);
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style);
+ viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
+ viewBinding.deviceLabelParent.setVisibility(View.GONE);//璁惧鏍囩闅愯棌
+ }
+ });
+ //璁惧鏍囩
+ viewBinding.deviceLabel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text20Style);
+ 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.addIv.setOnClickListener(new View.OnClickListener() {
@@ -183,7 +207,6 @@
}
});
-
//缂栬緫鐢电珯鎸夐挳
viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -191,9 +214,53 @@
startActivity(HouseListEditActivity.class);
}
});
+ //鐢电珯鍚嶇О绛涢��
+ viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationNameRl.setSelected(!v.isSelected());
+ viewBinding.stationNameIv.setSelected(viewBinding.stationNameRl.isSelected());
+ }
+ });
+ //鐢电珯鍚嶇О绛涢��
+ viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationNameRl.setSelected(!v.isSelected());
+ viewBinding.stationNameIv.setSelected(viewBinding.stationNameRl.isSelected());
+ }
+ });
+ //鍙戠數鍔熺巼绛涢��
+ viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationPowerRl.setSelected(!v.isSelected());
+ viewBinding.stationPowerIv.setSelected(viewBinding.stationPowerRl.isSelected());
+ }
+ });
+ //褰撴棩鍙戠數閲忕瓫閫�
+ viewBinding.stationDayRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationDayRl.setSelected(!v.isSelected());
+ viewBinding.stationDayIv.setSelected(viewBinding.stationDayRl.isSelected());
+ }
+ });
+ //褰撴湀鍙戠數閲忕瓫閫�
+ viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationMonthRl.setSelected(!v.isSelected());
+ viewBinding.stationMonthIv.setSelected(viewBinding.stationMonthRl.isSelected());
+ }
+ });
+
}
private void initView() {
+ viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
+ viewBinding.deviceLabelParent.setVisibility(View.GONE);
+
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
diff --git a/app/src/main/res/drawable/ascending_descending_order_select.xml b/app/src/main/res/drawable/ascending_descending_order_select.xml
new file mode 100644
index 0000000..8b259f2
--- /dev/null
+++ b/app/src/main/res/drawable/ascending_descending_order_select.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ascending_sort" android:state_selected="true" />
+ <item android:drawable="@drawable/descending_order" android:state_selected="false" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_my_power_station.xml b/app/src/main/res/layout/activity_my_power_station.xml
index c4ff53b..f359a9d 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bj"
+
tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity">
<!--棣栭〉-Fragment-->
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index b3850b2..9ecfa9c 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -5,95 +5,451 @@
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
android:layout_height="match_parent">
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/power_station_label_top_cl"
+ <!--澶撮儴鏍囩-->
+ <RelativeLayout
+ android:id="@+id/title_cl"
android:layout_width="match_parent"
- android:layout_height="205dp"
+ android:layout_height="@dimen/dp_31"
+ android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_44"
+ android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
- <RelativeLayout
+ <TextView
+ android:id="@+id/power_station_label"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:gravity="center_vertical"
+ android:text="Power Station"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_20"
+ android:textStyle="bold" />
- android:id="@+id/title_cl"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/device_label"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_21"
+ android:layout_marginEnd="@dimen/dp_4"
+ android:layout_toStartOf="@+id/edit_iv"
+ android:layout_toEndOf="@+id/power_station_label"
+ android:gravity="start|center_vertical"
+ android:text="Equipment"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_16"
+
+ />
+
+ <ImageView
+ android:id="@+id/edit_iv"
+ android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_31"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ android:layout_marginEnd="@dimen/dp_13"
+ android:layout_toStartOf="@+id/add_iv"
+ android:src="@drawable/edit"
- <TextView
- android:id="@+id/power_station_label"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_centerVertical="true"
- android:gravity="center_vertical"
- android:text="Power Station"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_20"
- android:textStyle="bold" />
+ />
- <TextView
- android:id="@+id/device_label"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_4"
- android:layout_toStartOf="@+id/edit_iv"
- android:layout_toEndOf="@+id/power_station_label"
- android:gravity="start|center_vertical"
- android:text="Equipment"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_16"
-
- />
-
- <ImageView
- android:id="@+id/edit_iv"
- android:layout_width="@dimen/dp_31"
- android:layout_height="@dimen/dp_31"
- android:layout_marginEnd="@dimen/dp_13"
- android:layout_toStartOf="@+id/add_iv"
- android:src="@drawable/edit"
-
- />
-
- <ImageView
- android:id="@+id/add_iv"
- android:layout_width="@dimen/dp_31"
- android:layout_height="@dimen/dp_31"
- android:layout_alignParentEnd="true"
- android:src="@drawable/add" />
+ <ImageView
+ android:id="@+id/add_iv"
+ android:layout_width="@dimen/dp_31"
+ android:layout_height="@dimen/dp_31"
+ android:layout_alignParentEnd="true"
+ android:src="@drawable/add" />
- </RelativeLayout>
- <!--鎼滅储-->
- <RelativeLayout
- android:id="@+id/search_cl"
+ </RelativeLayout>
+ <!--鐢电珯鏍囩-->
+ <LinearLayout
+ android:id="@+id/power_station_label_parent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/title_cl">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/power_station_label_top_cl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_35"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16"
-
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/title_cl">
-
+ android:layout_height="174dp"
+ android:layout_marginTop="@dimen/dp_21">
+ <!--鎼滅储-->
<RelativeLayout
+ android:id="@+id/power_station_search_cl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginEnd="@dimen/dp_17"
- android:layout_toStartOf="@+id/default_condition_iv"
- android:background="@drawable/search_bj_edeff2">
+ android:layout_height="@dimen/dp_35"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="@dimen/dp_17"
+ android:layout_toStartOf="@+id/power_station_default_condition_iv"
+ android:background="@drawable/search_bj_edeff2">
+
+ <ImageView
+ android:id="@+id/power_station_search_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_13"
+ android:src="@drawable/search_path" />
+
+ <TextView
+ android:id="@+id/power_station_search_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_11"
+ android:layout_toEndOf="@+id/power_station_search_iv"
+ android:text="Search the power station"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_14" />
+ </RelativeLayout>
<ImageView
- android:id="@+id/search_iv"
+ android:id="@+id/power_station_default_condition_iv"
+ android:layout_width="@dimen/dp_31"
+ android:layout_height="@dimen/dp_31"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:src="@drawable/default_condition" />
+
+
+ </RelativeLayout>
+ <!--鏉′欢绛涢��-->
+ <LinearLayout
+ android:id="@+id/screening_condition_ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_56"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
+
+ <LinearLayout
+ android:id="@+id/screening_condition_1"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="@dimen/dp_56"
+ android:layout_gravity="center_vertical"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/screening_condition_number1_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginTop="7dp"
+ android:gravity="center"
+ android:text="99"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_21"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/screening_condition_text1_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_17"
+ android:layout_marginTop="1dp"
+ android:gravity="center"
+ android:text="state"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_14" />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="match_parent" />
+
+ <LinearLayout
+ android:id="@+id/screening_condition_2"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="@dimen/dp_56"
+ android:layout_gravity="center_vertical"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/screening_condition_number2_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginTop="7dp"
+ android:gravity="center"
+ android:text="99"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_21"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/screening_condition_text2_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_17"
+ android:layout_marginTop="1dp"
+ android:gravity="center"
+ android:text="state"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_14" />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="match_parent" />
+
+ <LinearLayout
+ android:id="@+id/screening_condition_3"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="@dimen/dp_56"
+ android:layout_gravity="center_vertical"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/screening_condition_number3_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginTop="7dp"
+ android:gravity="center"
+ android:text="99"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_21"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/screening_condition_text3_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_17"
+ android:layout_marginTop="1dp"
+ android:gravity="center"
+ android:text="state"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_14" />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="match_parent" />
+
+ <LinearLayout
+ android:id="@+id/screening_condition_4"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="@dimen/dp_56"
+ android:layout_gravity="center_vertical"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/screening_condition_number4_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginTop="7dp"
+ android:gravity="center"
+ android:text="99"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_21"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/screening_condition_text4_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_17"
+ android:layout_marginTop="1dp"
+ android:gravity="center"
+ android:text="state"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_14" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+ <!--鍗囧簭闄嶅簭鍔熻兘-->
+ <LinearLayout
+ android:id="@+id/ascending_order_descending_order_parent_ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_17"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/screening_condition_ll">
+
+ <RelativeLayout
+ android:id="@+id/station_name_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_name_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ android:text="@string/station_name"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_12"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:id="@+id/station_name_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_name_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+ </RelativeLayout>
+
+
+ <RelativeLayout
+ android:id="@+id/station_power_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_power_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ android:text="@string/generated_power"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_12"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:id="@+id/station_power_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_power_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+ </RelativeLayout>
+
+
+ <RelativeLayout
+ android:id="@+id/station_day_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_day_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ android:text="@string/day_power_generation"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_12"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:id="@+id/station_day_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_day_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+ </RelativeLayout>
+
+
+ <RelativeLayout
+ android:id="@+id/station_month_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_month_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ android:text="@string/month_power_generation"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_12"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:id="@+id/station_month_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_month_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+ </RelativeLayout>
+
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/fragment_house_srl"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/fragment_house_srl_list_rc"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_16" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+ </LinearLayout>
+
+ <!--璁惧鏍囩-->
+ <LinearLayout
+ android:id="@+id/device_label_parent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/title_cl">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/device_label_top_cl"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_marginTop="@dimen/dp_21">
+ <!--鎼滅储-->
+ <RelativeLayout
+ android:id="@+id/device_search_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_35"
+ android:layout_marginStart="@dimen/dp_13"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:background="@drawable/search_bj_edeff2"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/device_search_iv"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_alignParentStart="true"
@@ -102,318 +458,39 @@
android:src="@drawable/search_path" />
<TextView
- android:id="@+id/search_tv"
+ android:id="@+id/device_search_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
- android:layout_toEndOf="@+id/search_iv"
+ android:layout_toEndOf="@+id/device_search_iv"
android:text="Search the power station"
android:textColor="@color/text_40000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
- <ImageView
- android:id="@+id/default_condition_iv"
- android:layout_width="@dimen/dp_31"
- android:layout_height="@dimen/dp_31"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:src="@drawable/default_condition" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
- </RelativeLayout>
- <!--鏉′欢绛涢��-->
- <LinearLayout
- android:id="@+id/screening_condition_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_56"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_16"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/search_cl">
-
- <LinearLayout
- android:id="@+id/screening_condition_1"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number1_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text1_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_2"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number2_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text2_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_3"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number3_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text3_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_4"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number4_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text4_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- </LinearLayout>
- <!--鍗囧簭闄嶅簭鍔熻兘-->
- <LinearLayout
- android:id="@+id/ascending_order_descending_order_parent_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_12"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/screening_condition_ll">
-
- <RelativeLayout
- android:id="@+id/station_name_rl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/station_name_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:text="@string/station_name"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
-
- <ImageView
- android:id="@+id/station_name_iv"
- android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:layout_toEndOf="@+id/station_name_tv"
- android:src="@drawable/ascending_sort" />
- </RelativeLayout>
-
-
- <RelativeLayout
- android:id="@+id/station_power_rl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/station_power_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:text="@string/generated_power"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
-
- <ImageView
- android:id="@+id/station_power_iv"
- android:layout_width="wrap_content"
- android:layout_height="15dp"
- android:layout_marginStart="-8dp"
- android:layout_toEndOf="@+id/station_power_tv"
- android:src="@drawable/ascending_sort" />
- </RelativeLayout>
-
-
- <RelativeLayout
- android:id="@+id/station_day_rl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/station_day_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:text="@string/day_power_generation"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
-
- <ImageView
- android:id="@+id/station_day_iv"
- android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:layout_toEndOf="@+id/station_day_tv"
- android:src="@drawable/ascending_sort" />
- </RelativeLayout>
-
-
- <RelativeLayout
- android:id="@+id/station_month_rl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/station_month_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:text="@string/month_power_generation"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
-
- <ImageView
- android:id="@+id/station_month_iv"
- android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:layout_toEndOf="@+id/station_month_tv"
- android:src="@drawable/ascending_sort" />
- </RelativeLayout>
-
-
- </LinearLayout>
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
- android:id="@+id/fragment_house_srl"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
-
- app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/fragment_house_srl_list_rc"
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/fragment_device_srl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/fragment_device_srl_list_rc"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_16" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+ </LinearLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b3160fa..4e9d4d2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,7 +13,7 @@
<item name="android:textSize">@dimen/text_20</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/text_90000000</item>
- <item name="android:fontFamily"></item>
+<!-- <item name="android:fontFamily"></item>-->
</style>
<!-- 鑷畾涔夊瓧浣撴牱寮� 鍐呭涓�绾ф爣棰�-->
@@ -28,6 +28,11 @@
<item name="android:textSize">@dimen/text_14</item>
<item name="android:textColor">@color/text_40000000</item>
</style>
+ <!-- 鑷畾涔夊瓧浣撴牱寮� -->
+ <style name="Text16Style">
+ <item name="android:textSize">@dimen/text_16</item>
+ <item name="android:textColor">@color/text_40000000</item>
+ </style>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0