update

app_business/lib/view/home/field_control.dart

@@ -1,425 +1,184 @@
-import 'dart:async';
-
-import 'package:app_business/service/abase.dart';
-import 'package:common_pub/ui/map_view/map_view.dart';
-import 'package:common_pub/ui/map_view/view_map_cp.dart';
-import 'package:common_pub/ui/map_view/view_map_image.dart';
-import 'package:common_pub/ui/map_view/view_map_touch.dart';
-import 'package:common_pub/ui/map_view/view_map_trace_tail.dart';
-import 'package:common_pub/ui/map_view/view_map_user_point.dart';
-import 'package:common_pub/ui/map_view/view_plug_loading.dart';
-import 'package:common_pub/utils.dart';
-import 'package:flutter/material.dart';
-import 'package:track_common/generated/assets.dart';
 import 'package:track_common/service/map_watch.dart';
-import 'package:track_common/widget/no_select_map.dart';
+import 'package:track_common/track_common.dart';
+import 'package:track_common/view/home/field_control/field_control.dart';
+import 'package:track_common/view/home/field_control/field_control_controller.dart';
+import 'package:track_common/widget/prelude.dart';
 
-class FieldControl extends StatelessWidget {
-  const FieldControl({super.key});
+class FieldControlPageImpl extends FieldControlPage {
+  const FieldControlPageImpl({super.key});
 
   @override
-  Widget build(BuildContext context) {
-    return GetBuilder(
-        init: FieldControlController(),
-        builder: (c) {
-          return Container(
-              height: double.infinity,
-              width: double.infinity,
-              color: const Color(0xffc9c0c0),
-              alignment: Alignment.center,
-              child: Obx(() {
-                final mapWatch = c.mapWatch;
-                return mapWatch != null
-                    ? content(context, mapWatch, c)
-                    : const NoSelectMap();
-              }));
-        });
-  }
-
-  Widget content(BuildContext context, MapWatch map, FieldControlController c) {
-    final children = <Widget>[
-      ViewPlugLoading(map.plugMap),
-      ViewMapImage(map.plugMap),
-    ];
-
-    final focusUser = c.focusUser;
-    if (focusUser != null) {
-      children.add(ViewMapCP(
-        // key:UniqueKey(),
-        map.plugMap,
-        cpWantAndHistoryList: focusUser.cpList,
-        isHideRouteBeforeStart: false,
-        controller: c.viewCpController,
-      ));
-    }
-
-    children.addAll([
-      _ViewTrace(map: map, traceDuration: 30.seconds),
-      ViewMapTouch(map.plugMap)
-    ]);
-
-    return Row(
-      children: [
-        Expanded(
-            child: Column(
+  Widget get rightColumn {
+    return Obx(() => Container(
+        width: 263,
+        padding: const EdgeInsets.all(6.4),
+        height: double.infinity,
+        color: Colors.white,
+        child: Column(
           children: [
-            _MapView(),
-            // Expanded(
-            //     child: ViewMapStack(plug: map.plugMap, children: children)),
-            _MsgView(),
+            SizedBox(
+                width: double.infinity,
+                child: DarkButton(
+                    child: const Text('注册比赛'),
+                    onPressed: () {
+                      Get.dialog(RegisterDialog());
+                    })),
+            Expanded(
+              child: ListView(
+                children: controller.eventList
+                    .map((element) => eventView(element))
+                    .toList(),
+              ),
+            )
           ],
-        )),
-        _ActiveInfoView()
-      ],
-    );
+        )));
   }
-}
-
-class _MapView extends GetView<FieldControlController> {
-  @override
-  Widget build(BuildContext context) {
-    return Expanded(
-        child: ViewMapStack(
-      plug: controller.mapWatch!.plugMap,
-      children: [
-        Obx(() {
-          final map = controller.mapWatch!;
-          final children = <Widget>[
-            ViewPlugLoading(map.plugMap),
-            ViewMapImage(map.plugMap),
-          ];
-
-          final focusUser = controller.focusUser;
-          if (focusUser != null) {
-            children.add(ViewMapCP(
-              // key:UniqueKey(),
-              map.plugMap,
-              cpWantAndHistoryList: focusUser.cpList,
-              isHideRouteBeforeStart: false,
-              controller: controller.viewCpController,
-            ));
-          }
 
-          children.addAll([
-            _ViewTrace(map: map, traceDuration: 30.seconds),
-            ViewMapTouch(map.plugMap)
-          ]);
-          return SizedBox.expand(
-            child: Stack(
-              children: children,
-            ),
-          );
-        })
-      ],
-    ));
+  Widget eventView(EventOnMap event) {
+    return Card(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(3.56)),
+      child: Row(
+        children: [
+          Text(event.name),
+          Text('(${event.userList.length} 人)'),
+          const Spacer(),
+          IconButton(
+              onPressed: () {},
+              icon: const Icon(Icons.arrow_drop_down_outlined))
+        ],
+      ),
+    );
   }
 }
 
-class _ViewTrace extends GetView<FieldControlController> {
-  const _ViewTrace({required this.map, required this.traceDuration});
-
-  final MapWatch map;
-  final Duration traceDuration;
-
-  @override
-  Widget build(BuildContext context) {
-    return Obx(() {
-      final children = <Widget>[];
+class FieldControlControllerImpl extends FieldControlController {
+  var registerName = '';
+  TimeOfDay? registerStartAt;
+  TimeOfDay? registerStopAt;
 
-      for (final act in map.eventList) {
-        for (final user in act.userList) {
-          if (user.isHide.value) {
-            continue;
-          }
-          final trace = user.trace.lastOrNull;
-          final traceTailOnMap = <Offset>[];
-          final st = user.startAt;
-          for (final one in user.trace) {
-            if (DateTime.now().difference(st.add(one.ts)) < traceDuration) {
-              traceTailOnMap.add(one.onMap);
-            }
-          }
+  final registerStartAtController = TextEditingController();
+  final registerStopAtController = TextEditingController();
+}
 
-          if (trace != null) {
-            children.add(ViewMapTraceTail(
-              plug: map.plugMap,
-              onMapTrace: traceTailOnMap,
-              color: user.flag.value.color,
-            ));
-            children.add(ViewMapUserPoint(
-                key: UniqueKey(),
-                map.plugMap,
-                trace,
-                info: user.name,
-                color: user.flag.value.color));
-          }
-        }
-      }
+class RegisterDialog extends GetView<FieldControlController> {
+  const RegisterDialog({super.key});
 
-      return Stack(alignment: Alignment.topLeft, children: children);
-    });
-  }
-}
+  FieldControlControllerImpl get c => controller as FieldControlControllerImpl;
 
-class _ActiveInfoView extends GetView<FieldControlController> {
   @override
   Widget build(BuildContext context) {
-    return Obx(() => Container(
-          width: 370,
-          height: double.infinity,
-          color: Colors.white,
+    return AlertDialog(
+      title: const Center(
+          child: Text(
+        '注册比赛',
+        style: TextStyle(fontSize: 17),
+      )),
+      backgroundColor: Colors.white,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(17.78)),
+      content: SizedBox(
+          width: 75.38,
           child: ListView(
-            children: controller.eventList
-                .map((element) => activeView(element))
-                .toList(),
-          ),
-        ));
-  }
-
-  Widget activeView(EventOnMap info) {
-    final children = <Widget>[
-      Row(children: [
-        Expanded(
-            child: Text(
-          '${info.name} (${info.userList.length}人)',
-          maxLines: 1,
-        )),
-        const SizedBox(
-          width: 8,
-        ),
-        IconButton(
-            onPressed: () {
-              info.isHide.value = !info.isHide.value;
-            },
-            icon: info.isHide.value
-                ? const Icon(Icons.arrow_drop_down)
-                : const Icon(Icons.arrow_drop_up))
-      ]),
-    ];
-
-    if (!info.isHide.value) {
-      children.addAll([
-        Container(
-          decoration: BoxDecoration(
-              color: Colors.white, borderRadius: BorderRadius.circular(5)),
-          padding: const EdgeInsets.fromLTRB(26, 11, 26, 11),
-          child: Row(
+            shrinkWrap: true,
             children: [
-              const Text('广播'),
-              const Spacer(),
-              Image.asset(Assets.imagesIcCp, height: 20, width: 20),
-              Text(' ${info.cpAllCount}'),
-              const Spacer(),
-              const Text('全部隐藏'),
+              const _TextField(hint: '请选择活动'),
+              const SizedBox(height: 21.34),
+              _TextField(
+                  hint: '请输入名称',
+                  onChanged: (v) {
+                    c.registerName = v;
+                  }),
+              const SizedBox(height: 21.34),
+              Row(children: [
+                Expanded(
+                    child: _TextField(
+                        hint: '开始时间',
+                        readOnly: true,
+                        controller: c.registerStartAtController,
+                        onTap: () async {
+                          debug('onTap');
+                          final t =
+                              await _showTimePicker(context, c.registerStartAt);
+                          c.registerStartAt = t;
+                          if (t != null) {
+                            c.registerStartAtController.text = t.toString();
+                          }
+                        })),
+                const SizedBox(width: 15.64),
+                Expanded(
+                    child: _TextField(
+                        hint: '结束时间',
+                        readOnly: true,
+                        controller: c.registerStopAtController,
+                        onTap: () async {
+                          debug('onTap');
+                          final t =
+                              await _showTimePicker(context, c.registerStopAt);
+                          c.registerStopAt = t;
+                          if (t != null) {
+                            c.registerStopAtController.text = t.toString();
+                          }
+                        })),
+              ]),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Switch(value: true, onChanged: (v) {}),
+                  const Text('查询密码')
+                ],
+              ),
+              SizedBox(
+                  width: double.infinity,
+                  child: DarkButton(child: const Text('注 册'), onPressed: () {}))
             ],
-          ),
-        )
-      ]);
-      children
-          .addAll(info.userList.map((e) => _UserInfoView(data: e)).toList());
-    }
+          )),
+    );
+  }
 
