From 7183338c97ffe4c664e1f3af2d1f91d5f548b5d4 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Mon, 5 Jan 2026 19:10:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B9=BF=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=91=E5=AE=9D=E5=B0=8F=E5=BA=97?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 powerbell/build.gradle                        |   2 +-
 powerbell/build.properties                    |   4 +-
 .../src/main/res/layout/activity_settings.xml | 185 ++++++++++--------
 3 files changed, 102 insertions(+), 89 deletions(-)

diff --git a/powerbell/build.gradle b/powerbell/build.gradle
index bf2920f..83b77a0 100644
--- a/powerbell/build.gradle
+++ b/powerbell/build.gradle
@@ -87,7 +87,7 @@ dependencies {
     //api 'cc.winboll.studio:libappbase:15.12.2'
 	
 	// WinBoLL备用库 jitpack.io 地址
-	api 'com.github.ZhanGSKen:AES:aes-v15.12.8'
+	api 'com.github.ZhanGSKen:AES:aes-v15.12.9'
 	api 'com.github.ZhanGSKen:APPBase:appbase-v15.14.1'
 	
     //api fileTree(dir: 'libs', include: ['*.aar'])
diff --git a/powerbell/build.properties b/powerbell/build.properties
index a189291..b7f1957 100644
--- a/powerbell/build.properties
+++ b/powerbell/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Dec 31 20:53:46 HKT 2025
+#Mon Jan 05 11:08:15 GMT 2026
 stageCount=46
 libraryProject=
 baseVersion=15.14
 publishVersion=15.14.45
-buildCount=0
+buildCount=4
 baseBetaVersion=15.14.46
diff --git a/powerbell/src/main/res/layout/activity_settings.xml b/powerbell/src/main/res/layout/activity_settings.xml
index abf5ddc..f4e2546 100644
--- a/powerbell/src/main/res/layout/activity_settings.xml
+++ b/powerbell/src/main/res/layout/activity_settings.xml
@@ -13,118 +13,131 @@
 		android:gravity="center_vertical"
 		style="@style/DefaultAToolbar"/>
 
-	<LinearLayout
-		android:orientation="vertical"
+	<ScrollView
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:gravity="right">
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
 
 		<LinearLayout
 			android:orientation="vertical"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:background="@drawable/bg_frame"
-			android:padding="10dp">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="TTS语音服务设置："/>
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="&lt;仅限在切换充电状态时，发送的TTS语音提醒。用于提醒用户当前的服务设置状态。&gt;"
-				android:textSize="12sp"/>
+			android:layout_height="wrap_content">
 
 			<LinearLayout
 				android:orientation="vertical"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
+				android:layout_height="wrap_content"
+				android:gravity="right">
 
-				<CheckBox
-					android:layout_width="wrap_content"
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:text="用电提醒启用时的TTS贴心服务"
-					android:onClick="onEnableUsePowerTts"
-					android:id="@+id/activitysettingsCheckBox1"/>
+					android:background="@drawable/bg_frame"
+					android:padding="10dp">
 
-				<CheckBox
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="充电提醒启用时的TTS贴心服务"
-					android:onClick="onEnableChargeTts"
-					android:id="@+id/activitysettingsCheckBox2"/>
+					<TextView
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="TTS语音服务设置："/>
+
+					<TextView
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="&lt;仅限在切换充电状态时，发送的TTS语音提醒。用于提醒用户当前的服务设置状态。&gt;"
+						android:textSize="12sp"/>
+
+					<LinearLayout
+						android:orientation="vertical"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content">
+
+						<CheckBox
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="用电提醒启用时的TTS贴心服务"
+							android:onClick="onEnableUsePowerTts"
+							android:id="@+id/activitysettingsCheckBox1"/>
+
+						<CheckBox
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="充电提醒启用时的TTS贴心服务"
+							android:onClick="onEnableChargeTts"
+							android:id="@+id/activitysettingsCheckBox2"/>
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:gravity="right">
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="检查TTS语音悬浮窗权限"
+							android:padding="10dp"
+							android:onClick="onCheckTTSDrawOverlaysPermission"/>
+
+					</LinearLayout>
+
+				</LinearLayout>
 
 			</LinearLayout>
 
 			<LinearLayout
-				android:orientation="horizontal"
+				android:orientation="vertical"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:gravity="right">
+				android:background="@drawable/bg_frame"
+				android:padding="10dp">
 
-				<Button
+				<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="检查TTS语音悬浮窗权限"
-					android:padding="10dp"
-					android:onClick="onCheckTTSDrawOverlaysPermission"/>
+					android:text="米盟广告SDK设置："/>
+
+				<cc.winboll.studio.libaes.views.ADsControlView
+					android:id="@+id/ads_control_view"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="300dp"
+				android:orientation="vertical"
+				android:background="@drawable/bg_frame"
+				android:padding="10dp">
+
+				<LinearLayout
+					android:orientation="horizontal"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<TextView
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="电量图表绘制风格设置："/>
+
+				</LinearLayout>
+
+				<cc.winboll.studio.powerbell.views.BatteryStyleView
+					android:id="@+id/battery_style_view"
+					android:layout_width="match_parent"
+					android:layout_height="1200dp"
+					app:batteryPreviewColor="@color/colorPrimary"
+					app:previewBatteryValue="100"
+					app:defaultSelectedStyle="zebra_style"/>
 
 			</LinearLayout>
 
 		</LinearLayout>
 
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="@drawable/bg_frame"
-		android:padding="10dp">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="米盟广告SDK设置："/>
-
-		<cc.winboll.studio.libaes.views.ADsControlView
-			android:id="@+id/ads_control_view"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:orientation="vertical"
-		android:background="@drawable/bg_frame"
-		android:padding="10dp"
-		android:layout_weight="1.0">
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="电量图表绘制风格设置："/>
-
-		</LinearLayout>
-
-		<cc.winboll.studio.powerbell.views.BatteryStyleView
-			android:id="@+id/battery_style_view"
-			android:layout_width="match_parent"
-			android:layout_height="1200dp"
-			app:batteryPreviewColor="@color/colorPrimary"
-			app:previewBatteryValue="100"
-			app:defaultSelectedStyle="zebra_style"/>
-
-	</LinearLayout>
+	</ScrollView>
 
 </LinearLayout>