作业首页和机器状态的数据
This commit is contained in:
@@ -15,6 +15,7 @@ import '../features/devices/presentation/bloc/devices_cubit.dart';
|
||||
import '../features/remote_control/presentation/bloc/remote_control_cubit.dart';
|
||||
import '../features/remote_control/presentation/bloc/remote_control_state.dart';
|
||||
import '../core/logging/log_time.dart';
|
||||
import 'control_mode_text.dart';
|
||||
|
||||
const int DATA_TIMEOUT_SECONDS = 15;
|
||||
|
||||
@@ -406,8 +407,10 @@ class _DeviceStatusModalState extends State<DeviceStatusModal> {
|
||||
).translate('running_status.control_mode'),
|
||||
),
|
||||
_buildTableCell(
|
||||
AppLocalizations.of(context).translate(
|
||||
_getControlModeKey(int.tryParse(status.controlMode) ?? 0),
|
||||
// 统一走共用映射:后端没给 = 未知,不再兜成「本地控制」
|
||||
controlModeDisplayText(
|
||||
AppLocalizations.of(context),
|
||||
status.controlMode,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -457,14 +460,9 @@ class _DeviceStatusModalState extends State<DeviceStatusModal> {
|
||||
);
|
||||
}
|
||||
|
||||
String _getControlModeKey(int modeValue) {
|
||||
switch (modeValue) {
|
||||
case 3:
|
||||
return 'running_status.remote_control';
|
||||
default:
|
||||
return 'running_status.local_control';
|
||||
}
|
||||
}
|
||||
// 控制模式文案已下沉到 lib/components/control_mode_text.dart,
|
||||
// 与运行状态页、设备详情、PV 遥控等共用一份映射(原来此处 default 一律当「本地控制」,
|
||||
// 把 0=未知、2=自主任务和「后端根本没给」三种情况全显示成了本地)。
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
||||
@@ -19,65 +19,121 @@ Future<void> showInputConfirmDialog({
|
||||
required Function(String inputText) onConfirm,
|
||||
String? Function(String inputText)? inputValidator,
|
||||
double? maxWidth,
|
||||
String? initialText,
|
||||
}) async {
|
||||
// 输入框控制器
|
||||
final TextEditingController controller = TextEditingController();
|
||||
// 输入框控制器(initialText 非空时预填,用于改名等回显场景)
|
||||
final TextEditingController controller = TextEditingController(
|
||||
text: initialText ?? '',
|
||||
);
|
||||
|
||||
await showDialog(
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return AlertDialog(
|
||||
title: Text(title),
|
||||
content: SizedBox(
|
||||
// maxWidth 为空时不加约束,保持原有行为
|
||||
width: maxWidth,
|
||||
child: TextField(
|
||||
controller: controller,
|
||||
decoration: InputDecoration(
|
||||
hintText: hintText,
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: labelText,
|
||||
// 横屏页面(如区域编辑器)键盘常占半屏:AlertDialog 的 title/actions 不随
|
||||
// scrollable 滚动,短屏下会被撑出 RenderFlex 溢出、输入框/按钮被裁而“不好改”。
|
||||
// 改为自定义 Dialog:键盘弹出时贴顶对齐 + 整体限高 + 字段区可滚,按钮永远可见;
|
||||
// 没键盘时(如竖屏)仍居中,不改变原有观感。
|
||||
final MediaQueryData mq = MediaQuery.of(context);
|
||||
final double keyboardInset = mq.viewInsets.bottom;
|
||||
final bool lifted = keyboardInset > 0;
|
||||
// 弹窗可用最大高度:屏高 - 键盘 - 顶部安全区,再夹到一个合理区间
|
||||
final double maxDialogHeight = (mq.size.height - keyboardInset - 24).clamp(
|
||||
140.0,
|
||||
520.0,
|
||||
);
|
||||
final double contentWidth = (maxWidth ?? 280) + 40; // 加左右 20 padding
|
||||
return Dialog(
|
||||
alignment: lifted ? Alignment.topCenter : Alignment.center,
|
||||
backgroundColor: Colors.white,
|
||||
surfaceTintColor: Colors.transparent,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
insetPadding: EdgeInsets.fromLTRB(
|
||||
24,
|
||||
mq.padding.top + (lifted ? 12 : 24),
|
||||
24,
|
||||
keyboardInset + 12,
|
||||
),
|
||||
child: ConstrainedBox(
|
||||
constraints: BoxConstraints(
|
||||
maxHeight: maxDialogHeight,
|
||||
maxWidth: contentWidth,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(20, 16, 20, 8),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
// 字段区单独可滚:极矮屏下也能滚到输入框,不会把标题/按钮顶出去
|
||||
Flexible(
|
||||
child: SingleChildScrollView(
|
||||
child: TextField(
|
||||
controller: controller,
|
||||
decoration: InputDecoration(
|
||||
hintText: hintText,
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: labelText,
|
||||
),
|
||||
autofocus: true, // 自动聚焦输入框
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
// 按钮行固定在底部,始终可见可点
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
// 取消按钮
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Text(cancelText),
|
||||
),
|
||||
// 确认按钮
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
// 获取输入文本并去空格
|
||||
final String inputText = controller.text.trim();
|
||||
|
||||
// 1. 执行自定义校验
|
||||
if (inputValidator != null) {
|
||||
final String? errorMsg = inputValidator(inputText);
|
||||
if (errorMsg != null) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(errorMsg),
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 执行确认回调
|
||||
onConfirm(inputText);
|
||||
|
||||
// 3. 关闭弹窗
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Text(confirmText),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
autofocus: true, // 自动聚焦输入框
|
||||
),
|
||||
),
|
||||
actions: [
|
||||
// 取消按钮
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Text(cancelText),
|
||||
),
|
||||
// 确认按钮
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
// 获取输入文本并去空格
|
||||
final String inputText = controller.text.trim();
|
||||
|
||||
// 1. 执行自定义校验
|
||||
if (inputValidator != null) {
|
||||
final String? errorMsg = inputValidator(inputText);
|
||||
if (errorMsg != null) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(errorMsg),
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 执行确认回调
|
||||
onConfirm(inputText);
|
||||
|
||||
// 3. 关闭弹窗
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Text(confirmText),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user