-    return Container(
-      decoration: BoxDecoration(
-          color: const Color(0xffe0e0e0),
-          borderRadius: BorderRadius.circular(5)),
-      margin: const EdgeInsets.fromLTRB(9, 12, 9, 12),
-      padding: const EdgeInsets.all(9),
-      child: Column(
-        children: children,
-      ),
+  Future<TimeOfDay?> _showTimePicker(
+      BuildContext context, TimeOfDay? init) async {
+    final TimeOfDay? time = await showTimePicker(
+      context: context,
+      initialTime: init ?? TimeOfDay.now(),
     );
+    return time;
   }
 }
 
-class _UserInfoView extends GetView<FieldControlController> {
-  const _UserInfoView({required this.data});
+class _TextField extends StatelessWidget {
+  const _TextField(
+      {required this.hint,
+      this.onChanged,
+      this.readOnly = false,
+      this.onTap,
+      this.controller});
 
-  final UserOnMap data;
+  final String hint;
+  final void Function(String)? onChanged;
+  final bool readOnly;
+  final void Function()? onTap;
+  final TextEditingController? controller;
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-          color: Colors.white, borderRadius: BorderRadius.circular(5)),
-      padding: const EdgeInsets.fromLTRB(7, 11, 7, 11),
-      margin: const EdgeInsets.only(top: 5),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            children: [
-              Obx(() => Container(
-                  margin: const EdgeInsets.only(top: 2),
-                  decoration: BoxDecoration(
-                      color: data.flag.value.color,
-                      borderRadius: BorderRadius.circular(4)),
-                  width: 7,
-                  height: 16)),
-              const SizedBox(
-                width: 8,
-              ),
-              Expanded(
-                child: Text.rich(TextSpan(
-                    text: data.name,
-                    children: [TextSpan(text: ' [${data.routeName}]')])),
-              ),
-              GestureDetector(
-                onTap: () {
-                  final oldId = controller.focusUserId.value;
-                  if (oldId != null) {
-                    if (oldId == data.id) {
-                      controller.focusUserId.value = null;
-                      return;
-                    }
-                  }
-                  controller.focusUserId.value = data.id;
-                },
-                child: Obx(() => Icon(
-                      Icons.route,
-                      color: data.id != controller.focusUser?.id
-                          ? Colors.grey
-                          : const Color(0xffffbb77),
-                    )),
-              ),
-              const SizedBox(width: 8),
-              GestureDetector(
-                onTap: () {
-                  data.isHide.value = !data.isHide.value;
-                },
-                child: Obx(() => Icon(
-                      data.isHide.value
-                          ? Icons.visibility_off
-                          : Icons.visibility,
-                      color: data.isHide.value
-                          ? Colors.grey
-                          : const Color(0xffffbb77),
-                    )),
-              )
-            ],
-          ),
-          Container(
-            margin: const EdgeInsets.only(left: 14),
-            child: Row(
-              children: [
-                container(null, cpInfo, Colors.blue),
-                container(
-                    const Icon(
-                      Icons.favorite,
-                      size: 13,
-                      color: Colors.white,
-                    ),
-                    ' ${hr == 0 ? '--' : hr}',
-                    data.heartRatePercent.toHRPColor()),
-                container(null, paceInfo, data.pace.color)
-              ],
+    return SizedBox(
+      height: 34.13,
+      child: TextField(
+        controller: controller,
+        maxLines: 1,
+        style: const TextStyle(fontSize: 11.38),
+        onChanged: onChanged,
+        onTap: onTap,
+        readOnly: readOnly,
+        decoration: InputDecoration(
+            hintText: hint,
+            border: OutlineInputBorder(
+              borderSide: const BorderSide(
+                  width: 0.71, color: Color(0xff818181)), //<-- SEE HERE
+              borderRadius: BorderRadius.circular(2.13),
             ),
-          ),
-          const SizedBox(height: 5),
-          Container(
-              margin: const EdgeInsets.only(left: 14),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text('距离 ${data.nextDistance.toString()}'),
-                  Text('时间 ${data.duration.toAppString()}'),
-                  Text('里程 ${data.distance.toString()}'),
-                ],
-              ))
-        ],
-      ),
-    );
-  }
-
-  int get hr {
-    return data.hrInfo.lastOrNull?.hr ?? 0;
-  }
-
-  String get cpInfo {
-    final next = data.nextWant;
-    return next != null ? '${data.nextCPSN}点(${next.areaId})' : '--';
-  }
-
-  String get paceInfo {
-    Duration;
-    return data.pace.toString();
-  }
-
-  Widget container(Widget? icon, String text, Color color) {
-    final children = <Widget>[];
-    if (icon != null) {
-      children.add(icon);
-    }
-    children.add(
-        Text(text, style: const TextStyle(color: Colors.white, fontSize: 14)));
-
-    return Container(
-      height: 20,
-      padding: const EdgeInsets.fromLTRB(10, 0, 12, 0),
-      margin: const EdgeInsets.only(right: 6),
-      alignment: Alignment.center,
-      decoration:
-          BoxDecoration(color: color, borderRadius: BorderRadius.circular(9)),
-      child: Row(
-        children: children,
+            isDense: true,
+            contentPadding: const EdgeInsets.all(8.53)),
       ),
     );
   }
 }
