From 2289b3b709eeb47599b4fbef3cfd2c345f436cac Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 27 十一月 2024 21:10:18 +0800 Subject: [PATCH] 2024年11月27日21:10:17 --- app/src/main/res/layout/fragment_me.xml | 12 ++++++------ app/src/main/res/drawable/device_debug.png | 0 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 5 +++-- app/src/main/res/drawable/set.png | 0 app/src/main/res/drawable/asregards.png | 0 app/src/main/res/drawable/next.png | 0 app/src/main/res/layout/fragment_me_line.xml | 6 +++--- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java index 4add5e0..8a2b6c9 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java @@ -224,7 +224,6 @@ }); - } /** @@ -234,14 +233,16 @@ //璁惧璋冭瘯 viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.device_debug); viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineTitleIv.setText(R.string.device_debugging); + viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineV.setVisibility(View.VISIBLE); //鍛樺伐绠$悊 viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management); viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management); viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);//鍏堥殣钘�,璇诲彇鍒版湁闄愭潈鍦ㄦ樉绀� -// viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE); + viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE); //璁惧 viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set); viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set); + viewBinding.fragmentMeLineSetIl.fragmentMeLineV.setVisibility(View.VISIBLE); //鍏充簬 viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards); viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard); diff --git a/app/src/main/res/drawable/asregards.png b/app/src/main/res/drawable/asregards.png index 48d4707..64ad1b5 100644 --- a/app/src/main/res/drawable/asregards.png +++ b/app/src/main/res/drawable/asregards.png Binary files differ diff --git a/app/src/main/res/drawable/device_debug.png b/app/src/main/res/drawable/device_debug.png index 192f487..02081ff 100644 --- a/app/src/main/res/drawable/device_debug.png +++ b/app/src/main/res/drawable/device_debug.png Binary files differ diff --git a/app/src/main/res/drawable/next.png b/app/src/main/res/drawable/next.png index 8f6aec2..c517cac 100644 --- a/app/src/main/res/drawable/next.png +++ b/app/src/main/res/drawable/next.png Binary files differ diff --git a/app/src/main/res/drawable/set.png b/app/src/main/res/drawable/set.png index c3b1967..24faaf2 100644 --- a/app/src/main/res/drawable/set.png +++ b/app/src/main/res/drawable/set.png Binary files differ diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 5e4661d..83a2a84 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="@string/me" - android:textColor="@color/text_030D1C" + android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_18" /> @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="22dp" android:layout_marginTop="@dimen/dp_16" - android:textColor="@color/text_E6000000" + android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_18" app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv" app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv" @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="17dp" android:layout_marginTop="@dimen/dp_11" - android:textColor="@color/text_66000000" + android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv" app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv" @@ -103,10 +103,10 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_25" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bj_13fffffff" + android:background="@drawable/search_bj_ff333738" android:orientation="vertical" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_me_line.xml b/app/src/main/res/layout/fragment_me_line.xml index 550926d..082face 100644 --- a/app/src/main/res/layout/fragment_me_line.xml +++ b/app/src/main/res/layout/fragment_me_line.xml @@ -21,8 +21,8 @@ android:layout_height="@dimen/dp_23" android:layout_marginStart="@dimen/dp_7" android:text="@string/me_set" - android:textColor="@color/text_E6000000" - android:textSize="@dimen/text_16" + android:textColor="@color/text_E6FFFFFF" + android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv" app:layout_constraintStart_toEndOf="@+id/fragment_me_line_left_icon_iv" app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" /> @@ -49,7 +49,7 @@ android:id="@+id/fragment_me_line_v" android:layout_width="0dp" android:layout_height="0.5dp" - android:background="@color/text_E1E1E1" + android:background="@color/text_1AFFFFFF" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" -- Gitblit v1.8.0