feat: migrate Flutter to Cupertino with daily logs and computer groups

This commit is contained in:
tongtong committed 2026-11-13 11:27:46 +08:00
1 parent c568749d23
commit 87e1fff59b
22 files changed
+808 -55

No files matched your search

+7 -2
View File
@@ -12,6 +12,7 @@ import '../data/agent_service.dart';
class AgentModel extends ChangeNotifier {
AgentModel(this.repository);
final AgentRepository repository;
void Function(String)? onLog;
List<ManagedAgent> _agents = [];
List<ManagedAgent> get agents => List.unmodifiable(_agents);
String? selectedId, selectedPhone;
@@ -111,6 +112,7 @@ class AgentModel extends ChangeNotifier {
if (busy || _disposed) {
return;
}
final previousNotice = notice;
busy = true;
_notify();
try {
@@ -118,6 +120,7 @@ class AgentModel extends ChangeNotifier {
} catch (error) {
notice = repository.redact(error.toString());
} finally {
if (notice != previousNotice) onLog?.call(notice);
busy = false;
_notify();
}
@@ -241,9 +244,11 @@ class AgentModel extends ChangeNotifier {
_cursor = page['next'] as int;
for (final value in page['entries']! as List<Object?>) {
final line = value! as Map<String, Object?>;
logText += repository.redact(
'${line['time']} ${line['level']} ${line['message']}\n',
final text = repository.redact(
'${line['time']} ${line['level']} ${line['message']}',
);
logText += '$text\n';
onLog?.call('[${selectedId ?? "local"}] $text');
}
if (logText.length > 100000) {
logText = logText.substring(logText.length - 100000);
+5 -2
View File
@@ -1,4 +1,4 @@
import 'package:material_ui/material_ui.dart';
import 'app_widgets.dart';
import '../data/agent_models.dart';
@@ -132,7 +132,10 @@ class _AgentViewState extends State<AgentView> {
),
Text(m.notice, style: const TextStyle(color: Colors.blueGrey)),
const SizedBox(height: 10),
if (m.busy) const LinearProgressIndicator(),
SizedBox(
height: 3,
child: m.busy ? const LinearProgressIndicator(minHeight: 3) : null,
),
Expanded(
child: LayoutBuilder(
builder: (context, size) {
+380
View File
@@ -0,0 +1,380 @@
import 'package:cupertino_ui/cupertino_ui.dart' as c;
import 'package:material_ui/material_ui.dart' as m;
export 'package:material_ui/material_ui.dart'
hide
Scaffold,
Card,
FilledButton,
OutlinedButton,
TextButton,
IconButton,
TextField,
Checkbox,
SwitchListTile,
ListTile,
ExpansionTile,
AlertDialog,
showDialog;
export 'package:cupertino_ui/cupertino_ui.dart'
show
CupertinoApp,
CupertinoThemeData,
CupertinoColors,
CupertinoActivityIndicator,
CupertinoPageScaffold;
class Scaffold extends m.StatelessWidget {
const Scaffold({super.key, required this.body});
final m.Widget body;
@override
m.Widget build(m.BuildContext context) =>
c.CupertinoPageScaffold(child: body);
}
class Card extends m.StatelessWidget {
const Card({super.key, required this.child});
final m.Widget child;
@override
m.Widget build(m.BuildContext context) => m.DecoratedBox(
decoration: m.BoxDecoration(
color: c.CupertinoColors.secondarySystemGroupedBackground.resolveFrom(
context,
),
borderRadius: m.BorderRadius.circular(14),
border: m.Border.all(
color: c.CupertinoColors.separator
.resolveFrom(context)
.withValues(alpha: .18),
),
),
child: child,
);
}
class ActionButton extends m.StatelessWidget {
const ActionButton({
super.key,
required this.onPressed,
required this.child,
this.primary = false,
}) : icon = null;
const ActionButton.icon({
super.key,
required this.onPressed,
required m.Widget label,
required this.icon,
this.primary = false,
}) : child = label;
final m.VoidCallback? onPressed;
final m.Widget child;
final m.Widget? icon;
final bool primary;
@override
m.Widget build(m.BuildContext context) {
final content = icon == null
? child
: m.Row(
mainAxisSize: m.MainAxisSize.min,
children: [icon!, const m.SizedBox(width: 7), child],
);
return c.CupertinoButton(
padding: const m.EdgeInsets.symmetric(horizontal: 14, vertical: 9),
minimumSize: const m.Size(0, 36),
color: primary ? c.CupertinoColors.activeBlue : null,
onPressed: onPressed,
child: m.DefaultTextStyle.merge(
style: m.TextStyle(
fontSize: 13,
color: primary ? c.CupertinoColors.white : null,
),
child: content,
),
);
}
}
class FilledButton extends ActionButton {
const FilledButton({
super.key,
required super.onPressed,
required super.child,
}) : super(primary: true);
const FilledButton.icon({
super.key,
required super.onPressed,
required super.label,
required super.icon,
}) : super.icon(primary: true);
}
class OutlinedButton extends ActionButton {
const OutlinedButton({
super.key,
required super.onPressed,
required super.child,
});
const OutlinedButton.icon({
super.key,
required super.onPressed,
required super.label,
required super.icon,
}) : super.icon();
}
class TextButton extends ActionButton {
const TextButton({super.key, required super.onPressed, required super.child});
const TextButton.icon({
super.key,
required super.onPressed,
required super.label,
required super.icon,
}) : super.icon();
}
class IconButton extends m.StatelessWidget {
const IconButton({
super.key,
required this.onPressed,
required this.icon,
this.tooltip,
});
final m.VoidCallback? onPressed;
final m.Widget icon;
final String? tooltip;
@override
m.Widget build(m.BuildContext context) => m.Tooltip(
message: tooltip ?? '',
child: c.CupertinoButton(
padding: const m.EdgeInsets.all(6),
minimumSize: const m.Size(32, 32),
onPressed: onPressed,
child: icon,
),
);
}
class TextField extends m.StatelessWidget {
const TextField({
super.key,
this.controller,
this.onChanged,
this.decoration = const m.InputDecoration(),
this.obscureText = false,
this.maxLines = 1,
this.minLines,
this.style,
});
final m.TextEditingController? controller;
final m.ValueChanged<String>? onChanged;
final m.InputDecoration decoration;
final bool obscureText;
final int? maxLines, minLines;
final m.TextStyle? style;
@override
m.Widget build(m.BuildContext context) => m.Column(
crossAxisAlignment: m.CrossAxisAlignment.start,
children: [
if (decoration.labelText != null)
m.Padding(
padding: const m.EdgeInsets.only(bottom: 6),
child: m.Text(
decoration.labelText!,
style: const m.TextStyle(
fontSize: 12,
color: c.CupertinoColors.secondaryLabel,
),
),
),
c.CupertinoTextField(
controller: controller,
onChanged: onChanged,
obscureText: obscureText,
maxLines: maxLines,
minLines: minLines,
style: style,
placeholder: decoration.hintText,
prefix: decoration.prefixIcon,
suffix: decoration.suffixIcon,
padding: const m.EdgeInsets.all(12),
),
],
);
}
class Checkbox extends m.StatelessWidget {
const Checkbox({super.key, required this.value, required this.onChanged});
final bool? value;
final m.ValueChanged<bool?>? onChanged;
@override
m.Widget build(m.BuildContext context) =>
c.CupertinoCheckbox(value: value ?? false, onChanged: onChanged);
}
class SwitchListTile extends m.StatelessWidget {
const SwitchListTile({
super.key,
required this.value,
required this.onChanged,
required this.title,
this.subtitle,
this.contentPadding,
});
final bool value;
final m.ValueChanged<bool>? onChanged;
final m.Widget title;
final m.Widget? subtitle;
final m.EdgeInsetsGeometry? contentPadding;
@override
m.Widget build(m.BuildContext context) => m.GestureDetector(
behavior: m.HitTestBehavior.opaque,
onTap: onChanged == null ? null : () => onChanged!(!value),
child: m.Padding(
padding: contentPadding ?? m.EdgeInsets.zero,
child: m.Row(
children: [
m.Expanded(
child: m.Column(
crossAxisAlignment: m.CrossAxisAlignment.start,
children: [title, ?subtitle],
),
),
c.CupertinoSwitch(value: value, onChanged: onChanged),
],
),
),
);
}
class ListTile extends m.StatelessWidget {
const ListTile({
super.key,
this.title,
this.subtitle,
this.leading,
this.trailing,
this.onTap,
this.selected = false,
this.selectedTileColor,
this.shape,
this.contentPadding,
});
final m.Widget? title, subtitle, leading, trailing;
final m.VoidCallback? onTap;
final bool selected;
final m.Color? selectedTileColor;
final m.ShapeBorder? shape;
final m.EdgeInsetsGeometry? contentPadding;
@override
m.Widget build(m.BuildContext context) => m.GestureDetector(
behavior: m.HitTestBehavior.opaque,
onTap: onTap,
child: m.Container(
padding:
contentPadding ??
const m.EdgeInsets.symmetric(horizontal: 12, vertical: 11),
decoration: m.BoxDecoration(
color: selected
? (selectedTileColor ??
c.CupertinoColors.activeBlue.withValues(alpha: .12))
: null,
borderRadius: m.BorderRadius.circular(9),
),
child: m.Row(
children: [
if (leading != null) ...[leading!, const m.SizedBox(width: 10)],
m.Expanded(
child: m.Column(
crossAxisAlignment: m.CrossAxisAlignment.start,
children: [
?title,
if (subtitle != null)
m.DefaultTextStyle.merge(
style: const m.TextStyle(
fontSize: 12,
color: c.CupertinoColors.secondaryLabel,
),
child: subtitle!,
),
],
),
),
?trailing,
],
),
),
);
}
class AlertDialog extends m.StatelessWidget {
const AlertDialog({
super.key,
this.title,
this.content,
this.actions = const [],
});
final m.Widget? title, content;
final List<m.Widget> actions;
@override
m.Widget build(m.BuildContext context) =>
c.CupertinoAlertDialog(title: title, content: content, actions: actions);
}
Future<T?> showDialog<T>({
required m.BuildContext context,
required m.WidgetBuilder builder,
}) => c.showCupertinoDialog<T>(context: context, builder: builder);
class AdsCupertinoApp extends m.StatelessWidget {
const AdsCupertinoApp({super.key, required this.home});
final m.Widget home;
@override
m.Widget build(m.BuildContext context) => c.CupertinoApp(
debugShowCheckedModeBanner: false,
title: 'ADS 管理中心',
theme: const c.CupertinoThemeData(
primaryColor: c.CupertinoColors.activeBlue,
scaffoldBackgroundColor: c.CupertinoColors.systemGroupedBackground,
),
builder: (context, child) => m.Theme(
data: m.ThemeData(),
child: m.Localizations.override(
context: context,
delegates: const [m.DefaultMaterialLocalizations.delegate],
child: m.Material(type: m.MaterialType.transparency, child: child!),
),
),
home: home,
);
}
class ExpansionTile extends m.StatefulWidget {
const ExpansionTile({super.key, required this.title, required this.children});
final m.Widget title;
final List<m.Widget> children;
@override
m.State<ExpansionTile> createState() => _ExpansionTileState();
}
class _ExpansionTileState extends m.State<ExpansionTile> {
bool expanded = false;
@override
m.Widget build(m.BuildContext context) => m.Column(
children: [
c.CupertinoButton(
onPressed: () => setState(() => expanded = !expanded),
child: m.Row(
children: [
m.Expanded(child: widget.title),
m.Icon(
expanded
? c.CupertinoIcons.chevron_up
: c.CupertinoIcons.chevron_down,
size: 16,
),
],
),
),
if (expanded) ...widget.children,
],
);
}
+2 -1
View File
@@ -1,7 +1,8 @@
import 'dart:async';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
import 'app_widgets.dart';
import '../data/manager_repository.dart';
+32 -2
View File
@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
import '../data/manager_repository.dart';
import '../data/agent_repository.dart';
import '../data/daily_log.dart';
import '../data/agent_service.dart';
import 'agent_model.dart';
@@ -11,23 +12,50 @@ import 'dart:io';
import 'package:path/path.dart' as p;
DailyLog defaultLog() => DailyLog(
Directory(
p.join(
Platform.environment['LOCALAPPDATA'] ??
p.join(
Platform.environment['HOME'] ?? Directory.systemTemp.path,
'.local',
'share',
),
'TTSTD',
'ADS-Flutter',
'logs',
),
),
);
class ManagerModel extends ChangeNotifier {
late final ManagerRepository repository;
late final AgentModel agents;
List<Device> devices = [];
List<Map<String, dynamic>> nodes = [];
final List<String> logs = [];
late final DailyLog diskLog;
String get logDirectory => diskLog.directory.path;
final Set<String> pending = {};
String notice = '正在初始化', adbListing = '';
bool refreshing = false, closing = false, polling = false;
Timer? timer;
int ticks = 0;
ManagerModel() {
ManagerModel({DailyLog? logWriter}) {
diskLog = logWriter ?? defaultLog();
repository = ManagerRepository(log);
agents = AgentModel(AgentRepository(AgentService(repository)));
agents.onLog = (text) => log("[Agent] $text");
}
void log(String text) {
logs.insert(0, '${DateTime.now().toString().substring(11, 19)} $text');
var safe = agents.repository.redact(text);
for (final secret in [repository.token, agents.enrollmentToken]) {
if (secret.isNotEmpty) safe = safe.replaceAll(secret, '[REDACTED]');
}
logs.insert(0, '${DateTime.now().toString().substring(11, 19)} $safe');
diskLog.add(
safe.length > 16384 ? '${safe.substring(0, 16384)} [truncated]' : safe,
);
if (logs.length > 500) {
logs.removeLast();
}
@@ -72,6 +100,7 @@ class ManagerModel extends ChangeNotifier {
notice = '准备就绪';
});
await refresh();
log('ADS Flutter / Cupertino 已启动,本地日志目录:$logDirectory');
timer = Timer.periodic(const Duration(seconds: 3), (_) async {
if (closing || refreshing || polling) {
return;
@@ -145,5 +174,6 @@ class ManagerModel extends ChangeNotifier {
await Future<void>.delayed(const Duration(milliseconds: 50));
}
await repository.shutdown();
await diskLog.flush();
}
}
+58 -13
View File
@@ -1,6 +1,7 @@
import 'dart:io';
import 'package:material_ui/material_ui.dart';
import 'app_widgets.dart';
import 'package:flutter/services.dart';
import '../data/windows_usb.dart';
@@ -34,7 +35,7 @@ class _ManagerViewState extends State<ManagerView> {
SizedBox(
width: 204,
child: Material(
color: const Color(0xFF14233F),
color: const Color(0xFFF0F2F7),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
@@ -43,7 +44,7 @@ class _ManagerViewState extends State<ManagerView> {
child: Text(
'ADS',
style: TextStyle(
color: Colors.white,
color: Color(0xFF182235),
fontSize: 32,
fontWeight: FontWeight.w800,
),
@@ -53,7 +54,7 @@ class _ManagerViewState extends State<ManagerView> {
padding: EdgeInsets.fromLTRB(24, 0, 16, 36),
child: Text(
'设备管理中心 / Flutter',
style: TextStyle(color: Colors.white60, fontSize: 12),
style: TextStyle(color: Colors.blueGrey, fontSize: 12),
),
),
for (final (i, title, icon) in [
@@ -71,15 +72,15 @@ class _ManagerViewState extends State<ManagerView> {
),
child: ListTile(
selected: page == i,
selectedTileColor: const Color(0xFF29446C),
selectedTileColor: const Color(0xFFE4ECFF),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
leading: Icon(icon, color: Colors.white70, size: 21),
leading: Icon(icon, color: Colors.blueGrey, size: 21),
title: Text(
title,
style: const TextStyle(
color: Colors.white,
color: Color(0xFF182235),
fontSize: 14,
),
),
@@ -98,7 +99,7 @@ class _ManagerViewState extends State<ManagerView> {
child: Text(
'Windows · 网络 ADB\n关闭窗口后保留在托盘',
style: TextStyle(
color: Colors.white54,
color: Colors.blueGrey,
height: 1.8,
fontSize: 12,
),
@@ -167,7 +168,12 @@ class _ManagerViewState extends State<ManagerView> {
],
),
),
if (m.refreshing) const LinearProgressIndicator(minHeight: 2),
SizedBox(
height: 3,
child: m.refreshing
? const LinearProgressIndicator(minHeight: 3)
: null,
),
Expanded(
child: Padding(
padding: const EdgeInsets.all(24),
@@ -252,8 +258,18 @@ class _ManagerViewState extends State<ManagerView> {
all.putIfAbsent(id, () => Device(id, false));
}
final rows = all.values
.where((d) => d.id.toLowerCase().contains(search.toLowerCase()))
.where(
(d) => '${d.id} ${d.computerName} ${d.agentId}'
.toLowerCase()
.contains(search.toLowerCase()),
)
.toList();
rows.sort((a, b) {
final host = '${a.computerName} ${a.agentId}'.compareTo(
'${b.computerName} ${b.agentId}',
);
return host != 0 ? host : a.id.compareTo(b.id);
});
return Column(
children: [
Row(
@@ -276,7 +292,7 @@ class _ManagerViewState extends State<ManagerView> {
child: TextField(
onChanged: (v) => setState(() => search = v),
decoration: const InputDecoration(
hintText: '搜索设备 ID',
hintText: '搜索手机或电脑名',
prefixIcon: Icon(Icons.search),
filled: true,
fillColor: Colors.white,
@@ -320,7 +336,24 @@ class _ManagerViewState extends State<ManagerView> {
: ListView.separated(
itemCount: rows.length,
separatorBuilder: (_, index) => const SizedBox(height: 12),
itemBuilder: (context, i) => deviceCard(rows[i]),
itemBuilder: (context, i) => Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (i == 0 || rows[i].agentId != rows[i - 1].agentId)
Padding(
padding: const EdgeInsets.only(top: 6, bottom: 10),
child: Text(
'电脑 · ${rows[i].computerName.isEmpty ? "未上报电脑名" : rows[i].computerName}${rows[i].agentId.isEmpty ? "" : " / ${rows[i].agentId}"}',
style: const TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: Colors.blueGrey,
),
),
),
deviceCard(rows[i]),
],
),
),
),
],
@@ -361,6 +394,13 @@ class _ManagerViewState extends State<ManagerView> {
fontSize: 17,
),
),
Text(
'电脑:${d.computerName.isEmpty ? "旧 Agent(未上报电脑名)" : d.computerName}${d.agentId.isEmpty ? "" : " · ${d.agentId}"}',
style: const TextStyle(
fontSize: 12,
color: Colors.blueGrey,
),
),
const SizedBox(height: 5),
Text(
s?.state ?? (d.busy ? '其他客户端占用' : '空闲 · 可连接'),
@@ -515,7 +555,12 @@ class _ManagerViewState extends State<ManagerView> {
children: [
Row(
children: [
const Text('最近 500 条 · 仅保存在内存'),
Expanded(
child: Text(
'最近 500 条 · 按天保存,单文件 5 MiB,保留 14 天\n${m.logDirectory}${m.diskLog.error == null ? "" : "\n日志写入失败:${m.diskLog.error}"}',
style: const TextStyle(fontSize: 12),
),
),
const Spacer(),
TextButton(
onPressed: () =>