-
-class _MsgView extends GetView<FieldControlController> {
-  @override
-  Widget build(BuildContext context) {
-    return Container();
-  }
-}
-
-class FieldControlController extends GetxController {
-  @override
-  void onInit() {
-    super.onInit();
-    final map = mapWatch;
-    if (map != null) {
-      eventList.bindStream(map.eventList.stream);
-    }
-
-    _subActive = eventList.listen((p0) {
-      final user = focusUser;
-      if (user != null) {
-        viewCpController.setCPList(user.cpList);
-      }
-    });
-  }
-
-  @override
-  void onClose() {
-    super.onClose();
-    _subActive?.cancel();
-  }
-
-  final viewCpController = ViewMapCPController();
-  StreamSubscription<List<EventOnMap>>? _subActive;
-  final _mapService = Get.find<MapWatchService>();
-  MapWatch? get mapWatch => _mapService.instance;
-  final eventList = <EventOnMap>[].obs;
-  final Rx<int?> focusUserId = Rx(null);
-
-  UserOnMap? findFocusUser(List<EventOnMap> list) {
-    if (focusUserId.value == null) {
-      return null;
-    }
-
-    for (final act in list) {
-      for (final user in act.userList) {
-        if (user.id == focusUserId.value) {
-          return user;
-        }
-      }
-    }
-    return null;
-  }
-
-  UserOnMap? get focusUser {
-    return findFocusUser(eventList);
-  }
-}

