周睿 пре 2 година
родитељ
комит
6f1e096077

+ 0 - 92
app_business/lib/generated/base.pb.dart

@@ -2944,98 +2944,6 @@ class AnswerDetailInfo extends $pb.GeneratedMessage {
   void clearIsAnswer() => clearField(8);
 }
 
-class ToActivityRegusterAddRequest extends $pb.GeneratedMessage {
-  factory ToActivityRegusterAddRequest({
-    $core.String? regName,
-    $fixnum.Int64? startSecond,
-    $fixnum.Int64? endSecond,
-    $core.String? organizer,
-  }) {
-    final $result = create();
-    if (regName != null) {
-      $result.regName = regName;
-    }
-    if (startSecond != null) {
-      $result.startSecond = startSecond;
-    }
-    if (endSecond != null) {
-      $result.endSecond = endSecond;
-    }
-    if (organizer != null) {
-      $result.organizer = organizer;
-    }
-    return $result;
-  }
-  ToActivityRegusterAddRequest._() : super();
-  factory ToActivityRegusterAddRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ToActivityRegusterAddRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ToActivityRegusterAddRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'base.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'regName', protoName: 'regName')
-    ..aInt64(2, _omitFieldNames ? '' : 'startSecond', protoName: 'startSecond')
-    ..aInt64(3, _omitFieldNames ? '' : 'endSecond', protoName: 'endSecond')
-    ..aOS(4, _omitFieldNames ? '' : 'organizer')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  ToActivityRegusterAddRequest clone() => ToActivityRegusterAddRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  ToActivityRegusterAddRequest copyWith(void Function(ToActivityRegusterAddRequest) updates) => super.copyWith((message) => updates(message as ToActivityRegusterAddRequest)) as ToActivityRegusterAddRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ToActivityRegusterAddRequest create() => ToActivityRegusterAddRequest._();
-  ToActivityRegusterAddRequest createEmptyInstance() => create();
-  static $pb.PbList<ToActivityRegusterAddRequest> createRepeated() => $pb.PbList<ToActivityRegusterAddRequest>();
-  @$core.pragma('dart2js:noInline')
-  static ToActivityRegusterAddRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ToActivityRegusterAddRequest>(create);
-  static ToActivityRegusterAddRequest? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get regName => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set regName($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasRegName() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearRegName() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $fixnum.Int64 get startSecond => $_getI64(1);
-  @$pb.TagNumber(2)
-  set startSecond($fixnum.Int64 v) { $_setInt64(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasStartSecond() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearStartSecond() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $fixnum.Int64 get endSecond => $_getI64(2);
-  @$pb.TagNumber(3)
-  set endSecond($fixnum.Int64 v) { $_setInt64(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasEndSecond() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearEndSecond() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.String get organizer => $_getSZ(3);
-  @$pb.TagNumber(4)
-  set organizer($core.String v) { $_setString(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasOrganizer() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearOrganizer() => clearField(4);
-}
-
 class ToActivityRegusterEditRequest extends $pb.GeneratedMessage {
   factory ToActivityRegusterEditRequest({
     $core.int? regId,

+ 6 - 0
app_business/lib/generated/base.pbenum.dart

@@ -77,6 +77,7 @@ class UserType extends $pb.ProtobufEnum {
   static const UserType IPAdmin = UserType._(3, _omitEnumNames ? '' : 'IPAdmin');
   static const UserType SysAdmin = UserType._(4, _omitEnumNames ? '' : 'SysAdmin');
   static const UserType ToAdmin = UserType._(5, _omitEnumNames ? '' : 'ToAdmin');
+  static const UserType CoopToAdmin = UserType._(6, _omitEnumNames ? '' : 'CoopToAdmin');
 
   static const $core.List<UserType> values = <UserType> [
     UnDefine,
@@ -85,6 +86,7 @@ class UserType extends $pb.ProtobufEnum {
     IPAdmin,
     SysAdmin,
     ToAdmin,
+    CoopToAdmin,
   ];
 
   static final $core.Map<$core.int, UserType> _byValue = $pb.ProtobufEnum.initByValue(values);
@@ -100,6 +102,8 @@ class LoginSource extends $pb.ProtobufEnum {
   static const LoginSource WebAdmin = LoginSource._(2, _omitEnumNames ? '' : 'WebAdmin');
   static const LoginSource ShopApp = LoginSource._(3, _omitEnumNames ? '' : 'ShopApp');
   static const LoginSource ToApp = LoginSource._(4, _omitEnumNames ? '' : 'ToApp');
+  static const LoginSource CoopToWebAdmin = LoginSource._(5, _omitEnumNames ? '' : 'CoopToWebAdmin');
+  static const LoginSource CoopToApp = LoginSource._(6, _omitEnumNames ? '' : 'CoopToApp');
 
   static const $core.List<LoginSource> values = <LoginSource> [
     UnDef,
@@ -107,6 +111,8 @@ class LoginSource extends $pb.ProtobufEnum {
     WebAdmin,
     ShopApp,
     ToApp,
+    CoopToWebAdmin,
+    CoopToApp,
   ];
 
   static final $core.Map<$core.int, LoginSource> _byValue = $pb.ProtobufEnum.initByValue(values);

+ 5 - 19
app_business/lib/generated/base.pbjson.dart

@@ -67,13 +67,14 @@ const UserType$json = {
     {'1': 'IPAdmin', '2': 3},
     {'1': 'SysAdmin', '2': 4},
     {'1': 'ToAdmin', '2': 5},
+    {'1': 'CoopToAdmin', '2': 6},
   ],
 };
 
 /// Descriptor for `UserType`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List userTypeDescriptor = $convert.base64Decode(
     'CghVc2VyVHlwZRIMCghVbkRlZmluZRAAEgsKB0FwcFVzZXIQARINCglQYXJrQWRtaW4QAhILCg'
-    'dJUEFkbWluEAMSDAoIU3lzQWRtaW4QBBILCgdUb0FkbWluEAU=');
+    'dJUEFkbWluEAMSDAoIU3lzQWRtaW4QBBILCgdUb0FkbWluEAUSDwoLQ29vcFRvQWRtaW4QBg==');
 
 @$core.Deprecated('Use loginSourceDescriptor instead')
 const LoginSource$json = {
@@ -84,13 +85,15 @@ const LoginSource$json = {
     {'1': 'WebAdmin', '2': 2},
     {'1': 'ShopApp', '2': 3},
     {'1': 'ToApp', '2': 4},
+    {'1': 'CoopToWebAdmin', '2': 5},
+    {'1': 'CoopToApp', '2': 6},
   ],
 };
 
 /// Descriptor for `LoginSource`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List loginSourceDescriptor = $convert.base64Decode(
     'CgtMb2dpblNvdXJjZRIJCgVVbkRlZhAAEgsKB1VzZXJBcHAQARIMCghXZWJBZG1pbhACEgsKB1'
-    'Nob3BBcHAQAxIJCgVUb0FwcBAE');
+    'Nob3BBcHAQAxIJCgVUb0FwcBAEEhIKDkNvb3BUb1dlYkFkbWluEAUSDQoJQ29vcFRvQXBwEAY=');
 
 @$core.Deprecated('Use smsTypeDescriptor instead')
 const SmsType$json = {
@@ -776,23 +779,6 @@ final $typed_data.Uint8List answerDetailInfoDescriptor = $convert.base64Decode(
     'bnN3ZXJDb3JyZWN0GAcgASgIUg1hbnN3ZXJDb3JyZWN0EhoKCGlzQW5zd2VyGAggASgIUghpc0'
     'Fuc3dlcg==');
 
-@$core.Deprecated('Use toActivityRegusterAddRequestDescriptor instead')
-const ToActivityRegusterAddRequest$json = {
-  '1': 'ToActivityRegusterAddRequest',
-  '2': [
-    {'1': 'regName', '3': 1, '4': 1, '5': 9, '10': 'regName'},
-    {'1': 'startSecond', '3': 2, '4': 1, '5': 3, '10': 'startSecond'},
-    {'1': 'endSecond', '3': 3, '4': 1, '5': 3, '10': 'endSecond'},
-    {'1': 'organizer', '3': 4, '4': 1, '5': 9, '10': 'organizer'},
-  ],
-};
-
-/// Descriptor for `ToActivityRegusterAddRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List toActivityRegusterAddRequestDescriptor = $convert.base64Decode(
-    'ChxUb0FjdGl2aXR5UmVndXN0ZXJBZGRSZXF1ZXN0EhgKB3JlZ05hbWUYASABKAlSB3JlZ05hbW'
-    'USIAoLc3RhcnRTZWNvbmQYAiABKANSC3N0YXJ0U2Vjb25kEhwKCWVuZFNlY29uZBgDIAEoA1IJ'
-    'ZW5kU2Vjb25kEhwKCW9yZ2FuaXplchgEIAEoCVIJb3JnYW5pemVy');
-
 @$core.Deprecated('Use toActivityRegusterEditRequestDescriptor instead')
 const ToActivityRegusterEditRequest$json = {
   '1': 'ToActivityRegusterEditRequest',

+ 505 - 0
app_business/lib/generated/track_offical.pb.dart

@@ -11,3 +11,508 @@
 
 import 'dart:core' as $core;
 
+import 'package:fixnum/fixnum.dart' as $fixnum;
+import 'package:protobuf/protobuf.dart' as $pb;
+
+import 'base.pb.dart' as $0;
+import 'google/protobuf/timestamp.pb.dart' as $2;
+
+class ToActivityListReply extends $pb.GeneratedMessage {
+  factory ToActivityListReply({
+    $core.Iterable<$0.ToActionBasicInfo>? list,
+  }) {
+    final $result = create();
+    if (list != null) {
+      $result.list.addAll(list);
+    }
+    return $result;
+  }
+  ToActivityListReply._() : super();
+  factory ToActivityListReply.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ToActivityListReply.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ToActivityListReply', package: const $pb.PackageName(_omitMessageNames ? '' : 'to.v1'), createEmptyInstance: create)
+    ..pc<$0.ToActionBasicInfo>(1, _omitFieldNames ? '' : 'list', $pb.PbFieldType.PM, subBuilder: $0.ToActionBasicInfo.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  ToActivityListReply clone() => ToActivityListReply()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ToActivityListReply copyWith(void Function(ToActivityListReply) updates) => super.copyWith((message) => updates(message as ToActivityListReply)) as ToActivityListReply;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static ToActivityListReply create() => ToActivityListReply._();
+  ToActivityListReply createEmptyInstance() => create();
+  static $pb.PbList<ToActivityListReply> createRepeated() => $pb.PbList<ToActivityListReply>();
+  @$core.pragma('dart2js:noInline')
+  static ToActivityListReply getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ToActivityListReply>(create);
+  static ToActivityListReply? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<$0.ToActionBasicInfo> get list => $_getList(0);
+}
+
+class ToMatchRegusterListRequest extends $pb.GeneratedMessage {
+  factory ToMatchRegusterListRequest({
+    $core.int? mapId,
+    $fixnum.Int64? startSecond,
+  }) {
+    final $result = create();
+    if (mapId != null) {
+      $result.mapId = mapId;
+    }
+    if (startSecond != null) {
+      $result.startSecond = startSecond;
+    }
+    return $result;
+  }
+  ToMatchRegusterListRequest._() : super();
+  factory ToMatchRegusterListRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ToMatchRegusterListRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ToMatchRegusterListRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'to.v1'), createEmptyInstance: create)
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'mapId', $pb.PbFieldType.O3, protoName: 'mapId')
+    ..aInt64(2, _omitFieldNames ? '' : 'startSecond', protoName: 'startSecond')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  ToMatchRegusterListRequest clone() => ToMatchRegusterListRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ToMatchRegusterListRequest copyWith(void Function(ToMatchRegusterListRequest) updates) => super.copyWith((message) => updates(message as ToMatchRegusterListRequest)) as ToMatchRegusterListRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static ToMatchRegusterListRequest create() => ToMatchRegusterListRequest._();
+  ToMatchRegusterListRequest createEmptyInstance() => create();
+  static $pb.PbList<ToMatchRegusterListRequest> createRepeated() => $pb.PbList<ToMatchRegusterListRequest>();
+  @$core.pragma('dart2js:noInline')
+  static ToMatchRegusterListRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ToMatchRegusterListRequest>(create);
+  static ToMatchRegusterListRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get mapId => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set mapId($core.int v) { $_setSignedInt32(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasMapId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearMapId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $fixnum.Int64 get startSecond => $_getI64(1);
+  @$pb.TagNumber(2)
+  set startSecond($fixnum.Int64 v) { $_setInt64(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasStartSecond() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearStartSecond() => clearField(2);
+}
+
+class ToMatchRegusterListReply extends $pb.GeneratedMessage {
+  factory ToMatchRegusterListReply({
+    $core.Iterable<MatchRegusterInfo>? list,
+  }) {
+    final $result = create();
+    if (list != null) {
+      $result.list.addAll(list);
+    }
+    return $result;
+  }
+  ToMatchRegusterListReply._() : super();
+  factory ToMatchRegusterListReply.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ToMatchRegusterListReply.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ToMatchRegusterListReply', package: const $pb.PackageName(_omitMessageNames ? '' : 'to.v1'), createEmptyInstance: create)
+    ..pc<MatchRegusterInfo>(1, _omitFieldNames ? '' : 'list', $pb.PbFieldType.PM, subBuilder: MatchRegusterInfo.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  ToMatchRegusterListReply clone() => ToMatchRegusterListReply()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ToMatchRegusterListReply copyWith(void Function(ToMatchRegusterListReply) updates) => super.copyWith((message) => updates(message as ToMatchRegusterListReply)) as ToMatchRegusterListReply;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static ToMatchRegusterListReply create() => ToMatchRegusterListReply._();
+  ToMatchRegusterListReply createEmptyInstance() => create();
+  static $pb.PbList<ToMatchRegusterListReply> createRepeated() => $pb.PbList<ToMatchRegusterListReply>();
+  @$core.pragma('dart2js:noInline')
+  static ToMatchRegusterListReply getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ToMatchRegusterListReply>(create);
+  static ToMatchRegusterListReply? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<MatchRegusterInfo> get list => $_getList(0);
+}
+
+class MatchRegusterInfo extends $pb.GeneratedMessage {
+  factory MatchRegusterInfo({
+    $core.int? id,
+    $core.String? name,
+    $core.int? totalUserNum,
+    $core.String? qrCode,
+    $core.bool? isAllowEdit,
+    $core.Iterable<ToChackInsInfo>? userList,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    if (totalUserNum != null) {
+      $result.totalUserNum = totalUserNum;
+    }
+    if (qrCode != null) {
+      $result.qrCode = qrCode;
+    }
+    if (isAllowEdit != null) {
+      $result.isAllowEdit = isAllowEdit;
+    }
+    if (userList != null) {
+      $result.userList.addAll(userList);
+    }
+    return $result;
+  }
+  MatchRegusterInfo._() : super();
+  factory MatchRegusterInfo.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory MatchRegusterInfo.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MatchRegusterInfo', package: const $pb.PackageName(_omitMessageNames ? '' : 'to.v1'), createEmptyInstance: create)
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.O3)
+    ..aOS(2, _omitFieldNames ? '' : 'name')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'totalUserNum', $pb.PbFieldType.O3, protoName: 'totalUserNum')
+    ..aOS(4, _omitFieldNames ? '' : 'qrCode', protoName: 'qrCode')
+    ..aOB(5, _omitFieldNames ? '' : 'isAllowEdit', protoName: 'isAllowEdit')
+    ..pc<ToChackInsInfo>(6, _omitFieldNames ? '' : 'userList', $pb.PbFieldType.PM, protoName: 'userList', subBuilder: ToChackInsInfo.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  MatchRegusterInfo clone() => MatchRegusterInfo()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  MatchRegusterInfo copyWith(void Function(MatchRegusterInfo) updates) => super.copyWith((message) => updates(message as MatchRegusterInfo)) as MatchRegusterInfo;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MatchRegusterInfo create() => MatchRegusterInfo._();
+  MatchRegusterInfo createEmptyInstance() => create();
+  static $pb.PbList<MatchRegusterInfo> createRepeated() => $pb.PbList<MatchRegusterInfo>();
+  @$core.pragma('dart2js:noInline')
+  static MatchRegusterInfo getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<MatchRegusterInfo>(create);
+  static MatchRegusterInfo? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) { $_setSignedInt32(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get name => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set name($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearName() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get totalUserNum => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set totalUserNum($core.int v) { $_setSignedInt32(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasTotalUserNum() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearTotalUserNum() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get qrCode => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set qrCode($core.String v) { $_setString(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasQrCode() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQrCode() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.bool get isAllowEdit => $_getBF(4);
+  @$pb.TagNumber(5)
+  set isAllowEdit($core.bool v) { $_setBool(4, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasIsAllowEdit() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearIsAllowEdit() => clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.List<ToChackInsInfo> get userList => $_getList(5);
+}
+
+class ToChackInsInfo extends $pb.GeneratedMessage {
+  factory ToChackInsInfo({
+    $core.int? marId,
+    $core.int? oId,
+    $core.String? nickname,
+    $core.String? phone,
+    $core.String? chackInsTime,
+  }) {
+    final $result = create();
+    if (marId != null) {
+      $result.marId = marId;
+    }
+    if (oId != null) {
+      $result.oId = oId;
+    }
+    if (nickname != null) {
+      $result.nickname = nickname;
+    }
+    if (phone != null) {
+      $result.phone = phone;
+    }
+    if (chackInsTime != null) {
+      $result.chackInsTime = chackInsTime;
+    }
+    return $result;
+  }
+  ToChackInsInfo._() : super();
+  factory ToChackInsInfo.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ToChackInsInfo.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ToChackInsInfo', package: const $pb.PackageName(_omitMessageNames ? '' : 'to.v1'), createEmptyInstance: create)
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'marId', $pb.PbFieldType.O3, protoName: 'marId')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'oId', $pb.PbFieldType.O3, protoName: 'oId')
+    ..aOS(3, _omitFieldNames ? '' : 'nickname')
+    ..aOS(4, _omitFieldNames ? '' : 'phone')
+    ..aOS(5, _omitFieldNames ? '' : 'chackInsTime', protoName: 'chackInsTime')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  ToChackInsInfo clone() => ToChackInsInfo()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ToChackInsInfo copyWith(void Function(ToChackInsInfo) updates) => super.copyWith((message) => updates(message as ToChackInsInfo)) as ToChackInsInfo;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static ToChackInsInfo create() => ToChackInsInfo._();
+  ToChackInsInfo createEmptyInstance() => create();
+  static $pb.PbList<ToChackInsInfo> createRepeated() => $pb.PbList<ToChackInsInfo>();
+  @$core.pragma('dart2js:noInline')
+  static ToChackInsInfo getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ToChackInsInfo>(create);
+  static ToChackInsInfo? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get marId => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set marId($core.int v) { $_setSignedInt32(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasMarId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearMarId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get oId => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set oId($core.int v) { $_setSignedInt32(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasOId() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearOId() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get nickname => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set nickname($core.String v) { $_setString(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasNickname() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearNickname() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get phone => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set phone($core.String v) { $_setString(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasPhone() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearPhone() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.String get chackInsTime => $_getSZ(4);
+  @$pb.TagNumber(5)
+  set chackInsTime($core.String v) { $_setString(4, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasChackInsTime() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearChackInsTime() => clearField(5);
+}
+
+class ToMatchRegusterAddRequest extends $pb.GeneratedMessage {
+  factory ToMatchRegusterAddRequest({
+    $core.String? regName,
+    $2.Timestamp? startAt,
+    $2.Timestamp? stopAt,
+    $core.int? actId,
+    $core.bool? isQueryPwd,
+    $core.String? queryPasswd,
+  }) {
+    final $result = create();
+    if (regName != null) {
+      $result.regName = regName;
+    }
+    if (startAt != null) {
+      $result.startAt = startAt;
+    }
+    if (stopAt != null) {
+      $result.stopAt = stopAt;
+    }
+    if (actId != null) {
+      $result.actId = actId;
+    }
+    if (isQueryPwd != null) {
+      $result.isQueryPwd = isQueryPwd;
+    }
+    if (queryPasswd != null) {
+      $result.queryPasswd = queryPasswd;
+    }
+    return $result;
+  }
+  ToMatchRegusterAddRequest._() : super();
+  factory ToMatchRegusterAddRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ToMatchRegusterAddRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ToMatchRegusterAddRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'to.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'regName', protoName: 'regName')
+    ..aOM<$2.Timestamp>(2, _omitFieldNames ? '' : 'startAt', subBuilder: $2.Timestamp.create)
+    ..aOM<$2.Timestamp>(3, _omitFieldNames ? '' : 'stopAt', subBuilder: $2.Timestamp.create)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'actId', $pb.PbFieldType.O3, protoName: 'actId')
+    ..aOB(5, _omitFieldNames ? '' : 'isQueryPwd', protoName: 'isQueryPwd')
+    ..aOS(6, _omitFieldNames ? '' : 'queryPasswd', protoName: 'queryPasswd')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  ToMatchRegusterAddRequest clone() => ToMatchRegusterAddRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  ToMatchRegusterAddRequest copyWith(void Function(ToMatchRegusterAddRequest) updates) => super.copyWith((message) => updates(message as ToMatchRegusterAddRequest)) as ToMatchRegusterAddRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static ToMatchRegusterAddRequest create() => ToMatchRegusterAddRequest._();
+  ToMatchRegusterAddRequest createEmptyInstance() => create();
+  static $pb.PbList<ToMatchRegusterAddRequest> createRepeated() => $pb.PbList<ToMatchRegusterAddRequest>();
+  @$core.pragma('dart2js:noInline')
+  static ToMatchRegusterAddRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ToMatchRegusterAddRequest>(create);
+  static ToMatchRegusterAddRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get regName => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set regName($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasRegName() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearRegName() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $2.Timestamp get startAt => $_getN(1);
+  @$pb.TagNumber(2)
+  set startAt($2.Timestamp v) { setField(2, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasStartAt() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearStartAt() => clearField(2);
+  @$pb.TagNumber(2)
+  $2.Timestamp ensureStartAt() => $_ensure(1);
+
+  @$pb.TagNumber(3)
+  $2.Timestamp get stopAt => $_getN(2);
+  @$pb.TagNumber(3)
+  set stopAt($2.Timestamp v) { setField(3, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasStopAt() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearStopAt() => clearField(3);
+  @$pb.TagNumber(3)
+  $2.Timestamp ensureStopAt() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $core.int get actId => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set actId($core.int v) { $_setSignedInt32(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasActId() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearActId() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.bool get isQueryPwd => $_getBF(4);
+  @$pb.TagNumber(5)
+  set isQueryPwd($core.bool v) { $_setBool(4, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasIsQueryPwd() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearIsQueryPwd() => clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.String get queryPasswd => $_getSZ(5);
+  @$pb.TagNumber(6)
+  set queryPasswd($core.String v) { $_setString(5, v); }
+  @$pb.TagNumber(6)
+  $core.bool hasQueryPasswd() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearQueryPasswd() => clearField(6);
+}
+
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');

+ 181 - 0
app_business/lib/generated/track_offical.pbgrpc.dart

@@ -16,6 +16,7 @@ import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'base.pb.dart' as $0;
+import 'track_offical.pb.dart' as $1;
 
 export 'track_offical.pb.dart';
 
@@ -57,6 +58,42 @@ class ApiToClient extends $grpc.Client {
       '/to.v1.ApiTo/ToGetBinaryByMd5',
       ($0.ToGetBinaryByMd5Request value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $0.BinaryPartV2.fromBuffer(value));
+  static final _$toUserDetailQueryV2 = $grpc.ClientMethod<$0.ToUserDetailQueryRequestV2, $0.ToUserDetailQueryReplyV2>(
+      '/to.v1.ApiTo/ToUserDetailQueryV2',
+      ($0.ToUserDetailQueryRequestV2 value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $0.ToUserDetailQueryReplyV2.fromBuffer(value));
+  static final _$toActionBasicQuery = $grpc.ClientMethod<$0.IdRequest, $0.ToActionBasicInfo>(
+      '/to.v1.ApiTo/ToActionBasicQuery',
+      ($0.IdRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $0.ToActionBasicInfo.fromBuffer(value));
+  static final _$toUserInActionBasicQuery = $grpc.ClientMethod<$0.ToUserInActionBasicQueryRequest, $0.ToUserInActionBasicInfo>(
+      '/to.v1.ApiTo/ToUserInActionBasicQuery',
+      ($0.ToUserInActionBasicQueryRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $0.ToUserInActionBasicInfo.fromBuffer(value));
+  static final _$toHistoryUserListQuery = $grpc.ClientMethod<$0.IdRequest, $0.ToHisUserListQueryReply>(
+      '/to.v1.ApiTo/ToHistoryUserListQuery',
+      ($0.IdRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $0.ToHisUserListQueryReply.fromBuffer(value));
+  static final _$toHistoryGameDetail = $grpc.ClientMethod<$0.IdRequest, $0.GameDetailV2Reply>(
+      '/to.v1.ApiTo/ToHistoryGameDetail',
+      ($0.IdRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $0.GameDetailV2Reply.fromBuffer(value));
+  static final _$toGameRanking = $grpc.ClientMethod<$0.ToGameRankingRequest, $0.ToGameRankingReply>(
+      '/to.v1.ApiTo/ToGameRanking',
+      ($0.ToGameRankingRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $0.ToGameRankingReply.fromBuffer(value));
+  static final _$toActivitySelectList = $grpc.ClientMethod<$0.IdRequest, $1.ToActivityListReply>(
+      '/to.v1.ApiTo/ToActivitySelectList',
+      ($0.IdRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ToActivityListReply.fromBuffer(value));
+  static final _$toMatchRegusterAdd = $grpc.ClientMethod<$1.ToMatchRegusterAddRequest, $0.DefaultReply>(
+      '/to.v1.ApiTo/ToMatchRegusterAdd',
+      ($1.ToMatchRegusterAddRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $0.DefaultReply.fromBuffer(value));
+  static final _$toMatchRegusterList = $grpc.ClientMethod<$1.ToMatchRegusterListRequest, $1.ToMatchRegusterListReply>(
+      '/to.v1.ApiTo/ToMatchRegusterList',
+      ($1.ToMatchRegusterListRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ToMatchRegusterListReply.fromBuffer(value));
 
   ApiToClient($grpc.ClientChannel channel,
       {$grpc.CallOptions? options,
@@ -99,6 +136,42 @@ class ApiToClient extends $grpc.Client {
   $grpc.ResponseStream<$0.BinaryPartV2> toGetBinaryByMd5($0.ToGetBinaryByMd5Request request, {$grpc.CallOptions? options}) {
     return $createStreamingCall(_$toGetBinaryByMd5, $async.Stream.fromIterable([request]), options: options);
   }
+
+  $grpc.ResponseFuture<$0.ToUserDetailQueryReplyV2> toUserDetailQueryV2($0.ToUserDetailQueryRequestV2 request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toUserDetailQueryV2, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.ToActionBasicInfo> toActionBasicQuery($0.IdRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toActionBasicQuery, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.ToUserInActionBasicInfo> toUserInActionBasicQuery($0.ToUserInActionBasicQueryRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toUserInActionBasicQuery, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.ToHisUserListQueryReply> toHistoryUserListQuery($0.IdRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toHistoryUserListQuery, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GameDetailV2Reply> toHistoryGameDetail($0.IdRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toHistoryGameDetail, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.ToGameRankingReply> toGameRanking($0.ToGameRankingRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toGameRanking, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$1.ToActivityListReply> toActivitySelectList($0.IdRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toActivitySelectList, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DefaultReply> toMatchRegusterAdd($1.ToMatchRegusterAddRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toMatchRegusterAdd, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$1.ToMatchRegusterListReply> toMatchRegusterList($1.ToMatchRegusterListRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$toMatchRegusterList, request, options: options);
+  }
 }
 
 @$pb.GrpcServiceName('to.v1.ApiTo')
@@ -169,6 +242,69 @@ abstract class ApiToServiceBase extends $grpc.Service {
         true,
         ($core.List<$core.int> value) => $0.ToGetBinaryByMd5Request.fromBuffer(value),
         ($0.BinaryPartV2 value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.ToUserDetailQueryRequestV2, $0.ToUserDetailQueryReplyV2>(
+        'ToUserDetailQueryV2',
+        toUserDetailQueryV2_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.ToUserDetailQueryRequestV2.fromBuffer(value),
+        ($0.ToUserDetailQueryReplyV2 value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.IdRequest, $0.ToActionBasicInfo>(
+        'ToActionBasicQuery',
+        toActionBasicQuery_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.IdRequest.fromBuffer(value),
+        ($0.ToActionBasicInfo value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.ToUserInActionBasicQueryRequest, $0.ToUserInActionBasicInfo>(
+        'ToUserInActionBasicQuery',
+        toUserInActionBasicQuery_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.ToUserInActionBasicQueryRequest.fromBuffer(value),
+        ($0.ToUserInActionBasicInfo value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.IdRequest, $0.ToHisUserListQueryReply>(
+        'ToHistoryUserListQuery',
+        toHistoryUserListQuery_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.IdRequest.fromBuffer(value),
+        ($0.ToHisUserListQueryReply value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.IdRequest, $0.GameDetailV2Reply>(
+        'ToHistoryGameDetail',
+        toHistoryGameDetail_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.IdRequest.fromBuffer(value),
+        ($0.GameDetailV2Reply value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.ToGameRankingRequest, $0.ToGameRankingReply>(
+        'ToGameRanking',
+        toGameRanking_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.ToGameRankingRequest.fromBuffer(value),
+        ($0.ToGameRankingReply value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.IdRequest, $1.ToActivityListReply>(
+        'ToActivitySelectList',
+        toActivitySelectList_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.IdRequest.fromBuffer(value),
+        ($1.ToActivityListReply value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ToMatchRegusterAddRequest, $0.DefaultReply>(
+        'ToMatchRegusterAdd',
+        toMatchRegusterAdd_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $1.ToMatchRegusterAddRequest.fromBuffer(value),
+        ($0.DefaultReply value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ToMatchRegusterListRequest, $1.ToMatchRegusterListReply>(
+        'ToMatchRegusterList',
+        toMatchRegusterList_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $1.ToMatchRegusterListRequest.fromBuffer(value),
+        ($1.ToMatchRegusterListReply value) => value.writeToBuffer()));
   }
 
   $async.Future<$0.DefaultReply> toSendCodeToPhoneV2_Pre($grpc.ServiceCall call, $async.Future<$0.ToSendCodeToPhoneRequestV2> request) async {
@@ -207,6 +343,42 @@ abstract class ApiToServiceBase extends $grpc.Service {
     yield* toGetBinaryByMd5(call, await request);
   }
 
+  $async.Future<$0.ToUserDetailQueryReplyV2> toUserDetailQueryV2_Pre($grpc.ServiceCall call, $async.Future<$0.ToUserDetailQueryRequestV2> request) async {
+    return toUserDetailQueryV2(call, await request);
+  }
+
+  $async.Future<$0.ToActionBasicInfo> toActionBasicQuery_Pre($grpc.ServiceCall call, $async.Future<$0.IdRequest> request) async {
+    return toActionBasicQuery(call, await request);
+  }
+
+  $async.Future<$0.ToUserInActionBasicInfo> toUserInActionBasicQuery_Pre($grpc.ServiceCall call, $async.Future<$0.ToUserInActionBasicQueryRequest> request) async {
+    return toUserInActionBasicQuery(call, await request);
+  }
+
+  $async.Future<$0.ToHisUserListQueryReply> toHistoryUserListQuery_Pre($grpc.ServiceCall call, $async.Future<$0.IdRequest> request) async {
+    return toHistoryUserListQuery(call, await request);
+  }
+
+  $async.Future<$0.GameDetailV2Reply> toHistoryGameDetail_Pre($grpc.ServiceCall call, $async.Future<$0.IdRequest> request) async {
+    return toHistoryGameDetail(call, await request);
+  }
+
+  $async.Future<$0.ToGameRankingReply> toGameRanking_Pre($grpc.ServiceCall call, $async.Future<$0.ToGameRankingRequest> request) async {
+    return toGameRanking(call, await request);
+  }
+
+  $async.Future<$1.ToActivityListReply> toActivitySelectList_Pre($grpc.ServiceCall call, $async.Future<$0.IdRequest> request) async {
+    return toActivitySelectList(call, await request);
+  }
+
+  $async.Future<$0.DefaultReply> toMatchRegusterAdd_Pre($grpc.ServiceCall call, $async.Future<$1.ToMatchRegusterAddRequest> request) async {
+    return toMatchRegusterAdd(call, await request);
+  }
+
+  $async.Future<$1.ToMatchRegusterListReply> toMatchRegusterList_Pre($grpc.ServiceCall call, $async.Future<$1.ToMatchRegusterListRequest> request) async {
+    return toMatchRegusterList(call, await request);
+  }
+
   $async.Future<$0.DefaultReply> toSendCodeToPhoneV2($grpc.ServiceCall call, $0.ToSendCodeToPhoneRequestV2 request);
   $async.Future<$0.GetSmsSendLeftTimeReply> toGetSmsSendLeftTimeV2($grpc.ServiceCall call, $0.GetSmsSendLeftTimeRequest request);
   $async.Future<$0.SignInReply> toSignInV2($grpc.ServiceCall call, $0.ToSignInRequestV2 request);
@@ -216,4 +388,13 @@ abstract class ApiToServiceBase extends $grpc.Service {
   $async.Future<$0.ToMapListReplyV2> toMapListV2($grpc.ServiceCall call, $0.MapListRequestV2 request);
   $async.Future<$0.ToMapInfoV2> toMapDetailV2($grpc.ServiceCall call, $0.IdRequest request);
   $async.Stream<$0.BinaryPartV2> toGetBinaryByMd5($grpc.ServiceCall call, $0.ToGetBinaryByMd5Request request);
+  $async.Future<$0.ToUserDetailQueryReplyV2> toUserDetailQueryV2($grpc.ServiceCall call, $0.ToUserDetailQueryRequestV2 request);
+  $async.Future<$0.ToActionBasicInfo> toActionBasicQuery($grpc.ServiceCall call, $0.IdRequest request);
+  $async.Future<$0.ToUserInActionBasicInfo> toUserInActionBasicQuery($grpc.ServiceCall call, $0.ToUserInActionBasicQueryRequest request);
+  $async.Future<$0.ToHisUserListQueryReply> toHistoryUserListQuery($grpc.ServiceCall call, $0.IdRequest request);
+  $async.Future<$0.GameDetailV2Reply> toHistoryGameDetail($grpc.ServiceCall call, $0.IdRequest request);
+  $async.Future<$0.ToGameRankingReply> toGameRanking($grpc.ServiceCall call, $0.ToGameRankingRequest request);
+  $async.Future<$1.ToActivityListReply> toActivitySelectList($grpc.ServiceCall call, $0.IdRequest request);
+  $async.Future<$0.DefaultReply> toMatchRegusterAdd($grpc.ServiceCall call, $1.ToMatchRegusterAddRequest request);
+  $async.Future<$1.ToMatchRegusterListReply> toMatchRegusterList($grpc.ServiceCall call, $1.ToMatchRegusterListRequest request);
 }

+ 99 - 0
app_business/lib/generated/track_offical.pbjson.dart

@@ -13,3 +13,102 @@ import 'dart:convert' as $convert;
 import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
+@$core.Deprecated('Use toActivityListReplyDescriptor instead')
+const ToActivityListReply$json = {
+  '1': 'ToActivityListReply',
+  '2': [
+    {'1': 'list', '3': 1, '4': 3, '5': 11, '6': '.base.v1.ToActionBasicInfo', '10': 'list'},
+  ],
+};
+
+/// Descriptor for `ToActivityListReply`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List toActivityListReplyDescriptor = $convert.base64Decode(
+    'ChNUb0FjdGl2aXR5TGlzdFJlcGx5Ei4KBGxpc3QYASADKAsyGi5iYXNlLnYxLlRvQWN0aW9uQm'
+    'FzaWNJbmZvUgRsaXN0');
+
+@$core.Deprecated('Use toMatchRegusterListRequestDescriptor instead')
+const ToMatchRegusterListRequest$json = {
+  '1': 'ToMatchRegusterListRequest',
+  '2': [
+    {'1': 'mapId', '3': 1, '4': 1, '5': 5, '10': 'mapId'},
+    {'1': 'startSecond', '3': 2, '4': 1, '5': 3, '10': 'startSecond'},
+  ],
+};
+
+/// Descriptor for `ToMatchRegusterListRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List toMatchRegusterListRequestDescriptor = $convert.base64Decode(
+    'ChpUb01hdGNoUmVndXN0ZXJMaXN0UmVxdWVzdBIUCgVtYXBJZBgBIAEoBVIFbWFwSWQSIAoLc3'
+    'RhcnRTZWNvbmQYAiABKANSC3N0YXJ0U2Vjb25k');
+
+@$core.Deprecated('Use toMatchRegusterListReplyDescriptor instead')
+const ToMatchRegusterListReply$json = {
+  '1': 'ToMatchRegusterListReply',
+  '2': [
+    {'1': 'list', '3': 1, '4': 3, '5': 11, '6': '.to.v1.MatchRegusterInfo', '10': 'list'},
+  ],
+};
+
+/// Descriptor for `ToMatchRegusterListReply`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List toMatchRegusterListReplyDescriptor = $convert.base64Decode(
+    'ChhUb01hdGNoUmVndXN0ZXJMaXN0UmVwbHkSLAoEbGlzdBgBIAMoCzIYLnRvLnYxLk1hdGNoUm'
+    'VndXN0ZXJJbmZvUgRsaXN0');
+
+@$core.Deprecated('Use matchRegusterInfoDescriptor instead')
+const MatchRegusterInfo$json = {
+  '1': 'MatchRegusterInfo',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 5, '10': 'id'},
+    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
+    {'1': 'totalUserNum', '3': 3, '4': 1, '5': 5, '10': 'totalUserNum'},
+    {'1': 'qrCode', '3': 4, '4': 1, '5': 9, '10': 'qrCode'},
+    {'1': 'isAllowEdit', '3': 5, '4': 1, '5': 8, '10': 'isAllowEdit'},
+    {'1': 'userList', '3': 6, '4': 3, '5': 11, '6': '.to.v1.ToChackInsInfo', '10': 'userList'},
+  ],
+};
+
+/// Descriptor for `MatchRegusterInfo`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List matchRegusterInfoDescriptor = $convert.base64Decode(
+    'ChFNYXRjaFJlZ3VzdGVySW5mbxIOCgJpZBgBIAEoBVICaWQSEgoEbmFtZRgCIAEoCVIEbmFtZR'
+    'IiCgx0b3RhbFVzZXJOdW0YAyABKAVSDHRvdGFsVXNlck51bRIWCgZxckNvZGUYBCABKAlSBnFy'
+    'Q29kZRIgCgtpc0FsbG93RWRpdBgFIAEoCFILaXNBbGxvd0VkaXQSMQoIdXNlckxpc3QYBiADKA'
+    'syFS50by52MS5Ub0NoYWNrSW5zSW5mb1IIdXNlckxpc3Q=');
+
+@$core.Deprecated('Use toChackInsInfoDescriptor instead')
+const ToChackInsInfo$json = {
+  '1': 'ToChackInsInfo',
+  '2': [
+    {'1': 'marId', '3': 1, '4': 1, '5': 5, '10': 'marId'},
+    {'1': 'oId', '3': 2, '4': 1, '5': 5, '10': 'oId'},
+    {'1': 'nickname', '3': 3, '4': 1, '5': 9, '10': 'nickname'},
+    {'1': 'phone', '3': 4, '4': 1, '5': 9, '10': 'phone'},
+    {'1': 'chackInsTime', '3': 5, '4': 1, '5': 9, '10': 'chackInsTime'},
+  ],
+};
+
+/// Descriptor for `ToChackInsInfo`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List toChackInsInfoDescriptor = $convert.base64Decode(
+    'Cg5Ub0NoYWNrSW5zSW5mbxIUCgVtYXJJZBgBIAEoBVIFbWFySWQSEAoDb0lkGAIgASgFUgNvSW'
+    'QSGgoIbmlja25hbWUYAyABKAlSCG5pY2tuYW1lEhQKBXBob25lGAQgASgJUgVwaG9uZRIiCgxj'
+    'aGFja0luc1RpbWUYBSABKAlSDGNoYWNrSW5zVGltZQ==');
+
+@$core.Deprecated('Use toMatchRegusterAddRequestDescriptor instead')
+const ToMatchRegusterAddRequest$json = {
+  '1': 'ToMatchRegusterAddRequest',
+  '2': [
+    {'1': 'regName', '3': 1, '4': 1, '5': 9, '10': 'regName'},
+    {'1': 'start_at', '3': 2, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'startAt'},
+    {'1': 'stop_at', '3': 3, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'stopAt'},
+    {'1': 'actId', '3': 4, '4': 1, '5': 5, '10': 'actId'},
+    {'1': 'isQueryPwd', '3': 5, '4': 1, '5': 8, '10': 'isQueryPwd'},
+    {'1': 'queryPasswd', '3': 6, '4': 1, '5': 9, '10': 'queryPasswd'},
+  ],
+};
+
+/// Descriptor for `ToMatchRegusterAddRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List toMatchRegusterAddRequestDescriptor = $convert.base64Decode(
+    'ChlUb01hdGNoUmVndXN0ZXJBZGRSZXF1ZXN0EhgKB3JlZ05hbWUYASABKAlSB3JlZ05hbWUSNQ'
+    'oIc3RhcnRfYXQYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wUgdzdGFydEF0EjMK'
+    'B3N0b3BfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wUgZzdG9wQXQSFAoFYW'
+    'N0SWQYBCABKAVSBWFjdElkEh4KCmlzUXVlcnlQd2QYBSABKAhSCmlzUXVlcnlQd2QSIAoLcXVl'
+    'cnlQYXNzd2QYBiABKAlSC3F1ZXJ5UGFzc3dk');
+

+ 1 - 0
app_business/lib/service/api.dart

@@ -13,6 +13,7 @@ import 'package:track_common/track_common.dart';
 import 'abase.dart';
 
 typedef SmsType = pb.SmsType;
+typedef IdRequest = pb.IdRequest;
 
 extension _ImageExt on pb.NetImage {
   NetImage toModel() {

+ 253 - 98
app_business/lib/view/home/field_control.dart

@@ -1,3 +1,5 @@
+import 'package:app_business/service/api.dart';
+import 'package:fixnum/fixnum.dart';
 import 'package:track_common/service/map_watch.dart';
 import 'package:track_common/view/home/field_control/field_control.dart';
 import 'package:track_common/view/home/field_control/field_control_controller.dart';
@@ -8,29 +10,36 @@ class FieldControlPageImpl extends FieldControlPage {
 
   @override
   Widget get rightColumn {
-    return Obx(() => Container(
-        width: 263,
-        padding: const EdgeInsets.all(6.4),
-        height: double.infinity,
-        color: Colors.white,
-        child: Column(
-          children: [
-            SizedBox(
-                width: double.infinity,
-                child: DarkButton(
-                    child: const Text('注册比赛'),
-                    onPressed: () {
-                      Get.dialog(const RegisterDialog());
-                    })),
-            Expanded(
-              child: ListView(
-                children: controller.eventList
-                    .map((element) => eventView(element))
-                    .toList(),
-              ),
-            )
-          ],
-        )));
+    return Obx(() {
+      final mapWatch = controller.mapWatch;
+
+      return Container(
+          width: 263,
+          padding: const EdgeInsets.all(6.4),
+          height: double.infinity,
+          color: Colors.white,
+          child: Column(
+            children: [
+              SizedBox(
+                  width: double.infinity,
+                  child: DarkButton(
+                      onPressed: mapWatch != null
+                          ? () {
+                              Get.dialog(const RegisterDialog(),
+                                  arguments: mapWatch.id);
+                            }
+                          : null,
+                      child: const Text('注册比赛'))),
+              Expanded(
+                child: ListView(
+                  children: controller.eventList
+                      .map((element) => eventView(element))
+                      .toList(),
+                ),
+              )
+            ],
+          ));
+    });
   }
 
   Widget eventView(EventOnMap event) {
@@ -50,74 +59,210 @@ class FieldControlPageImpl extends FieldControlPage {
   }
 }
 
-class FieldControlControllerImpl extends FieldControlController {
+class EventInfo {
+  int id = 0;
+  String name = '';
+}
+
+class RegisterInfo {
+  var id = 0;
+  var name = '';
+  var startAt = DateTime.now();
+  var stopAt = DateTime.now();
+  String? password;
+}
+
+class FieldControlControllerImpl extends FieldControlController {}
+
+class RegisterDialogController extends GetxController {
   var registerName = '';
+  final date = Rx<DateTime?>(null);
   final registerStartAt = Rx<TimeOfDay?>(null);
   final registerStopAt = Rx<TimeOfDay?>(null);
+  final selected = Rx<EventInfo?>(null);
+  final eventList = <EventInfo>[].obs;
+  final hasPassword = false.obs;
+  var password = '';
+
+  String? get dateString {
+    final d = date.value;
+    if (d != null) {
+      return '${d.month}/${d.day}';
+    }
+    return null;
+  }
+
+  @override
+  void onInit() {
+    super.onInit();
+    final mapId = Get.arguments as int;
+    final api = Get.find<ApiService>();
+
+    api.stub.toActivitySelectList(IdRequest()..id = Int64(mapId)).then((r) {
+      eventList.addAll(r.list.map((e) => EventInfo()
+        ..id = e.actId
+        ..name = e.actName));
+    });
+  }
 }
 
-class RegisterDialog extends GetView<FieldControlController> {
+class RegisterDialog extends GetView<RegisterDialogController> {
   const RegisterDialog({super.key});
 
-  FieldControlControllerImpl get c => controller as FieldControlControllerImpl;
-
   @override
   Widget build(BuildContext context) {
-    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(
-            shrinkWrap: true,
-            children: [
-              const _TextField(hint: '请选择活动'),
-              const SizedBox(height: 21.34),
-              _TextField(
-                  hint: '请输入名称',
-                  onChanged: (v) {
-                    c.registerName = v;
-                  }),
-              const SizedBox(height: 21.34),
-              Row(children: [
-                Expanded(
-                    child: Obx(() => _TextField(
-                        hint: '开始时间',
-                        readOnly: true,
-                        initText: c.registerStartAt.value?.format(context),
-                        onTap: () async {
-                          c.registerStartAt.value = await _showTimePicker(
-                              context, c.registerStartAt.value);
-                        }))),
-                const SizedBox(width: 15.64),
-                Expanded(
-                    child: _TextField(
-                        hint: '结束时间',
-                        readOnly: true,
-                        initText: c.registerStopAt.value?.format(context),
-                        onTap: () async {
-                          c.registerStopAt.value = await _showTimePicker(
-                              context, c.registerStopAt.value);
-                        })),
-              ]),
-              Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Switch(value: true, onChanged: (v) {}),
-                  const Text('查询密码')
-                ],
-              ),
-              SizedBox(
-                  width: double.infinity,
-                  child: DarkButton(child: const Text('注 册'), onPressed: () {}))
-            ],
-          )),
-    );
+    return GetBuilder(
+        init: RegisterDialogController(),
+        builder: (c) {
+          return AlertDialog(
+            title: const Center(
+                child: Text(
+              '注册比赛',
+              style: TextStyle(fontSize: 17),
+            )),
+            backgroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(17.78)),
+            content: SizedBox(
+                width: 320,
+                child: ListView(
+                  shrinkWrap: true,
+                  children: [
+                    Obx(() => SizedBox(
+                        child: DropdownMenu<EventInfo>(
+                            key: GlobalKey(),
+                            width: 320,
+                            hintText: '请选择活动',
+                            onSelected: (one) {
+                              controller.selected.value = one;
+                            },
+                            inputDecorationTheme: InputDecorationTheme(
+                              border: textBorder,
+                              isDense: true,
+                            ),
+                            dropdownMenuEntries: controller.eventList
+                                .map((e) => DropdownMenuEntry<EventInfo>(
+                                    value: e, label: e.name))
+                                .toList()))),
+                    const SizedBox(height: 21.34),
+                    _TextField(
+                        hint: '请输入名称',
+                        onChanged: (v) {
+                          c.registerName = v;
+                        }),
+                    const SizedBox(height: 21.34),
+                    Row(children: [
+                      Expanded(
+                          child: Obx(() => _TextField(
+                              hint: '日期',
+                              readOnly: true,
+                              initText: c.dateString,
+                              onTap: () async {
+                                c.date.value = await _showDatePicker(
+                                    context, c.date.value);
+                              }))),
+                      const SizedBox(width: 15.64),
+                      Expanded(
+                          child: Obx(() => _TextField(
+                              hint: '开始时间',
+                              readOnly: true,
+                              initText:
+                                  c.registerStartAt.value?.format(context),
+                              onTap: () async {
+                                c.registerStartAt.value = await _showTimePicker(
+                                    context, c.registerStartAt.value);
+                              }))),
+                      const SizedBox(width: 15.64),
+                      Expanded(
+                          child: Obx(() => _TextField(
+                              hint: '结束时间',
+                              readOnly: true,
+                              initText: c.registerStopAt.value?.format(context),
+                              onTap: () async {
+                                c.registerStopAt.value = await _showTimePicker(
+                                    context, c.registerStopAt.value);
+                              }))),
+                    ]),
+                    const SizedBox(height: 21.34),
+                    Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Obx(() => Switch(
+                            value: c.hasPassword.value,
+                            onChanged: (v) {
+                              c.hasPassword.value = v;
+                            })),
+                        const Text('查询密码'),
+                        const SizedBox(width: 12),
+                        Obx(() => Expanded(
+                            child: Visibility(
+                                visible: c.hasPassword.value,
+                                child: _TextField(
+                                    hint: '请输入密码',
+                                    onChanged: (v) {
+                                      c.password = v;
+                                    })))),
+                      ],
+                    ),
+                    const SizedBox(height: 21.34),
+                    SizedBox(
+                        width: double.infinity,
+                        child: DarkButton(
+                            onPressed: _onRegister, child: const Text('注 册')))
+                  ],
+                )),
+          );
+        });
+  }
+
+  void _onRegister() {
+    final date = controller.date.value;
+    final timeStartAt = controller.registerStartAt.value;
+    final timeStopAt = controller.registerStopAt.value;
+    final selected = controller.selected.value;
+
+    if (selected == null) {
+      Get.snackbar('错误', '请选择一个活动');
+      return;
+    }
+
+    if (controller.registerName.isEmpty) {
+      Get.snackbar('错误', '输入名称');
+      return;
+    }
+
+    if (date == null) {
+      Get.snackbar('错误', '请选择日期');
+      return;
+    }
+    if (timeStartAt == null) {
+      Get.snackbar('错误', '请选择开始时间');
+      return;
+    }
+
+    if (timeStopAt == null) {
+      Get.snackbar('错误', '请选择结束时间');
+      return;
+    }
+
+    final startAt =
+        date.copyWith(hour: timeStartAt.hour, minute: timeStartAt.minute);
+    final stopAt =
+        date.copyWith(hour: timeStopAt.hour, minute: timeStopAt.minute);
+
+    if (startAt.isAfter(stopAt)) {
+      Get.snackbar('错误', '结束时间应晚于开始时间');
+      return;
+    }
+
+    Get.back(
+        result: RegisterInfo()
+          ..id = selected.id
+          ..name = controller.registerName
+          ..startAt = startAt
+          ..stopAt = stopAt
+          ..password =
+              controller.hasPassword.value ? controller.password : null);
   }
 
   Future<TimeOfDay?> _showTimePicker(
@@ -128,8 +273,24 @@ class RegisterDialog extends GetView<FieldControlController> {
     );
     return time;
   }
+
+  Future<DateTime?> _showDatePicker(
+      BuildContext context, DateTime? init) async {
+    final DateTime? time = await showDatePicker(
+      context: context,
+      initialDate: init ?? DateTime.now(),
+      firstDate: DateTime.now(),
+      lastDate: DateTime.now().add(365.days),
+    );
+    return time;
+  }
 }
 
+final textBorder = OutlineInputBorder(
+  borderSide: const BorderSide(width: 0.71, color: Color(0xff818181)),
+  borderRadius: BorderRadius.circular(2.13),
+);
+
 class _TextField extends StatelessWidget {
   const _TextField(
       {required this.hint,
@@ -147,25 +308,19 @@ class _TextField extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: 34.13,
       child: TextFormField(
-        key: GlobalKey(),
-        initialValue: initText,
-        maxLines: 1,
-        style: const TextStyle(fontSize: 11.38),
-        onChanged: onChanged,
-        onTap: onTap,
-        readOnly: readOnly,
-        decoration: InputDecoration(
+          key: GlobalKey(),
+          initialValue: initText,
+          maxLines: 1,
+          onChanged: onChanged,
+          onTap: onTap,
+          readOnly: readOnly,
+          decoration: InputDecoration(
             hintText: hint,
-            border: OutlineInputBorder(
-              borderSide:
-                  const BorderSide(width: 0.71, color: Color(0xff818181)),
-              borderRadius: BorderRadius.circular(2.13),
-            ),
+            border: textBorder,
             isDense: true,
-            contentPadding: const EdgeInsets.all(8.53)),
-      ),
+            // contentPadding: const EdgeInsets.all(8.53)
+          )),
     );
   }
 }

+ 1 - 1
libs/common_pub

@@ -1 +1 @@
-Subproject commit d61c191d21f797cc6fe25e09356dce2e12963297
+Subproject commit 4cff0a3c27b2d26f8a00a396fd8cbf1c2dda2bc9