From 82023c98e5c30d36966b85c10c43a6cb11f67e2c Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 14 一月 2026 11:16:22 +0800
Subject: [PATCH] 修复某些情况下选择蓝牙错乱问题
---
app/src/main/res/layout/activity_parameter_setting.xml | 97 +++++++++++++++++++++++++-----------------------
1 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/app/src/main/res/layout/activity_parameter_setting.xml b/app/src/main/res/layout/activity_parameter_setting.xml
index 2345e2e..1343871 100644
--- a/app/src/main/res/layout/activity_parameter_setting.xml
+++ b/app/src/main/res/layout/activity_parameter_setting.xml
@@ -39,7 +39,7 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:padding="16dp"
- android:background="#FAFAFA">
+ android:background="@color/white">
<View
android:layout_width="4dp"
@@ -103,7 +103,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鑷鎴愬姛"
+ android:text="鎴愬姛"
android:textSize="12sp"
android:textColor="#666666"
android:layout_marginEnd="16dp"/>
@@ -116,7 +116,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鑷澶辫触"
+ android:text="澶辫触"
android:textSize="12sp"
android:textColor="#666666"
android:layout_marginEnd="16dp"/>
@@ -147,11 +147,9 @@
android:layout_height="48dp"
android:layout_weight="1"
android:text="缁撴潫鑷"
- android:textColor="@color/base_color"
+ android:textColor="@color/white"
android:textSize="14sp"
- app:qmui_backgroundColor="@color/white"
- app:qmui_borderColor="@color/base_color"
- app:qmui_borderWidth="1dp"
+ app:qmui_backgroundColor="@color/base_color"
app:qmui_radius="8dp"
android:layout_marginLeft="10dp"/>
</LinearLayout>
@@ -189,15 +187,29 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
- <Spinner
- android:id="@+id/sp_threshold_mode"
+ <FrameLayout
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1.5"
- android:entries="@array/threshold_modes"
- android:background="@drawable/bg_input_field"
- android:paddingStart="10dp"
- android:layout_marginRight="10dp" />
+ android:layout_marginRight="10dp">
+
+ <Spinner
+ android:id="@+id/sp_threshold_mode"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:entries="@array/threshold_modes"
+ android:background="@drawable/bg_input_field"
+ android:paddingStart="10dp"
+ android:paddingEnd="32dp" />
+
+ <ImageView
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:src="@drawable/ic_arrow_drop_down"
+ android:layout_gravity="center_vertical|end"
+ android:layout_marginEnd="8dp"
+ android:importantForAccessibility="no"/>
+ </FrameLayout>
<EditText
android:id="@+id/et_threshold_value"
@@ -218,18 +230,6 @@
android:orientation="horizontal">
<com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
- android:id="@+id/btn_threshold_read"
- android:layout_width="0dp"
- android:layout_height="45dp"
- android:layout_weight="1"
- android:text="璇诲彇"
- android:textColor="@color/white"
- android:textSize="14sp"
- app:qmui_backgroundColor="@color/base_color"
- app:qmui_radius="8dp"
- android:layout_marginRight="10dp"/>
-
- <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
android:id="@+id/btn_threshold_write"
android:layout_width="0dp"
android:layout_height="45dp"
@@ -237,7 +237,7 @@
android:text="鍐欏叆"
android:textColor="@color/white"
android:textSize="14sp"
- app:qmui_backgroundColor="@color/base_color_s"
+ app:qmui_backgroundColor="@color/base_color"
app:qmui_radius="8dp"/>
</LinearLayout>
</LinearLayout>
@@ -269,15 +269,29 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
- <Spinner
- android:id="@+id/sp_sensitivity_mode"
+ <FrameLayout
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1.5"
- android:entries="@array/sensitivity_modes"
- android:background="@drawable/bg_input_field"
- android:paddingStart="10dp"
- android:layout_marginRight="10dp" />
+ android:layout_marginRight="10dp">
+
+ <Spinner
+ android:id="@+id/sp_sensitivity_mode"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:entries="@array/sensitivity_modes"
+ android:background="@drawable/bg_input_field"
+ android:paddingStart="10dp"
+ android:paddingEnd="32dp" />
+
+ <ImageView
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:src="@drawable/ic_arrow_drop_down"
+ android:layout_gravity="center_vertical|end"
+ android:layout_marginEnd="8dp"
+ android:importantForAccessibility="no"/>
+ </FrameLayout>
<EditText
android:id="@+id/et_sensitivity_value"
@@ -298,18 +312,6 @@
android:orientation="horizontal">
<com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
- android:id="@+id/btn_sensitivity_read"
- android:layout_width="0dp"
- android:layout_height="45dp"
- android:layout_weight="1"
- android:text="璇诲彇"
- android:textColor="@color/white"
- android:textSize="14sp"
- app:qmui_backgroundColor="@color/base_color"
- app:qmui_radius="8dp"
- android:layout_marginRight="10dp"/>
-
- <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
android:id="@+id/btn_sensitivity_write"
android:layout_width="0dp"
android:layout_height="45dp"
@@ -317,7 +319,7 @@
android:text="鍐欏叆"
android:textColor="@color/white"
android:textSize="14sp"
- app:qmui_backgroundColor="@color/base_color_s"
+ app:qmui_backgroundColor="@color/base_color"
app:qmui_radius="8dp"/>
</LinearLayout>
</LinearLayout>
@@ -356,7 +358,7 @@
android:text="涓绘澘澶嶄綅"
android:textColor="@color/white"
android:textSize="14sp"
- app:qmui_backgroundColor="@color/orange"
+ app:qmui_backgroundColor="@color/base_color"
app:qmui_radius="8dp"
android:layout_marginRight="10dp"/>
@@ -368,7 +370,7 @@
android:text="浼犳劅澶嶄綅"
android:textColor="@color/white"
android:textSize="14sp"
- app:qmui_backgroundColor="@color/orange"
+ app:qmui_backgroundColor="@color/base_color"
app:qmui_radius="8dp"
android:layout_marginLeft="10dp"/>
</LinearLayout>
@@ -377,6 +379,7 @@
<!-- Log Display -->
<androidx.cardview.widget.CardView
+ android:id="@+id/cv_log"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="12dp"
--
Gitblit v1.9.3