app_business/lib/view/home/home.dart

@@ -1,9 +1,11 @@
-import 'package:app_business/view/home/field_control.dart';
-import 'package:app_business/view/home/maplist.dart';
 import 'package:get/get.dart';
 import 'package:track_common/view.dart';
+import 'package:track_common/view/home/field_control/field_control_controller.dart';
 import 'package:track_common/view/home/map/map_page.dart';
 
+import 'field_control.dart';
+import 'maplist.dart';
+
 class HomeControllerImpl extends HomeController {
   @override
   int get initTabIdx => 0;
@@ -19,10 +21,10 @@ class HomeControllerImpl extends HomeController {
                 })),
         HomeTab(
             '场控',
-            () => GetBuilder(
-                init: FieldControlController(),
+            () => GetBuilder<FieldControlController>(
+                init: FieldControlControllerImpl(),
                 builder: (c) {
-                  return const FieldControl();
+                  return FieldControlPageImpl();
                 }))
       ];
 }

libs/track_common/lib/view/home/field_control/field_control.dart

@@ -11,7 +11,7 @@ import 'package:track_common/widget/prelude.dart';
 import '../../../service/map_watch.dart';
 import 'field_control_controller.dart';
 
-class FieldControlPage extends GetView<FieldControlController> {
+abstract class FieldControlPage extends GetView<FieldControlController> {
   const FieldControlPage({super.key});
 
   @override
@@ -74,10 +74,12 @@ class FieldControlPage extends GetView<FieldControlController> {
             _MsgView(),
           ],
         )),
