修改赛事代入旧数据

app_business/lib/generated/track_offical.pb.dart

@@ -987,6 +987,8 @@ class MatchRegusterInfo extends $pb.GeneratedMessage {
     $2.Timestamp? eShowTime,
     $core.bool? isAllowChack,
     $core.bool? allowChackBtnAble,
+    $2.Timestamp? bTime,
+    $2.Timestamp? eTime,
   }) {
     final $result = create();
     if (id != null) {
@@ -1031,6 +1033,12 @@ class MatchRegusterInfo extends $pb.GeneratedMessage {
     if (allowChackBtnAble != null) {
       $result.allowChackBtnAble = allowChackBtnAble;
     }
+    if (bTime != null) {
+      $result.bTime = bTime;
+    }
+    if (eTime != null) {
+      $result.eTime = eTime;
+    }
     return $result;
   }
   MatchRegusterInfo._() : super();
@@ -1052,6 +1060,8 @@ class MatchRegusterInfo extends $pb.GeneratedMessage {
     ..aOM<$2.Timestamp>(12, _omitFieldNames ? '' : 'eShowTime', protoName: 'eShowTime', subBuilder: $2.Timestamp.create)
     ..aOB(13, _omitFieldNames ? '' : 'isAllowChack', protoName: 'isAllowChack')
     ..aOB(14, _omitFieldNames ? '' : 'allowChackBtnAble', protoName: 'allowChackBtnAble')
+    ..aOM<$2.Timestamp>(15, _omitFieldNames ? '' : 'BTime', protoName: 'BTime', subBuilder: $2.Timestamp.create)
+    ..aOM<$2.Timestamp>(16, _omitFieldNames ? '' : 'ETime', protoName: 'ETime', subBuilder: $2.Timestamp.create)
     ..hasRequiredFields = false
   ;
 
@@ -1199,6 +1209,28 @@ class MatchRegusterInfo extends $pb.GeneratedMessage {
   $core.bool hasAllowChackBtnAble() => $_has(13);
   @$pb.TagNumber(14)
   void clearAllowChackBtnAble() => clearField(14);
+
+  @$pb.TagNumber(15)
+  $2.Timestamp get bTime => $_getN(14);
+  @$pb.TagNumber(15)
+  set bTime($2.Timestamp v) { setField(15, v); }
+  @$pb.TagNumber(15)
+  $core.bool hasBTime() => $_has(14);
+  @$pb.TagNumber(15)
+  void clearBTime() => clearField(15);
+  @$pb.TagNumber(15)
+  $2.Timestamp ensureBTime() => $_ensure(14);
+
+  @$pb.TagNumber(16)
+  $2.Timestamp get eTime => $_getN(15);
+  @$pb.TagNumber(16)
+  set eTime($2.Timestamp v) { setField(16, v); }
+  @$pb.TagNumber(16)
+  $core.bool hasETime() => $_has(15);
+  @$pb.TagNumber(16)
+  void clearETime() => clearField(16);
+  @$pb.TagNumber(16)
+  $2.Timestamp ensureETime() => $_ensure(15);
 }
 
 ///

app_business/lib/generated/track_offical.pbjson.dart

@@ -241,6 +241,8 @@ const MatchRegusterInfo$json = {
     {'1': 'eShowTime', '3': 12, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'eShowTime'},
     {'1': 'isAllowChack', '3': 13, '4': 1, '5': 8, '10': 'isAllowChack'},
     {'1': 'allowChackBtnAble', '3': 14, '4': 1, '5': 8, '10': 'allowChackBtnAble'},
+    {'1': 'BTime', '3': 15, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'BTime'},
+    {'1': 'ETime', '3': 16, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'ETime'},
   ],
 };
 
@@ -255,7 +257,8 @@ final $typed_data.Uint8List matchRegusterInfoDescriptor = $convert.base64Decode(
     'ZS5wcm90b2J1Zi5UaW1lc3RhbXBSCWJTaG93VGltZRI4CgllU2hvd1RpbWUYDCABKAsyGi5nb2'
     '9nbGUucHJvdG9idWYuVGltZXN0YW1wUgllU2hvd1RpbWUSIgoMaXNBbGxvd0NoYWNrGA0gASgI'
     'Ugxpc0FsbG93Q2hhY2sSLAoRYWxsb3dDaGFja0J0bkFibGUYDiABKAhSEWFsbG93Q2hhY2tCdG'
-    '5BYmxl');
+    '5BYmxlEjAKBUJUaW1lGA8gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcFIFQlRpbWUS'
+    'MAoFRVRpbWUYECABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wUgVFVGltZQ==');
 
 @$core.Deprecated('Use toChackInsInfoDescriptor instead')
 const ToChackInsInfo$json = {

app_business/lib/view/home/dialog_event_register.dart

@@ -43,11 +43,11 @@ class RegisterDialogController extends GetxController {
   late final Iterable<EventInfo>? eventList;
   late final Object _args;
 
-  DateTime? eventDate;
+  Rx<DateTime?> eventDate = Rx(null);
   TimeOfDay? eventStartAt;
   TimeOfDay? eventEndAt;
 
-  DateTime? showDate;
+  Rx<DateTime?> showDate = Rx(null);
   TimeOfDay? showStartAt;
   TimeOfDay? showEndAt;
 
@@ -74,9 +74,9 @@ class RegisterDialogController extends GetxController {
       registerName = args.old.name;
       var d = args.old.eventStartAt;
 
-      eventDate = DateTime(d.day, d.month, d.day);
+      eventDate.value = DateTime(d.year, d.month, d.day);
       d = args.old.showStartAt;
-      showDate = DateTime(d.day, d.month, d.day);
+      showDate.value = DateTime(d.year, d.month, d.day);
       eventStartAt = TimeOfDay.fromDateTime(args.old.eventStartAt);
       eventEndAt = TimeOfDay.fromDateTime(args.old.eventStopAt);
 
@@ -93,7 +93,7 @@ class RegisterDialogController extends GetxController {
 
   void updateShowTime(DateTime? date, TimeOfDay? startAt, TimeOfDay? endAt) {
     if (date != null) {
-      showDate = date;
+      showDate.value = date;
     }
     if (startAt != null) {
       showStartAt = startAt;
@@ -105,7 +105,7 @@ class RegisterDialogController extends GetxController {
 
   void updateEventTime(DateTime? date, TimeOfDay? startAt, TimeOfDay? endAt) {
     if (date != null) {
-      eventDate = date;
+      eventDate.value = date;
     }
     if (startAt != null) {
       eventStartAt = startAt;
@@ -159,25 +159,25 @@ class RegisterDialog extends GetView<RegisterDialogController> {
                   : controller.registerName,
             ),
             const SizedBox(height: 21.34),
-            _DateTimeSelect(
+            Obx(() => _DateTimeSelect(
                 title: '比赛时间',
-                date: c.eventDate,
+                date: c.eventDate.value,
                 startAt: c.eventStartAt,
                 endAt: c.eventEndAt,
-                onChanged: c.updateEventTime),
+                onChanged: c.updateEventTime)),
             const SizedBox(height: 12),
-            _DateTimeSelect(
+            Obx(() => _DateTimeSelect(
                 title: '显示时间',
-                date: c.showDate,
+                date: c.showDate.value,
                 startAt: c.showStartAt,
                 endAt: c.showEndAt,
-                onChanged: c.updateShowTime),
+                onChanged: c.updateShowTime)),
             password('查询密码', c.hasPasswordQuery, (v) {
               c.passwordQuery = v;
             }),
-            password('赛事密码', c.hasPasswordEvent, (v) {
-              c.passwordEvent = v;
-            }),
+            // password('赛事密码', c.hasPasswordEvent, (v) {
+            //   c.passwordEvent = v;
+            // }),
             const SizedBox(height: 21.34),
             SizedBox(
                 width: double.infinity,
@@ -250,7 +250,7 @@ class RegisterDialog extends GetView<RegisterDialogController> {
       return;
     }
 
-    if (showDate == null) {
+    if (showDate.value == null) {
       Get.snackbar('错误', '请选择日期');
       return;
     }
@@ -263,7 +263,7 @@ class RegisterDialog extends GetView<RegisterDialogController> {
       Get.snackbar('错误', '请选择结束时间');
       return;
     }
-    if (evenDate == null) {
+    if (evenDate.value == null) {
       Get.snackbar('错误', '请选择日期');
       return;
     }
@@ -276,20 +276,20 @@ class RegisterDialog extends GetView<RegisterDialogController> {
       Get.snackbar('错误', '请选择结束时间');
       return;
     }
-    final eventStartAt = evenDate.copyWith(
-        hour: eventTimeStartAt.hour, minute: eventTimeStartAt.minute);
-    final eventStopAt = evenDate.copyWith(
-        hour: eventTimeStopAt.hour, minute: eventTimeStopAt.minute);
+    final eventStartAt = evenDate.value!
+        .copyWith(hour: eventTimeStartAt.hour, minute: eventTimeStartAt.minute);
+    final eventStopAt = evenDate.value!
+        .copyWith(hour: eventTimeStopAt.hour, minute: eventTimeStopAt.minute);
 
     if (eventStartAt.isAfter(eventStopAt)) {
       Get.snackbar('错误', '结束时间应晚于开始时间');
       return;
     }
 
-    final showStartAt = showDate.copyWith(
-        hour: showTimeStartAt.hour, minute: showTimeStartAt.minute);
-    final showStopAt = showDate.copyWith(
-        hour: showTimeStopAt.hour, minute: showTimeStopAt.minute);
+    final showStartAt = showDate.value!
+        .copyWith(hour: showTimeStartAt.hour, minute: showTimeStartAt.minute);
+    final showStopAt = showDate.value!
+        .copyWith(hour: showTimeStopAt.hour, minute: showTimeStopAt.minute);
 
     if (showStartAt.isAfter(showStopAt)) {
       Get.snackbar('错误', '结束时间应晚于开始时间');
@@ -396,6 +396,14 @@ class _DateTimeSelectState extends State<_DateTimeSelect> {
   TimeOfDay? startAt;
   TimeOfDay? endAt;
 
+  @override
+  void initState() {
+    date = widget.date;
+    startAt = widget.startAt;
+    endAt = widget.endAt;
+    super.initState();
+  }
+
   String? dateString(DateTime? d) {
     if (d != null) {
       return '${d.month}/${d.day}';

app_business/lib/view/home/event_manage/event_manage.dart

@@ -451,7 +451,9 @@ class EventTitle extends GetView<EventManagerController> {
                                     EventRegisterInfo()
                                       ..name = data.name
                                       ..showStartAt = data.showStartAt
-                                      ..showStopAt = data.showEndAt);
+                                      ..showStopAt = data.showEndAt
+                                      ..eventStartAt = data.eventStartAt
+                                      ..eventStopAt = data.eventEndAt);
                                 if (r != null) {
                                   controller.eventEdit(data.id, r);
                                 }

app_business/lib/view/home/event_manage/event_manage_controller.dart

@@ -21,6 +21,8 @@ class EventInManage {
   var endAt = '';
   var showStartAt = DateTime.now();
   var showEndAt = DateTime.now();
+  var eventStartAt = DateTime.now();
+  var eventEndAt = DateTime.now();
 }
 
 enum UserState { idle, hasRoute, isStart, isFinish }
@@ -108,6 +110,10 @@ class EventManagerController extends GetxController {
             ..isAllowCheckSwitch = e.allowChackBtnAble
             ..startAt = e.matchBt
             ..endAt = e.matchEt
+            ..showStartAt = e.bShowTime.toModel()
+            ..showEndAt = e.eShowTime.toModel()
+            ..eventStartAt = e.bTime.toModel()
+            ..eventEndAt = e.eTime.toModel()
             ..state = switch (e.state) {
               0 => EventState.idle,
               1 => EventState.start,