From c7ac050c321385eac1e5938575c99304e68317c2 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期二, 27 一月 2026 11:28:49 +0800
Subject: [PATCH] 1.xiu改ui
---
app/src/main/java/com/safeluck/floatwindow/MainActivity.kt | 202 ++++++++++++++++++++++++++++----------------------
1 files changed, 112 insertions(+), 90 deletions(-)
diff --git a/app/src/main/java/com/safeluck/floatwindow/MainActivity.kt b/app/src/main/java/com/safeluck/floatwindow/MainActivity.kt
index b4c07f6..5d7335d 100644
--- a/app/src/main/java/com/safeluck/floatwindow/MainActivity.kt
+++ b/app/src/main/java/com/safeluck/floatwindow/MainActivity.kt
@@ -11,6 +11,8 @@
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.*
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.*
@@ -241,101 +243,121 @@
onStopUsbPush: () -> Unit
) {
Column(
- modifier = Modifier
- .fillMaxSize()
- .padding(16.dp),
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(12.dp)
+ modifier = Modifier.fillMaxSize()
) {
- Text(
- text = "FloatingService 鎺у埗",
- style = MaterialTheme.typography.headlineMedium,
- modifier = Modifier.padding(bottom = 8.dp)
- )
-
- Text(
- text = if (isServiceBound) "鏈嶅姟鐘舵��: 宸茬粦瀹�" else "鏈嶅姟鐘舵��: 鏈粦瀹�",
- style = MaterialTheme.typography.bodyMedium,
- color = if (isServiceBound) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
- modifier = Modifier.padding(bottom = 16.dp)
- )
-
- // 鎸夐挳 1: 缁戝畾鏈嶅姟
- Button(
- onClick = onBindService,
- modifier = Modifier.fillMaxWidth(),
- enabled = !isServiceBound
+ // 鍥哄畾椤堕儴锛氭爣棰樺拰鐘舵��
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(16.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
) {
- Text("1. 缁戝畾 FloatingService")
+ Text(
+ text = "FloatingService 鎺у埗",
+ style = MaterialTheme.typography.headlineMedium,
+ modifier = Modifier.padding(bottom = 8.dp)
+ )
+
+ Text(
+ text = if (isServiceBound) "鏈嶅姟鐘舵��: 宸茬粦瀹�" else "鏈嶅姟鐘舵��: 鏈粦瀹�",
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isServiceBound) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
+ modifier = Modifier.padding(bottom = 16.dp)
+ )
}
- // 鎸夐挳 2: 瑙ｇ粦鏈嶅姟
- Button(
- onClick = onUnbindService,
- modifier = Modifier.fillMaxWidth(),
- enabled = isServiceBound
+ Divider()
+
+ // 鍙粴鍔ㄧ殑鎸夐挳鍒楄〃
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .verticalScroll(rememberScrollState())
+ .padding(horizontal = 16.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(12.dp)
) {
- Text("2. 瑙ｇ粦 FloatingService")
- }
-
- Divider(modifier = Modifier.padding(vertical = 8.dp))
-
- // 鎸夐挳 3: 寮�濮� Android 鐩告満褰曞儚
- Button(
- onClick = onStartAndroidRecord,
- modifier = Modifier.fillMaxWidth(),
- enabled = isServiceBound
- ) {
- Text("3. 寮�濮� Android 鐩告満褰曞儚")
- }
-
- // 鎸夐挳 4: 缁撴潫 Android 鐩告満褰曞儚
- Button(
- onClick = onStopAndroidRecord,
- modifier = Modifier.fillMaxWidth(),
- enabled = isServiceBound
- ) {
- Text("4. 缁撴潫 Android 鐩告満褰曞儚")
- }
-
- Divider(modifier = Modifier.padding(vertical = 8.dp))
-
- // 鎸夐挳 5: 寮�濮� USB 鐩告満褰曞儚
- Button(
- onClick = onStartUsbRecord,
- modifier = Modifier.fillMaxWidth(),
- enabled = isServiceBound
- ) {
- Text("5. 寮�濮� USB 鐩告満褰曞儚")
- }
-
- // 鎸夐挳 6: 缁撴潫 USB 鐩告満褰曞儚
- Button(
- onClick = onStopUsbRecord,
- modifier = Modifier.fillMaxWidth(),
- enabled = isServiceBound
- ) {
- Text("6. 缁撴潫 USB 鐩告満褰曞儚")
- }
-
- Divider(modifier = Modifier.padding(vertical = 8.dp))
-
- // 鎸夐挳 7: 寮�濮� USB 鎺ㄦ祦
- Button(
- onClick = onStartUsbPush,
- modifier = Modifier.fillMaxWidth(),
- enabled = isServiceBound
- ) {
- Text("7. 寮�濮� USB 鎺ㄦ祦")
- }
-
- // 鎸夐挳 8: 缁撴潫 USB 鎺ㄦ祦
- Button(
- onClick = onStopUsbPush,
- modifier = Modifier.fillMaxWidth(),
- enabled = isServiceBound
- ) {
- Text("8. 缁撴潫 USB 鎺ㄦ祦")
+ Spacer(modifier = Modifier.height(12.dp))
+
+ // 鎸夐挳 1: 缁戝畾鏈嶅姟
+ Button(
+ onClick = onBindService,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = !isServiceBound
+ ) {
+ Text("1. 缁戝畾 FloatingService")
+ }
+
+ // 鎸夐挳 2: 瑙ｇ粦鏈嶅姟
+ Button(
+ onClick = onUnbindService,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = isServiceBound
+ ) {
+ Text("2. 瑙ｇ粦 FloatingService")
+ }
+
+ Divider(modifier = Modifier.padding(vertical = 8.dp))
+
+ // 鎸夐挳 3: 寮�濮� Android 鐩告満褰曞儚
+ Button(
+ onClick = onStartAndroidRecord,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = isServiceBound
+ ) {
+ Text("3. 寮�濮� Android 鐩告満褰曞儚")
+ }
+
+ // 鎸夐挳 4: 缁撴潫 Android 鐩告満褰曞儚
+ Button(
+ onClick = onStopAndroidRecord,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = isServiceBound
+ ) {
+ Text("4. 缁撴潫 Android 鐩告満褰曞儚")
+ }
+
+ Divider(modifier = Modifier.padding(vertical = 8.dp))
+
+ // 鎸夐挳 5: 寮�濮� USB 鐩告満褰曞儚
+ Button(
+ onClick = onStartUsbRecord,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = isServiceBound
+ ) {
+ Text("5. 寮�濮� USB 鐩告満褰曞儚")
+ }
+
+ // 鎸夐挳 6: 缁撴潫 USB 鐩告満褰曞儚
+ Button(
+ onClick = onStopUsbRecord,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = isServiceBound
+ ) {
+ Text("6. 缁撴潫 USB 鐩告満褰曞儚")
+ }
+
+ Divider(modifier = Modifier.padding(vertical = 8.dp))
+
+ // 鎸夐挳 7: 寮�濮� USB 鎺ㄦ祦
+ Button(
+ onClick = onStartUsbPush,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = isServiceBound
+ ) {
+ Text("7. 寮�濮� USB 鎺ㄦ祦")
+ }
+
+ // 鎸夐挳 8: 缁撴潫 USB 鎺ㄦ祦
+ Button(
+ onClick = onStopUsbPush,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = isServiceBound
+ ) {
+ Text("8. 缁撴潫 USB 鎺ㄦ祦")
+ }
+
+ Spacer(modifier = Modifier.height(12.dp))
}
}
}
--
Gitblit v1.8.0