-        _ActiveInfoView()
+        rightColumn
       ],
     );
   }
+
+  Widget get rightColumn;
 }
 
 class _MapView extends GetView<FieldControlController> {
@@ -174,7 +176,7 @@ class _ActiveInfoView extends GetView<FieldControlController> {
           height: double.infinity,
           color: Colors.white,
           child: ListView(
-            children: controller.activeList
+            children: controller.eventList
                 .map((element) => activeView(element))
                 .toList(),
           ),

libs/track_common/lib/view/home/field_control/field_control_controller.dart

@@ -12,10 +12,10 @@ class FieldControlController extends GetxController {
     super.onInit();
     final map = _mapWatch.instance;
     if (map != null) {
-      activeList.bindStream(map.eventList.stream);
+      eventList.bindStream(map.eventList.stream);
     }
 
-    _subActive = activeList.listen((p0) {
+    _subActive = eventList.listen((p0) {
       final user = focusUser;
       if (user != null) {
         viewCpController.setCPList(user.cpList);
@@ -32,7 +32,7 @@ class FieldControlController extends GetxController {
   final viewCpController = ViewMapCPController();
   StreamSubscription<List<EventOnMap>>? _subActive;
   MapWatch? get mapWatch => _mapWatch.instance;
-  final activeList = <EventOnMap>[].obs;
+  final eventList = <EventOnMap>[].obs;
   final Rx<int?> focusUserId = Rx(null);
 
   UserOnMap? findFocusUser(List<EventOnMap> list) {
@@ -51,6 +51,6 @@ class FieldControlController extends GetxController {
   }
 
   UserOnMap? get focusUser {
-    return findFocusUser(activeList);
+    return findFocusUser(eventList);
   }
 }

libs/track_common/lib/widget/no_select_map.dart

@@ -1,20 +0,0 @@
-import 'package:track_common/widget/prelude.dart';
-
-class NoSelectMap extends StatelessWidget {
-  const NoSelectMap({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Image.asset(Assets.imagesIcNoData, height: 64, package: package),
-          const SizedBox(height: 25),
-          const Text('没有数据, 请选择地图',
-              style: TextStyle(color: Color(0xff707070), fontSize: 18.5)),
-        ],
-      ),
-    );
-  }
-}

libs/track_common/lib/widget/prelude.dart

@@ -1,7 +1,7 @@
+export 'package:common_pub/ui/dark_button.dart';
 export 'package:flutter/material.dart';
 export 'package:get/get.dart';
 
 export '../generated/assets.dart';
-export 'no_select_map.dart';
 
 const package = 'track_common';