From e91dd3b590040b2c961e0d778c265f326228257a Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 09 十月 2024 10:41:23 +0800 Subject: [PATCH] 2024年10月09日10:41:07 --- app/src/main/res/drawable/up.png | 0 app/src/main/res/layout/activity_message_info.xml | 68 ++++++++++++---------- app/src/main/res/layout/dialog_type_title_list.xml | 2 app/src/main/res/drawable/down.png | 0 app/src/main/res/values-zh/strings.xml | 2 app/src/main/res/values/strings.xml | 2 app/src/main/res/layout/fragment_message.xml | 5 - app/src/main/res/drawable/ffffff_18.xml | 3 + app/src/main/res/layout/item_type_title.xml | 49 ++++++--------- app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 1 app/src/main/res/drawable/line_view.xml | 5 + app/src/main/res/layout/activity_message_center_list.xml | 12 ++-- 12 files changed, 78 insertions(+), 71 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 eeae8e0..3525591 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java @@ -101,6 +101,7 @@ public void onBindView(Bundle savedInstanceState) { // setNotificationBarBackgroundColor(CustomColor.blue); setStatusBarTranslucent(); + //鍒濆鍖栫鐗� initFragment(savedInstanceState); //鍒濆鍖� diff --git a/app/src/main/res/drawable/down.png b/app/src/main/res/drawable/down.png index 386328d..ed507f8 100644 --- a/app/src/main/res/drawable/down.png +++ b/app/src/main/res/drawable/down.png Binary files differ diff --git a/app/src/main/res/drawable/ffffff_18.xml b/app/src/main/res/drawable/ffffff_18.xml index ad7828a..62a24c7 100644 --- a/app/src/main/res/drawable/ffffff_18.xml +++ b/app/src/main/res/drawable/ffffff_18.xml @@ -4,4 +4,7 @@ android:topLeftRadius="@dimen/dp_13" android:topRightRadius="@dimen/text_13" /> <solid android:color="@color/text_FFFFFFFF" /> + <stroke + android:width="0.5dp" + android:color="@color/text_FFECECEC" /> </shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/line_view.xml b/app/src/main/res/drawable/line_view.xml new file mode 100644 index 0000000..6c50b94 --- /dev/null +++ b/app/src/main/res/drawable/line_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@color/text_191919" /> + <corners android:radius="79.5dp" /> +</shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/up.png b/app/src/main/res/drawable/up.png index 81dcabf..bc2ea2e 100644 --- a/app/src/main/res/drawable/up.png +++ b/app/src/main/res/drawable/up.png Binary files differ diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml index 60520a6..f2eaa30 100644 --- a/app/src/main/res/layout/activity_message_center_list.xml +++ b/app/src/main/res/layout/activity_message_center_list.xml @@ -49,7 +49,7 @@ android:id="@+id/all_device_title_iv" android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_10" - android:layout_marginStart="@dimen/dp_7" + android:layout_marginStart="@dimen/dp_5" android:background="@drawable/down" app:layout_constraintBottom_toBottomOf="@+id/all_device_title_tv" app:layout_constraintStart_toEndOf="@+id/all_device_title_tv" @@ -80,7 +80,7 @@ android:id="@+id/all_grade_title_iv" android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_10" - android:layout_marginStart="@dimen/dp_7" + android:layout_marginStart="@dimen/dp_5" android:background="@drawable/down" app:layout_constraintBottom_toBottomOf="@+id/all_grade_title_tv" app:layout_constraintStart_toEndOf="@+id/all_grade_title_tv" @@ -99,7 +99,7 @@ android:id="@+id/all_time_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_7" + android:layout_marginEnd="@dimen/dp_5" android:text="@string/alarm_all_time" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" @@ -180,9 +180,9 @@ android:layout_marginTop="@dimen/dp_16" android:gravity="center" android:text="@string/alarm_device" + android:textStyle="bold" android:textColor="@color/text_191919" android:textSize="@dimen/text_16" - android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -192,7 +192,7 @@ android:layout_width="18dp" android:layout_height="3dp" android:layout_marginTop="4.5dp" - android:background="@color/text_191919" + android:background="@drawable/line_view" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_device_title_tv" app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_device_title_tv" /> @@ -225,7 +225,7 @@ android:layout_width="@dimen/dp_18" android:layout_height="3dp" android:layout_marginTop="4.5dp" - android:background="@color/text_191919" + android:background="@drawable/line_view" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_record_title_tv" app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_record_title_tv" /> diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml index d438f23..1af0794 100644 --- a/app/src/main/res/layout/activity_message_info.xml +++ b/app/src/main/res/layout/activity_message_info.xml @@ -62,7 +62,7 @@ <View android:layout_width="match_parent" - android:layout_height="@dimen/dp_31" /> + android:layout_height="@dimen/dp_33" /> <include android:id="@+id/message_info_alarm_device_in" @@ -70,7 +70,7 @@ <View android:layout_width="match_parent" - android:layout_height="@dimen/dp_31" /> + android:layout_height="@dimen/dp_33" /> <!--浜у搧璇寸‖浠舵病鍋� 闅愯棌鎺� 2024骞�05鏈�28鏃�13:46:53--> <include android:id="@+id/message_info_alarm_range_in" @@ -79,7 +79,7 @@ <View android:layout_width="match_parent" - android:layout_height="@dimen/dp_31" + android:layout_height="@dimen/dp_33" android:visibility="gone" /> <include @@ -88,7 +88,7 @@ <View android:layout_width="match_parent" - android:layout_height="@dimen/dp_31" /> + android:layout_height="@dimen/dp_33" /> <include android:id="@+id/message_info_alarm_time_in" @@ -96,41 +96,49 @@ <View android:layout_width="match_parent" - android:layout_height="@dimen/dp_31" /> + android:layout_height="@dimen/dp_18" /> </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout> - - <TextView - android:id="@+id/message_info_back_tv" - android:layout_width="157.5dp" - android:layout_height="@dimen/dp_52" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginBottom="54.5dp" - android:background="@drawable/fillet_line_00000000" + <LinearLayout + android:layout_width="match_parent" + android:layout_height="82dp" android:gravity="center" - android:text="@string/message_alarm_details_back" - android:textColor="@color/text_FF245EC3" - android:textSize="@dimen/text_18" + android:orientation="horizontal" + android:paddingStart="@dimen/dp_20" + android:paddingEnd="@dimen/dp_20" + android:background="@color/ffffff" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> - <TextView - android:id="@+id/message_info_solve_tv" - android:layout_width="157.5dp" - android:layout_height="@dimen/dp_52" - android:layout_marginEnd="@dimen/dp_20" - android:layout_marginBottom="54.5dp" - android:background="@drawable/checked" - android:gravity="center" - android:text="@string/message_alarm_details_resolved" - android:textColor="@color/text_FFFFFFFF" - android:textSize="@dimen/text_18" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + <TextView + android:id="@+id/message_info_back_tv" + android:layout_width="157.5dp" + android:layout_height="@dimen/dp_52" + android:background="@drawable/fillet_line_00000000" + android:gravity="center" + android:text="@string/message_alarm_details_back" + android:textColor="@color/text_FF245EC3" + android:textSize="@dimen/text_18" /> + + <View + android:layout_width="@dimen/dp_20" + android:layout_height="match_parent" /> + + <TextView + android:id="@+id/message_info_solve_tv" + android:layout_width="157.5dp" + android:layout_height="@dimen/dp_52" + android:background="@drawable/checked" + android:gravity="center" + android:text="@string/message_alarm_details_resolved" + android:textColor="@color/text_FFFFFFFF" + android:textSize="@dimen/text_18" /> + </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_type_title_list.xml b/app/src/main/res/layout/dialog_type_title_list.xml index 46cb140..6af777d 100644 --- a/app/src/main/res/layout/dialog_type_title_list.xml +++ b/app/src/main/res/layout/dialog_type_title_list.xml @@ -4,7 +4,7 @@ android:id="@+id/type_parent_cl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/loading_ffffffff_4"> + android:background="@drawable/ffffff_13"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/type_list_rl" diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml index 4e16aa1..b0592d0 100644 --- a/app/src/main/res/layout/fragment_message.xml +++ b/app/src/main/res/layout/fragment_message.xml @@ -149,7 +149,7 @@ android:id="@+id/all_device_title_iv" android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_10" - android:layout_marginStart="@dimen/dp_7" + android:layout_marginStart="@dimen/dp_0" android:background="@drawable/down" /> </LinearLayout> @@ -185,7 +185,7 @@ android:id="@+id/all_grade_title_iv" android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_10" - android:layout_marginStart="@dimen/dp_7" + android:layout_marginStart="@dimen/dp_0" android:background="@drawable/down" /> </LinearLayout> @@ -208,7 +208,6 @@ android:id="@+id/all_time_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_7" android:text="@string/alarm_all_time" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" /> diff --git a/app/src/main/res/layout/item_type_title.xml b/app/src/main/res/layout/item_type_title.xml index c68cd5a..81f5338 100644 --- a/app/src/main/res/layout/item_type_title.xml +++ b/app/src/main/res/layout/item_type_title.xml @@ -3,41 +3,32 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="54dp" - android:layout_marginStart="@dimen/dp_32" - android:layout_marginEnd="@dimen/dp_32"> + android:layout_marginStart="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_16"> - <androidx.constraintlayout.widget.ConstraintLayout + <TextView + android:id="@+id/type_title_tv" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/dp_16" - android:layout_marginEnd="@dimen/dp_16" + android:layout_height="@dimen/dp_20" + android:gravity="center" + android:textColor="@color/text_E6000000" + android:textSize="@dimen/text_14" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="parent"> + app:layout_constraintTop_toTopOf="parent" - <TextView - android:id="@+id/type_title_tv" - android:layout_width="match_parent" - android:layout_height="@dimen/dp_20" - android:gravity="center" - android:textColor="@color/text_E6000000" - android:textSize="@dimen/text_14" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + /> - /> + <View + android:id="@+id/type_line_v" + android:layout_width="match_parent" + android:layout_height="0.5dp" + android:layout_marginBottom="0.5dp" + android:background="@color/text_EDEFF2" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="parent" /> - <View - android:id="@+id/type_line_v" - android:layout_width="match_parent" - android:layout_height="0.5dp" - android:layout_marginBottom="0.5dp" - android:background="@color/text_EDEFF2" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintEnd_toStartOf="parent" /> - </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index c8803be..0379d21 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,6 +1,6 @@ <resources> <!-- <string name="app_name">PhotovoltaicDebug</string>--> - <string name="app_name">Xenterra Solar</string> + <string name="app_name">鏂扮壒閿愯兘</string> <string name="title_activity_home_login">HomeLoginActivity</string> <!-- Strings used for fragments for navigation --> <string name="first_fragment_label">First Fragment</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05fd3b8..f1e977f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ <resources> - <string name="app_name">Xenterra Solar</string> + <string name="app_name">鏂扮壒閿愯兘</string> <string name="title_activity_home_login">HomeLoginActivity</string> <!-- Strings used for fragments for navigation --> <string name="first_fragment_label">First Fragment</string> -- Gitblit v1.8.0