新增设备列表 Compose 页面 (#8)

# WIP: Add device list Compose screen ## Summary This MR adds only the reusable Kotlin Jetpack Compose device list screen for my assigned scope. The screen displays the three ABox device categories: - Smart socket - Temperature/humidity sensor - Infrared controller This MR intentionally does not modify the app entry point, login flow, app shell routing, or any device detail/control screen. Those parts are handled by other feature branches. ## Changes - Add `DeviceListScreen`. - Expose click callbacks for each device category: - `onSocketClick` - `onTemperatureHumidityClick` - `onInfraredClick` - Update the device-list change log document. - Remove the earlier out-of-scope temporary device control screens from this branch. ## Scope Included: - Device list Compose UI component - Device category entry UI - Callback API for future route integration Not included: - App entry point changes - Login flow changes - Device control navigation graph - Smart socket control screen - Temperature/humidity status screen - Infrared controller screen - Direct ABSDK calls - Java Activity classes - XML layout files ## Integration Notes The screen is designed to be hosted by the app shell or routing owner later: ```kotlin DeviceListScreen( onSocketClick = { /* route to socket module */ }, onTemperatureHumidityClick = { /* route to temperature/humidity module */ }, onInfraredClick = { /* route to infrared controller module */ }, ) ``` The current branch keeps these callbacks external so other feature owners can connect their modules without this MR taking ownership of routing. ## Verification - Built and ran `android.app` locally from Android Studio. - `:android:app:assembleDebug` completed successfully after trimming this branch to the device-list component scope. ## Notes `settings.gradle.kts` is intentionally not part of this MR. Local Gradle/JDK/toolchain setup is handled on the developer machine and should not modify the team-provided project configuration. --- # WIP: 新增设备列表 Compose 页面 ## 概要本 MR 只新增我当前分工负责的 Kotlin Jetpack Compose 设备列表页面组件。设备列表展示三类 ABox 设备入口： - 智能插座 - 温湿度传感器 - 红外控制器本 MR 故意不修改 App 入口、登录流程、应用壳路由，也不实现任何设备详情/控制页面。这些部分由其他功能分支负责。 ## 修改内容 - 新增 `DeviceListScreen`。 - 为三类设备入口暴露点击回调： - `onSocketClick` - `onTemperatureHumidityClick` - `onInfraredClick` - 更新设备列表变更说明文档。 - 从本分支中移除早期临时加入、但不属于当前分工范围的设备控制页面。 ## 本 MR 包含 - 设备列表 Compose UI 组件 - 设备类别入口 UI - 后续路由接入所需的 callback API ## 本 MR 不包含 - App 入口修改 - 登录流程修改 - 设备控制 navigation graph - 智能插座控制页面 - 温湿度状态页面 - 红外控制器页面 - Compose UI 中直接调用 ABSDK - Java Activity - XML layout ## 对接说明该页面后续可以由 App shell 或路由负责人挂载： ```kotlin DeviceListScreen( onSocketClick = { /* 后续跳转到智能插座模块 */ }, onTemperatureHumidityClick = { /* 后续跳转到温湿度模块 */ }, onInfraredClick = { /* 后续跳转到红外控制器模块 */ }, ) ``` 当前分支只提供页面和回调 API，不负责具体跳转目标，以便其他模块负责人对接自己的功能页面。 ## 验证 - 已在本地通过 Android Studio 成功 build/run `android.app`。 - 修剪为设备列表组件范围后，`:android:app:assembleDebug` 构建成功。 ## 备注 `settings.gradle.kts` 不属于本 MR 范围。本地 Gradle/JDK/toolchain 配置在开发者本机处理，不修改团队提供的项目配置文件。 --------- Co-authored-by: KremeCN <3265494849@qq.com> Reviewed-on: #8 Co-authored-by: alZerNest <2223976172@qq.com>
2026-08-25 11:39:12 +08:00
parent ed98c2be98
commit 249721be33
7 changed files with 499 additions and 9 deletions
@@ -0,0 +1,95 @@
+package com.flagship.abox.manager.ui.devicecontrollist
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.flagship.abox.manager.R
+import com.flagship.abox.manager.designsystem.ABoxButton
+import com.flagship.abox.manager.designsystem.ABoxTheme
+
+@Composable
+fun DeviceListScreen(
+    modifier: Modifier = Modifier,
+    onSocketClick: () -> Unit = {},
+    onTemperatureHumidityClick: () -> Unit = {},
+    onInfraredClick: () -> Unit = {},
+) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(32.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Text(
+            text = stringResource(R.string.device_list_title),
+            style = MaterialTheme.typography.headlineLarge,
+            textAlign = TextAlign.Center,
+        )
+        Text(
+            text = stringResource(R.string.device_list_description),
+            modifier = Modifier.padding(top = 12.dp, bottom = 32.dp),
+            style = MaterialTheme.typography.bodyLarge,
+            textAlign = TextAlign.Center,
+        )
+        DeviceEntryButton(
+            text = stringResource(R.string.device_socket_title),
+            description = stringResource(R.string.device_socket_description),
+            onClick = onSocketClick,
+        )
+        DeviceEntryButton(
+            text = stringResource(R.string.device_temperature_humidity_title),
+            description = stringResource(R.string.device_temperature_humidity_description),
+            onClick = onTemperatureHumidityClick,
+        )
+        DeviceEntryButton(
+            text = stringResource(R.string.device_infrared_title),
+            description = stringResource(R.string.device_infrared_description),
+            onClick = onInfraredClick,
+        )
+    }
+}
+
+@Composable
+private fun DeviceEntryButton(
+    text: String,
+    description: String,
+    onClick: () -> Unit,
+) {
+    ABoxButton(
+        onClick = onClick,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(top = 16.dp),
+    ) {
+        Column(
+            modifier = Modifier.padding(vertical = 8.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text(text = text, style = MaterialTheme.typography.titleMedium)
+            Text(text = description, style = MaterialTheme.typography.bodySmall)
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun DeviceListScreenPreview() {
+    ABoxTheme {
+        DeviceListScreen()
+    }
+}
@@ -29,6 +29,7 @@ import com.flagship.abox.manager.R
 import com.flagship.abox.manager.designsystem.ABoxNavigationBar
 import com.flagship.abox.manager.designsystem.ABoxNavigationBarItem
 import com.flagship.abox.manager.designsystem.ABoxTopPillBar
+import com.flagship.abox.manager.ui.devicecontrollist.DeviceListScreen

 /**
 * Main authenticated application shell.
@@ -50,7 +51,7 @@ fun MainAppShell(
    onAddClick: (() -> Unit)? = null,
    actionInProgress: Boolean = false,
    errorMessage: String? = null,
-    devicesSlot: @Composable () -> Unit = { DefaultDevicesSlot() },
+    devicesSlot: @Composable () -> Unit = { DeviceListScreen() },
    scenesSlot: @Composable () -> Unit = { DefaultScenesSlot() },
    activitySlot: @Composable () -> Unit = { DefaultActivitySlot() },
 ) {
@@ -133,14 +134,6 @@ fun MainAppShell(
    }
 }

-@Composable
-private fun DefaultDevicesSlot() {
-    SlotPlaceholder(
-        title = stringResource(R.string.devices_placeholder_title),
-        description = stringResource(R.string.devices_placeholder_description),
-    )
-}
-
@Composable
 private fun DefaultScenesSlot() {
    SlotPlaceholder(
@@ -42,4 +42,14 @@
    <string name="scenes_placeholder_description">情景动作与执行插槽（由 tzh 模块实现）。</string>
    <string name="activity_placeholder_title">活动记录</string>
    <string name="activity_placeholder_description">未记录任何事件。</string>
+
+    <!-- 设备列表 -->
+    <string name="device_list_title">设备列表</string>
+    <string name="device_list_description">选择需要控制或查看状态的 ABox 终端设备。</string>
+    <string name="device_socket_title">智能插座</string>
+    <string name="device_socket_description">进入智能插座相关功能。</string>
+    <string name="device_temperature_humidity_title">温湿度传感器</string>
+    <string name="device_temperature_humidity_description">进入温湿度状态相关功能。</string>
+    <string name="device_infrared_title">红外控制器</string>
+    <string name="device_infrared_description">进入红外控制器相关功能。</string>
 </resources>
@@ -42,4 +42,14 @@
    <string name="scenes_placeholder_description">Scene actions and execution slot for tzh.</string>
    <string name="activity_placeholder_title">Activity Log</string>
    <string name="activity_placeholder_description">No recorded events yet.</string>
+
+    <!-- Device list -->
+    <string name="device_list_title">Device List</string>
+    <string name="device_list_description">Select an ABox terminal device to control or check status.</string>
+    <string name="device_socket_title">Smart Socket</string>
+    <string name="device_socket_description">Access smart socket features.</string>
+    <string name="device_temperature_humidity_title">Temperature &amp; Humidity Sensor</string>
+    <string name="device_temperature_humidity_description">View temperature and humidity status.</string>
+    <string name="device_infrared_title">Infrared Controller</string>
+    <string name="device_infrared_description">Access infrared controller features.</string>
 </resources>