feat(ui): 统一AppBar规范与双栏动态页边距,交付自动连接配置全量物料
This commit is contained in:
@@ -0,0 +1,61 @@
|
||||
---
|
||||
title: "APP界面优化 - 自动连接配置页面 (Auto Connect Settings)"
|
||||
status: "TODO"
|
||||
created: "2026-08-17"
|
||||
level: 1
|
||||
---
|
||||
|
||||
# 任务目标
|
||||
对系统设置子页面【自动连接配置】执行 UI 交互与视觉规范重构(**严格纯美化,禁止遗漏任何原有通道数据与规则,严守全量字段与语义开关**)。
|
||||
核心解决三大问题:
|
||||
1. **生硬框线堆叠与草稿感**:重构为 **iPadOS Pro 通道独立岛屿** + **Bento 规则策略双层矩阵**;
|
||||
2. **重连规则与通道被挤压**:重连规则改为 **上下纵向排布**,输入框完整舒展,通道列表注入安全内边距避免顶部遮挡;
|
||||
3. **策略项文案校准**:第 4 项明确校准为 **“离线超过30秒停止写入设备”**。
|
||||
|
||||
---
|
||||
|
||||
## 🛠️ 开发依据(标准物料约束)
|
||||
> 🚨 **绝对约束**:请 `@coder` 在修改原生代码前,**必须**完整阅读本工作台目录下的全部标准物料,严禁自行发挥排版!
|
||||
>
|
||||
> **工作台路径**:`设置页面UI优化/自动连接配置/`
|
||||
> 1. `baseline_ui.html`:**[必读]** 终极 HTML/CSS 排版基准源代码(双栏布局、通道列表拖拽交互、Bento 磁贴结构)。
|
||||
> 2. `DESIGN_SPEC.md`:**[必读]** 视觉边界手册(1120dp 栅格、420dp 通道岛屿、圆角与边距规范)。
|
||||
> 3. `implementation_plan.md`:**[必读]** CSS → Android Token 映射字典与原生代码清单。
|
||||
>
|
||||
> **视觉基准图片(只读)**:
|
||||
> - 原机出厂截图:`Screenshot_20260812_143357.png`(字段与开关状态保底凭证)
|
||||
> - 定妆效果图:`image.png`(人类定稿定妆照)
|
||||
|
||||
---
|
||||
|
||||
## 📂 涉及文件清单
|
||||
|
||||
**1. Layout**
|
||||
- `app/src/main/res/layout/activity_auto_connect_settings.xml`
|
||||
- `app/src/main/res/layout/item_channel_reconnect.xml`
|
||||
|
||||
**2. Java / Activity / Adapter**
|
||||
- `app/src/main/java/com/umilab/eapmanage/team/settings/AutoConnectSettingsActivity.java`
|
||||
- `app/src/main/java/com/umilab/eapmanage/team/settings/adapter/ChannelSortAdapter.java`
|
||||
|
||||
**3. Drawables & Styles**
|
||||
- `app/src/main/res/drawable/bg_island_card.xml`
|
||||
- `app/src/main/res/drawable/bg_channel_item.xml`
|
||||
|
||||
---
|
||||
|
||||
## 📋 执行步骤清单
|
||||
1. **重构布局结构**:将 `activity_auto_connect_settings.xml` 改造为 1120dp 居中横向双栏(左侧 420dp 通道岛屿,右侧两层 Bento 磁贴卡片)。
|
||||
2. **通道列表与手柄**:实现带有翡翠绿呼吸灯、`#01` 微胶囊与 `ItemTouchHelper` 拖拽排序手柄的通道列表。
|
||||
3. **型号规则纵向堆叠**:将型号规则改为上下两层纵向卡片,输入框宽度自适应撑满。
|
||||
4. **策略四宫格与文案对齐**:构建 2x2 系统连接策略网格,第 4 项文案准确绑定为“离线超过30秒停止写入设备”。
|
||||
5. **字段与初始开关核验**:确保 9 大通道编码与各开关默认开启/关闭状态 100% 对齐原图。
|
||||
|
||||
---
|
||||
|
||||
## ✅ 验收标准
|
||||
- [ ] 平板横屏下呈现为 1120dp 居中双栏架构(左侧通道岛屿 + 右侧 Bento 矩阵)。
|
||||
- [ ] 通道列表第一项顶部具备完整内边距,上边框在任何状态下均绝不被裁切。
|
||||
- [ ] 型号过滤规则上下纵向排布,输入框通栏舒展。
|
||||
- [ ] 系统连接策略第 4 项文案准确显示为“离线超过30秒停止写入设备”。
|
||||
- [ ] 所有颜色与尺寸严格使用 Android 语义 Token。
|
||||
@@ -0,0 +1,69 @@
|
||||
# 自动连接配置页面 — 视觉边界手册 DESIGN_SPEC
|
||||
|
||||
- **模块**:系统设置子页面 — 自动连接配置 (`AutoConnectSettingsActivity`)
|
||||
- **日期**:2026-08-17
|
||||
- **视觉基准**:同目录 `baseline_ui.html`(iPadOS Pro 通道岛屿 + Bento 规则策略双层矩阵架构)
|
||||
- **原始出厂截图**(只读引用):`./Screenshot_20260812_143357.png`
|
||||
- **定稿效果图**(只读引用):`./image.png`
|
||||
|
||||
> **红线与设计约束**:
|
||||
> 1. **全量字段 100% 完整保留**,包含 9 大通道编码、型号过滤规则以及按最新指示校准的策略选项;
|
||||
> 2. **开关初始状态严格对齐**:左侧通道重连(ON)、型号规则 1(OFF)、型号规则 2(OFF)、自动加载用户数据库(OFF)、历史日志限制(ON)、开启佩戴提醒(OFF)、离线超过30秒停止写入设备(OFF)。
|
||||
|
||||
---
|
||||
|
||||
## 1. 宽屏平板布局架构 (1120dp 双栏复合矩阵)
|
||||
|
||||
### 1.1 现状痛点剖析
|
||||
1. **生硬三列框线堆叠**:原截图中三列控件形态单一、通道项为灰紫色粗暴矩形,缺乏现代系统设置的分组呼吸感;
|
||||
2. **字段重复导致语义模糊**:三处开关均命名为“自动重连状态”,原版无明确卡片区块分割容易引发误解;
|
||||
3. **型号规则输入框挤压变形**:原版横屏下型号规则缺乏合理宽度支持。
|
||||
|
||||
### 1.2 目标架构规范
|
||||
|
||||
| 规范项 | 参数值 | 说明 |
|
||||
| :--- | :--- | :--- |
|
||||
| **容器最大宽度** | **1160dp** (`--content-max-width`) | 超出宽度时屏幕左右自动居中留白 (`margin: 0 auto`) |
|
||||
| **外层动态边距** | **`clamp(16px, 2.5vw, 32px)`** | 全局自适应外层页边距,大屏小屏上下左右等距呼吸 |
|
||||
| **主栅格架构** | **430dp + 1fr** (`grid-template-columns: 430dp 1fr`) | 左侧为通道调度总控岛屿,右侧为型号规则与系统策略双层 Bento 磁贴 |
|
||||
| **通道岛屿卡片** | **430dp 独立岛屿 (18dp 圆角)** | 内置头部总控开关、9 通道列表组(带翡翠绿呼吸指示灯、`#01` 微胶囊与拖拽手柄) |
|
||||
| **型号过滤规则** | **上下纵向堆叠卡片 (Vertical Stack)** | 每个规则包含独立开关与通栏等宽字体规则输入框 |
|
||||
| **系统连接策略** | **2x2 四宫格卡片矩阵** | 4 个系统策略卡片均包含主标题/副说明与独立 M3 触感开关 |
|
||||
| **AppBar 顶部栏** | **通栏 60dp** (`--appbar-height`) | 标题 19sp/700,40dp 纯净透明圆形触控槽 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 字段与槽位核验清单 (100% 对齐原图与最新指示)
|
||||
|
||||
| # | 区域 | 字段 / 元素标识 | 初始值 / 状态 | 规范与视觉行为 |
|
||||
| :-: | :--- | :--- | :--- | :--- |
|
||||
| 1 | **AppBar** | 返回箭头 `(←)` | 交互按钮 | 40dp 纯净透明触控槽,点击返回上一级系统设置 |
|
||||
| 2 | **AppBar** | `自动连接配置` | 页面标题 | 19sp / 700 字重 / `--text-main` (`#0F172A`) |
|
||||
| 3 | **AppBar** | 更多选项 `(⋮)` | 更多菜单 | 40dp 纯净透明触控槽 |
|
||||
| 4 | **左侧通道岛屿** | `自动重连状态` | 总控开关标签 | 16sp / 700 字重 |
|
||||
| 5 | **左侧通道岛屿** | `9 通道就绪` | 状态胶囊 | 11.5sp / 600 / `--color-primary-light` (`#EFF6FF`) |
|
||||
| 6 | **左侧通道岛屿** | 总控 Switch 开关 | **开启 (ON, 蓝色)** | M3 触感滑动开关 |
|
||||
| 7 | **通道 1** | `通道 #01 62200014` | 列表项 1 | 翡翠绿呼吸灯 + `#01` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 8 | **通道 2** | `通道 #02 62200025` | 列表项 2 | 翡翠绿呼吸灯 + `#02` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 9 | **通道 3** | `通道 #03 2200001` | 列表项 3 | 翡翠绿呼吸灯 + `#03` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 10 | **通道 4** | `通道 #04 62200015` | 列表项 4 | 翡翠绿呼吸灯 + `#04` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 11 | **通道 5** | `通道 #05 2200024` | 列表项 5 | 翡翠绿呼吸灯 + `#05` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 12 | **通道 6** | `通道 #06 2200002` | 列表项 6 | 翡翠绿呼吸灯 + `#06` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 13 | **通道 7** | `通道 #07 62200026` | 列表项 7 | 翡翠绿呼吸灯 + `#07` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 14 | **通道 8** | `通道 #08 62200016` | 列表项 8 | 翡翠绿呼吸灯 + `#08` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 15 | **通道 9** | `通道 #09 2200011` | 列表项 9 | 翡翠绿呼吸灯 + `#09` 徽章 + 等宽编码 + `≡` 拖拽手柄 |
|
||||
| 16 | **型号规则 1** | `自动重连状态` | 开关标签 | **关闭 (OFF)** |
|
||||
| 17 | **型号规则 1** | `CL910L-XXXXXXX / CL960-XXXXXXX` | 输入规则 | 等宽字体通栏输入框 |
|
||||
| 18 | **型号规则 2** | `自动重连状态` | 开关标签 | **关闭 (OFF)** |
|
||||
| 19 | **型号规则 2** | `CL900-XXXXXXX` | 输入规则 | 等宽字体通栏输入框 |
|
||||
| 20 | **策略项 1** | `自动加载用户数据库` | 主标题 | 说明副文本:`当连接时自动加载用户数据库`,**关闭 (OFF)** |
|
||||
| 21 | **策略项 2** | `历史日志限制` | 主标题 | **开启 (ON, 蓝色)** |
|
||||
| 22 | **策略项 3** | `开启佩戴提醒` | 主标题 | **关闭 (OFF)** |
|
||||
| 23 | **策略项 4** | `离线超过30秒停止写入设备` | 主标题 | **关闭 (OFF)** *(按最新指示校准)* |
|
||||
|
||||
---
|
||||
|
||||
## 3. 交互与微动效规范
|
||||
- **通道拖拽反馈**:触摸手柄(`≡`)时通道行具有微浮雕提升(`translateY(-1px)` 与 `box-shadow`),支持平滑重排;
|
||||
- **开关微触感**:开启态 Switch 伴随 0.25s 贝塞尔曲线过渡(`cubic-bezier(0.4, 0, 0.2, 1)`);
|
||||
- **滚动安全边距**:通道列表已注入 `padding: 6px 4px 6px 2px;`,顶部边框在任何分辨率与滚动状态下均绝不发生遮挡。
|
||||
@@ -0,0 +1,597 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>自动连接配置</title>
|
||||
<style>
|
||||
/* =========================================================================
|
||||
:root 全量 Design Tokens 声明 (与系统设置全局规范严格对齐)
|
||||
========================================================================= */
|
||||
:root {
|
||||
--color-primary: #2563EB;
|
||||
--color-primary-dark: #1D4ED8;
|
||||
--color-primary-light: #EFF6FF;
|
||||
--color-primary-container: #EEF2FF;
|
||||
--color-on-primary-container: #1E40AF;
|
||||
|
||||
--color-surface: #FFFFFF;
|
||||
--color-surface-variant: #F8FAFC;
|
||||
--color-background: #EEF2F6;
|
||||
|
||||
--text-main: #0F172A;
|
||||
--text-sub: #64748B;
|
||||
--text-dim: #94A3B8;
|
||||
|
||||
--divider: #E2E8F0;
|
||||
--border-card: #E2E8F0;
|
||||
--border-light: rgba(0, 0, 0, 0.05);
|
||||
|
||||
--corner-card: 18px;
|
||||
--corner-item: 12px;
|
||||
--shadow-card: 0 4px 20px -2px rgba(15, 23, 42, 0.05);
|
||||
--shadow-hover: 0 10px 24px -4px rgba(15, 23, 42, 0.08);
|
||||
|
||||
--content-max-width: 1160px;
|
||||
--content-gutter: clamp(16px, 2.5vw, 32px);
|
||||
--appbar-height: 60px;
|
||||
}
|
||||
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
|
||||
html {
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
||||
"PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif;
|
||||
background: var(--color-background);
|
||||
color: var(--text-main);
|
||||
min-height: 100vh;
|
||||
padding: var(--content-gutter);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.device-wrapper {
|
||||
width: 100%;
|
||||
max-width: var(--content-max-width);
|
||||
margin: 0 auto;
|
||||
background: var(--color-surface);
|
||||
border-radius: 20px;
|
||||
border: 1px solid var(--border-light);
|
||||
box-shadow: 0 16px 40px -10px rgba(15, 23, 42, 0.08);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* =========================================================================
|
||||
AppBar 顶部导航栏统一规范 (40dp 纯净透明触控槽 + Hover 微圆底)
|
||||
========================================================================= */
|
||||
.appbar {
|
||||
height: var(--appbar-height);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 0 20px;
|
||||
border-bottom: 1px solid var(--divider);
|
||||
background: var(--color-surface);
|
||||
}
|
||||
|
||||
.appbar-left { display: flex; align-items: center; }
|
||||
|
||||
.appbar-nav {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border-radius: 50%;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: none;
|
||||
transition: all 0.15s ease;
|
||||
}
|
||||
|
||||
.appbar-nav:hover {
|
||||
background: rgba(15, 23, 42, 0.06);
|
||||
transform: scale(0.96);
|
||||
}
|
||||
|
||||
.appbar-nav svg {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
fill: var(--text-main);
|
||||
}
|
||||
|
||||
.appbar-title {
|
||||
font-size: 19px;
|
||||
font-weight: 700;
|
||||
margin-left: 10px;
|
||||
letter-spacing: -0.01em;
|
||||
}
|
||||
|
||||
.appbar-more {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border-radius: 50%;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: none;
|
||||
transition: all 0.15s ease;
|
||||
}
|
||||
|
||||
.appbar-more:hover {
|
||||
background: rgba(15, 23, 42, 0.06);
|
||||
}
|
||||
|
||||
.appbar-more svg {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
fill: var(--text-main);
|
||||
}
|
||||
|
||||
/* 融合主布局:左侧通道岛屿 430dp + 右侧 Bento 规则策略双层矩阵 (动态响应式边距) */
|
||||
.main-layout {
|
||||
padding: clamp(20px, 2.5vw, 30px);
|
||||
display: grid;
|
||||
grid-template-columns: 430px 1fr;
|
||||
gap: clamp(16px, 2vw, 24px);
|
||||
background: var(--color-surface-variant);
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
/* =========================================================================
|
||||
【左侧】通道配置独立岛屿 (iPadOS Pro Inset Group)
|
||||
========================================================================= */
|
||||
.channel-island {
|
||||
background: var(--color-surface);
|
||||
border-radius: var(--corner-card);
|
||||
border: 1.5px solid var(--border-card);
|
||||
box-shadow: var(--shadow-card);
|
||||
padding: 20px 20px 16px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.island-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 14px;
|
||||
margin-bottom: 10px;
|
||||
border-bottom: 1px solid var(--divider);
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.island-title {
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
color: var(--text-main);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.status-pill {
|
||||
font-size: 11.5px;
|
||||
font-weight: 600;
|
||||
background: var(--color-primary-light);
|
||||
color: var(--color-primary);
|
||||
padding: 2px 8px;
|
||||
border-radius: 100px;
|
||||
}
|
||||
|
||||
/* 高精细度 iOS 触控 Switch */
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 48px;
|
||||
height: 26px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.switch input { opacity: 0; width: 0; height: 0; }
|
||||
|
||||
.slider {
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0; left: 0; right: 0; bottom: 0;
|
||||
background-color: #CBD5E1;
|
||||
transition: .25s cubic-bezier(0.4, 0, 0.2, 1);
|
||||
border-radius: 26px;
|
||||
}
|
||||
|
||||
.slider:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
left: 3px;
|
||||
bottom: 3px;
|
||||
background-color: white;
|
||||
transition: .25s cubic-bezier(0.4, 0, 0.2, 1);
|
||||
border-radius: 50%;
|
||||
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
|
||||
input:checked + .slider {
|
||||
background-color: var(--color-primary);
|
||||
}
|
||||
|
||||
input:checked + .slider:before {
|
||||
transform: translateX(22px);
|
||||
}
|
||||
|
||||
/* 通道列表组 (已加安全 padding 确保第一条顶部边框完整不遮挡) */
|
||||
.channel-group-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 7px;
|
||||
overflow-y: auto;
|
||||
max-height: 480px;
|
||||
padding: 6px 4px 6px 2px;
|
||||
}
|
||||
|
||||
.channel-row {
|
||||
background: #F8FAFC;
|
||||
border: 1px solid rgba(226, 232, 240, 0.9);
|
||||
border-radius: var(--corner-item);
|
||||
padding: 10px 14px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
|
||||
cursor: grab;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.channel-row:hover {
|
||||
background: #FFFFFF;
|
||||
border-color: #CBD5E1;
|
||||
transform: translateY(-1px);
|
||||
box-shadow: 0 4px 12px rgba(15, 23, 42, 0.04);
|
||||
}
|
||||
|
||||
.channel-left {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.channel-dot {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 50%;
|
||||
background: #10B981;
|
||||
box-shadow: 0 0 0 3px rgba(16, 185, 129, 0.15);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.channel-badge {
|
||||
background: var(--color-primary-container);
|
||||
color: var(--color-primary);
|
||||
font-size: 11.5px;
|
||||
font-weight: 700;
|
||||
padding: 2px 7px;
|
||||
border-radius: 6px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.channel-text {
|
||||
font-size: 13.5px;
|
||||
font-weight: 600;
|
||||
color: var(--text-main);
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
|
||||
}
|
||||
|
||||
.drag-icon {
|
||||
color: var(--text-dim);
|
||||
font-size: 18px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-left: 6px;
|
||||
}
|
||||
|
||||
/* =========================================================================
|
||||
【右侧】Bento 磁贴矩阵 (型号过滤规则 + 系统连接策略)
|
||||
========================================================================= */
|
||||
.bento-right-stack {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.bento-tile {
|
||||
background: var(--color-surface);
|
||||
border-radius: var(--corner-card);
|
||||
border: 1.5px solid var(--border-card);
|
||||
box-shadow: var(--shadow-card);
|
||||
padding: 18px 20px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.bento-tile-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 12px;
|
||||
margin-bottom: 12px;
|
||||
border-bottom: 1px solid var(--divider);
|
||||
min-height: 36px;
|
||||
}
|
||||
|
||||
.bento-title {
|
||||
font-size: 15.5px;
|
||||
font-weight: 700;
|
||||
color: var(--text-main);
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
/* 1. 型号过滤规则:上下纵向摆放 (Vertical Stacked Cards) */
|
||||
.rules-vertical-stack {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.rule-bento-card {
|
||||
background: #F8FAFC;
|
||||
border: 1px solid var(--divider);
|
||||
border-radius: var(--corner-item);
|
||||
padding: 12px 16px;
|
||||
transition: all 0.15s ease;
|
||||
}
|
||||
|
||||
.rule-bento-card:hover {
|
||||
background: #FFFFFF;
|
||||
border-color: #CBD5E1;
|
||||
box-shadow: 0 4px 12px rgba(15, 23, 42, 0.03);
|
||||
}
|
||||
|
||||
.rule-row-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.rule-status-text {
|
||||
font-size: 13.5px;
|
||||
font-weight: 600;
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
||||
.rule-input-field {
|
||||
width: 100%;
|
||||
background: #FFFFFF;
|
||||
border: 1.5px solid var(--divider);
|
||||
border-radius: 8px;
|
||||
padding: 9px 14px;
|
||||
font-size: 13.5px;
|
||||
font-weight: 600;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
|
||||
color: var(--text-main);
|
||||
box-shadow: inset 0 1px 2px rgba(0,0,0,0.02);
|
||||
transition: border-color 0.15s ease;
|
||||
}
|
||||
|
||||
.rule-input-field:focus {
|
||||
outline: none;
|
||||
border-color: var(--color-primary);
|
||||
box-shadow: 0 0 0 3px rgba(37, 99, 235, 0.1);
|
||||
}
|
||||
|
||||
/* 2. 系统连接策略四宫格磁贴 (2x2 Grid) */
|
||||
.strategy-bento-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.strategy-bento-card {
|
||||
background: #F8FAFC;
|
||||
border: 1px solid var(--divider);
|
||||
border-radius: var(--corner-item);
|
||||
padding: 12px 14px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 10px;
|
||||
transition: all 0.15s ease;
|
||||
}
|
||||
|
||||
.strategy-bento-card:hover {
|
||||
background: #FFFFFF;
|
||||
border-color: #CBD5E1;
|
||||
box-shadow: 0 4px 12px rgba(15, 23, 42, 0.03);
|
||||
}
|
||||
|
||||
.strategy-info { flex: 1; }
|
||||
|
||||
.strategy-main-title {
|
||||
font-size: 13.5px;
|
||||
font-weight: 600;
|
||||
color: var(--text-main);
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.strategy-sub-desc {
|
||||
font-size: 11.5px;
|
||||
color: var(--text-sub);
|
||||
margin-top: 2px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="device-wrapper">
|
||||
<!-- AppBar 顶部导航 (统一规范:40dp 无框轻质触控槽) -->
|
||||
<header class="appbar">
|
||||
<div class="appbar-left">
|
||||
<button class="appbar-nav" title="返回" aria-label="返回"><svg viewBox="0 0 24 24"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"/></svg></button>
|
||||
<h1 class="appbar-title">自动连接配置</h1>
|
||||
</div>
|
||||
<button class="appbar-more" title="更多选项" aria-label="更多选项"><svg viewBox="0 0 24 24"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg></button>
|
||||
</header>
|
||||
|
||||
<main class="main-layout">
|
||||
<!-- 【左侧】通道配置岛屿 (带绿点信号灯 + #01 徽章 + 拖拽手柄) -->
|
||||
<aside class="channel-island">
|
||||
<div class="island-header">
|
||||
<div class="island-title">
|
||||
<span>自动重连状态</span>
|
||||
<span class="status-pill">9 通道就绪</span>
|
||||
</div>
|
||||
<label class="switch"><input type="checkbox" checked><span class="slider"></span></label>
|
||||
</div>
|
||||
<div class="channel-group-list">
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#01</span>
|
||||
<span class="channel-text">通道 #01 62200014</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#02</span>
|
||||
<span class="channel-text">通道 #02 62200025</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#03</span>
|
||||
<span class="channel-text">通道 #03 2200001</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#04</span>
|
||||
<span class="channel-text">通道 #04 62200015</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#05</span>
|
||||
<span class="channel-text">通道 #05 2200024</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#06</span>
|
||||
<span class="channel-text">通道 #06 2200002</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#07</span>
|
||||
<span class="channel-text">通道 #07 62200026</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#08</span>
|
||||
<span class="channel-text">通道 #08 62200016</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
<div class="channel-row">
|
||||
<div class="channel-left">
|
||||
<span class="channel-dot"></span>
|
||||
<span class="channel-badge">#09</span>
|
||||
<span class="channel-text">通道 #09 2200011</span>
|
||||
</div>
|
||||
<span class="drag-icon">≡</span>
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<!-- 【右侧】Bento 磁贴矩阵 (型号过滤规则 + 系统连接策略) -->
|
||||
<section class="bento-right-stack">
|
||||
<!-- 1. 型号过滤规则 Bento 磁贴 (上下纵向摆放) -->
|
||||
<div class="bento-tile">
|
||||
<div class="bento-tile-head">
|
||||
<span class="bento-title">型号过滤规则</span>
|
||||
</div>
|
||||
<div class="rules-vertical-stack">
|
||||
<div class="rule-bento-card">
|
||||
<div class="rule-row-head">
|
||||
<span class="rule-status-text">自动重连状态</span>
|
||||
<label class="switch"><input type="checkbox"><span class="slider"></span></label>
|
||||
</div>
|
||||
<input class="rule-input-field" value="CL910L-XXXXXXX / CL960-XXXXXXX">
|
||||
</div>
|
||||
<div class="rule-bento-card">
|
||||
<div class="rule-row-head">
|
||||
<span class="rule-status-text">自动重连状态</span>
|
||||
<label class="switch"><input type="checkbox"><span class="slider"></span></label>
|
||||
</div>
|
||||
<input class="rule-input-field" value="CL900-XXXXXXX">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 2. 系统连接策略 Bento 四宫格磁贴 -->
|
||||
<div class="bento-tile">
|
||||
<div class="bento-tile-head">
|
||||
<span class="bento-title">系统连接策略</span>
|
||||
</div>
|
||||
<div class="strategy-bento-grid">
|
||||
<div class="strategy-bento-card">
|
||||
<div class="strategy-info">
|
||||
<div class="strategy-main-title">自动加载用户数据库</div>
|
||||
<div class="strategy-sub-desc">当连接时自动加载用户数据库</div>
|
||||
</div>
|
||||
<label class="switch"><input type="checkbox"><span class="slider"></span></label>
|
||||
</div>
|
||||
|
||||
<div class="strategy-bento-card">
|
||||
<div class="strategy-info">
|
||||
<div class="strategy-main-title">历史日志限制</div>
|
||||
</div>
|
||||
<label class="switch"><input type="checkbox" checked><span class="slider"></span></label>
|
||||
</div>
|
||||
|
||||
<div class="strategy-bento-card">
|
||||
<div class="strategy-info">
|
||||
<div class="strategy-main-title">开启佩戴提醒</div>
|
||||
</div>
|
||||
<label class="switch"><input type="checkbox"><span class="slider"></span></label>
|
||||
</div>
|
||||
|
||||
<div class="strategy-bento-card">
|
||||
<div class="strategy-info">
|
||||
<div class="strategy-main-title">离线超过30秒停止写入设备</div>
|
||||
</div>
|
||||
<label class="switch"><input type="checkbox"><span class="slider"></span></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</main>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 100 KiB |
@@ -0,0 +1,77 @@
|
||||
# 自动连接配置页面 — 原生落地图纸 implementation_plan
|
||||
|
||||
- **模块**:系统设置 — 自动连接配置 (`AutoConnectSettingsActivity`)
|
||||
- **依据**:同目录 `baseline_ui.html` + `DESIGN_SPEC.md`
|
||||
- **原始出厂截图**:`./Screenshot_20260812_143357.png`
|
||||
- **定妆效果图**:`./image.png`
|
||||
- **执行角色**:`@coder` (Android 工程师)
|
||||
|
||||
---
|
||||
|
||||
## 1. CSS → Android Token 映射字典
|
||||
|
||||
> ⚠️ **Token 状态声明**:因仓库暂未包含 `UI_DEV_GUIDE.md` 宪法文件,以下 Token 映射依据 Google Material Design 3 标准语义 Token 编写,标记为 `[标准推荐/待校准]`,严禁硬编码色值与尺寸。
|
||||
|
||||
### 1.1 颜色语义映射
|
||||
|
||||
| HTML CSS 变量 | 取值 | Android 语义 Token / 资源 ID | 状态 / 说明 |
|
||||
| :--- | :--- | :--- | :--- |
|
||||
| `--color-primary` | `#2563EB` | `?attr/colorPrimary` | ✅ 主题主色 (Switch 激活态、通道微胶囊) |
|
||||
| `--color-primary-light` | `#EFF6FF` | `@color/primary_container_light` (`#EFF6FF`) | ✅ 状态胶囊浅底色 |
|
||||
| `--color-surface` | `#FFFFFF` | `?attr/colorSurface` | ✅ 卡片背景色 |
|
||||
| `--color-surface-variant` | `#F8FAFC` | `?attr/colorSurfaceVariant` | ✅ 页面内容区底色与列表项背景 |
|
||||
| `--color-background` | `#EEF2F6` | `?attr/colorBackground` | ✅ 页面最外层底色 |
|
||||
| `--text-main` | `#0F172A` | `?attr/colorOnSurface` | ✅ 主标题文本色 |
|
||||
| `--text-sub` | `#64748B` | `?attr/colorOnSurfaceVariant` | ✅ 辅助说明文本色 |
|
||||
| `--divider` | `#E2E8F0` | `?attr/colorOutlineVariant` | ✅ 分割线与卡片边框 |
|
||||
|
||||
### 1.2 尺寸与圆角映射
|
||||
|
||||
| CSS 变量 / 属性 | 取值 | Android 资源 ID | 说明 |
|
||||
| :--- | :--- | :--- | :--- |
|
||||
| `--content-max-width` | `1120px` | `@dimen/content_max_width_auto_connect` (1120dp) | 宽屏居中最大宽度 |
|
||||
| `--corner-card` | `18px` | `@dimen/corner_radius_lg` (18dp) | 岛屿与 Bento 卡片圆角 |
|
||||
| `--corner-item` | `12px` | `@dimen/corner_radius_md` (12dp) | 列表行与子规则卡片圆角 |
|
||||
| `--appbar-height` | `60px` | `?attr/actionBarSize` (60dp) | 顶部栏高度 |
|
||||
|
||||
---
|
||||
|
||||
## 2. Android 落地代码清单与改动指南
|
||||
|
||||
### 2.1 涉及文件清单
|
||||
|
||||
1. **布局文件 (Layout)**
|
||||
- `app/src/main/res/layout/activity_auto_connect_settings.xml`
|
||||
- `app/src/main/res/layout/item_channel_reconnect.xml` (通道列表单项布局)
|
||||
2. **逻辑类 (Activity & Adapter)**
|
||||
- `app/src/main/java/com/umilab/eapmanage/team/settings/AutoConnectSettingsActivity.java`
|
||||
- `app/src/main/java/com/umilab/eapmanage/team/settings/adapter/ChannelSortAdapter.java`
|
||||
3. **资源与样式 (Drawables & Colors)**
|
||||
- `app/src/main/res/drawable/bg_island_card.xml`
|
||||
- `app/src/main/res/drawable/bg_channel_item.xml`
|
||||
|
||||
---
|
||||
|
||||
### 2.2 具体实施步骤
|
||||
|
||||
#### 步骤 1:重构 `activity_auto_connect_settings.xml`
|
||||
- 顶部放置标准 `Toolbar`(60dp 高);
|
||||
- 核心内容区使用横向双栏:
|
||||
- 左侧 `MaterialCardView`(固定 420dp):放置顶部总控开关与 `RecyclerView`(9 通道列表);
|
||||
- 右侧 `LinearLayout`(权重 1fr):垂直排布两张 `MaterialCardView`(上方:型号过滤规则纵向卡片组;下方:系统连接策略 2x2 四宫格网格)。
|
||||
|
||||
#### 步骤 2:通道列表与拖拽重排 (`RecyclerView` + `ItemTouchHelper`)
|
||||
- 使用 `ItemTouchHelper` 绑定左侧通道列表,用户长按或拖拽右侧 `≡` 即可实现通道顺序自由交换与持久化。
|
||||
|
||||
#### 步骤 3:`AutoConnectSettingsActivity.java` 逻辑与文案绑定
|
||||
- 严格绑定各 Switch 的 SharedPreferences 存取;
|
||||
- 策略第 4 项绑定键值与文案:`离线超过30秒停止写入设备`。
|
||||
|
||||
---
|
||||
|
||||
## 3. 验收核验标准
|
||||
- [ ] 平板横屏下呈现为 1120dp 居中双栏架构(左侧 420dp 通道岛屿 + 右侧 Bento 规则策略双层矩阵)。
|
||||
- [ ] 通道列表第一项顶部具备完整内边距,上边框在任何状态下绝不被裁切。
|
||||
- [ ] 型号过滤规则采用上下纵向摆放,输入框通栏舒展。
|
||||
- [ ] 系统连接策略第 4 项文案准确显示为“离线超过30秒停止写入设备”。
|
||||
- [ ] 所有颜色与尺寸严格使用语义 Token,无 XML 硬编码。
|
||||
Reference in New Issue
Block a user