From 211cbd3da90d9f8ba9c66ebfbedc7a114bf1bdde Mon Sep 17 00:00:00 2001 From: jiahao <283739569@qq.com> Date: Fri, 27 Mar 2020 10:34:45 +0800 Subject: [PATCH] 1 --- lib/chat/ChatPageItem.dart | 6 + lib/chat/group_chat_item.dart | 4 + lib/home/AddProgram.dart | 11 +- lib/proto/chat.pbenum.dart | 2 + lib/proto/chat.pbjson.dart | 1 + lib/proto/chat.proto | 1 + lib/proto/interpreter.pb.dart | 250 ------------- lib/proto/interpreter.pbenum.dart | 30 -- lib/proto/interpreter.pbjson.dart | 75 ---- lib/proto/interpreter.proto | 55 --- lib/proto/transhousekeeper.pb.dart | 354 ++++++++++++++++++ lib/proto/transhousekeeper.pbenum.dart | 32 ++ lib/proto/transhousekeeper.pbjson.dart | 101 +++++ ...er.dart => transhousekeeper.pbserver.dart} | 4 +- lib/proto/transhousekeeper.proto | 82 ++++ lib/utils/HttpUtil.dart | 4 +- lib/utils/msgHandler.dart | 83 ++-- 17 files changed, 634 insertions(+), 461 deletions(-) delete mode 100644 lib/proto/interpreter.pb.dart delete mode 100644 lib/proto/interpreter.pbenum.dart delete mode 100644 lib/proto/interpreter.pbjson.dart delete mode 100644 lib/proto/interpreter.proto create mode 100644 lib/proto/transhousekeeper.pb.dart create mode 100644 lib/proto/transhousekeeper.pbenum.dart create mode 100644 lib/proto/transhousekeeper.pbjson.dart rename lib/proto/{interpreter.pbserver.dart => transhousekeeper.pbserver.dart} (73%) create mode 100644 lib/proto/transhousekeeper.proto diff --git a/lib/chat/ChatPageItem.dart b/lib/chat/ChatPageItem.dart index 40237c0..5b2101c 100644 --- a/lib/chat/ChatPageItem.dart +++ b/lib/chat/ChatPageItem.dart @@ -654,6 +654,12 @@ class _ChatPageItemState extends State actions.add( I18n.of(context).forward); actionsFunc.add(() { print('转发消息'); + + if(widget.msg.msgType == ChatType.FileChatType.value && widget.msg.localFile==null){ + showToast('请先下载文件'); + return ; + } + AppNavigator.pushForwardPage(context, widget.msg); }); } diff --git a/lib/chat/group_chat_item.dart b/lib/chat/group_chat_item.dart index 42799d8..ae0a11c 100644 --- a/lib/chat/group_chat_item.dart +++ b/lib/chat/group_chat_item.dart @@ -598,6 +598,10 @@ class _GroupChatPageItemState extends State actions.add( I18n.of(context).forward); actionsFunc.add(() { print('转发消息'); + if(widget.msg.msgType == ChatType.FileChatType.value && widget.msg.localFile==null){ + showToast('请先下载文件'); + return ; + } AppNavigator.pushForwardPage(context, widget.msg); }); } diff --git a/lib/home/AddProgram.dart b/lib/home/AddProgram.dart index ec6a174..4116141 100644 --- a/lib/home/AddProgram.dart +++ b/lib/home/AddProgram.dart @@ -737,11 +737,12 @@ class _AddProgramState extends State { File file = await FileCacheMgr().writeFile('temp-photo-${DateTime.now().millisecondsSinceEpoch}-$i', byteData.buffer.asInt8List(0)); fileList.add(file); } - Map data = {"type": 7, "userId": UserData().basicInfo.userId}; - data['sign'] = TokenMgr().getSign(data); - Response res = await HttpUtil().uploadFiles( - fileList, data, 'upload/post/postfiles', 'image', - isShowLoading: true); + print('文件列表${fileList.length}'); + Map data = {"type": 3, "userId": UserData().basicInfo.userId}; + data['sign'] = TokenMgr().getSign(data); + Response res = await HttpUtil().uploadFiles( + fileList, data, 'upload/post/postfiles', 'image', + isShowLoading: true); var resData = res.data; if (resData['code'] == 0 && resData['msg'] != null) { imgUrlList.addAll(resData['msg'].split("|")); diff --git a/lib/proto/chat.pbenum.dart b/lib/proto/chat.pbenum.dart index 35f2aa7..ac02bb6 100644 --- a/lib/proto/chat.pbenum.dart +++ b/lib/proto/chat.pbenum.dart @@ -13,11 +13,13 @@ class ChatChannelType extends $pb.ProtobufEnum { static const ChatChannelType Session = ChatChannelType._(0, 'Session'); static const ChatChannelType Group = ChatChannelType._(1, 'Group'); static const ChatChannelType CSD = ChatChannelType._(2, 'CSD'); + static const ChatChannelType TransHK = ChatChannelType._(3, 'TransHK'); static const $core.List values = [ Session, Group, CSD, + TransHK, ]; static final $core.Map<$core.int, ChatChannelType> _byValue = $pb.ProtobufEnum.initByValue(values); diff --git a/lib/proto/chat.pbjson.dart b/lib/proto/chat.pbjson.dart index b90539e..3f08fe5 100644 --- a/lib/proto/chat.pbjson.dart +++ b/lib/proto/chat.pbjson.dart @@ -11,6 +11,7 @@ const ChatChannelType$json = const { const {'1': 'Session', '2': 0}, const {'1': 'Group', '2': 1}, const {'1': 'CSD', '2': 2}, + const {'1': 'TransHK', '2': 3}, ], }; diff --git a/lib/proto/chat.proto b/lib/proto/chat.proto index 128d42b..27c2c5f 100644 --- a/lib/proto/chat.proto +++ b/lib/proto/chat.proto @@ -5,6 +5,7 @@ enum ChatChannelType { Session = 0; //会话 Group = 1; //群组 CSD =2; //客服频道 + TransHK = 3; //翻译管家 } enum ChatType { diff --git a/lib/proto/interpreter.pb.dart b/lib/proto/interpreter.pb.dart deleted file mode 100644 index b8d1c5d..0000000 --- a/lib/proto/interpreter.pb.dart +++ /dev/null @@ -1,250 +0,0 @@ -/// -// Generated code. Do not modify. -// source: interpreter.proto -// -// @dart = 2.3 -// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type - -import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String; - -import 'package:fixnum/fixnum.dart'; -import 'package:protobuf/protobuf.dart' as $pb; - -export 'interpreter.pbenum.dart'; - -class IssueInterpreterOrderReq extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo('IssueInterpreterOrderReq', package: const $pb.PackageName('yl_pb')) - ..a<$core.int>(1, 'tLanguage', $pb.PbFieldType.OU3) - ..a<$core.int>(2, 'scenes', $pb.PbFieldType.O3) - ..aOS(3, 'desc') - ..hasRequiredFields = false - ; - - IssueInterpreterOrderReq._() : super(); - factory IssueInterpreterOrderReq() => create(); - factory IssueInterpreterOrderReq.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory IssueInterpreterOrderReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - IssueInterpreterOrderReq clone() => IssueInterpreterOrderReq()..mergeFromMessage(this); - IssueInterpreterOrderReq copyWith(void Function(IssueInterpreterOrderReq) updates) => super.copyWith((message) => updates(message as IssueInterpreterOrderReq)); - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static IssueInterpreterOrderReq create() => IssueInterpreterOrderReq._(); - IssueInterpreterOrderReq createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - static IssueInterpreterOrderReq getDefault() => _defaultInstance ??= create()..freeze(); - static IssueInterpreterOrderReq _defaultInstance; - - $core.int get tLanguage => $_get(0, 0); - set tLanguage($core.int v) { $_setUnsignedInt32(0, v); } - $core.bool hasTLanguage() => $_has(0); - void clearTLanguage() => clearField(1); - - $core.int get scenes => $_get(1, 0); - set scenes($core.int v) { $_setSignedInt32(1, v); } - $core.bool hasScenes() => $_has(1); - void clearScenes() => clearField(2); - - $core.String get desc => $_getS(2, ''); - set desc($core.String v) { $_setString(2, v); } - $core.bool hasDesc() => $_has(2); - void clearDesc() => clearField(3); -} - -class IssueInterpreterOrderRes extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo('IssueInterpreterOrderRes', package: const $pb.PackageName('yl_pb')) - ..a<$core.int>(1, 'errorCode', $pb.PbFieldType.O3) - ..aOS(2, 'orderId') - ..a<$core.int>(3, 'waitNum', $pb.PbFieldType.O3) - ..hasRequiredFields = false - ; - - IssueInterpreterOrderRes._() : super(); - factory IssueInterpreterOrderRes() => create(); - factory IssueInterpreterOrderRes.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory IssueInterpreterOrderRes.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - IssueInterpreterOrderRes clone() => IssueInterpreterOrderRes()..mergeFromMessage(this); - IssueInterpreterOrderRes copyWith(void Function(IssueInterpreterOrderRes) updates) => super.copyWith((message) => updates(message as IssueInterpreterOrderRes)); - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static IssueInterpreterOrderRes create() => IssueInterpreterOrderRes._(); - IssueInterpreterOrderRes createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - static IssueInterpreterOrderRes getDefault() => _defaultInstance ??= create()..freeze(); - static IssueInterpreterOrderRes _defaultInstance; - - $core.int get errorCode => $_get(0, 0); - set errorCode($core.int v) { $_setSignedInt32(0, v); } - $core.bool hasErrorCode() => $_has(0); - void clearErrorCode() => clearField(1); - - $core.String get orderId => $_getS(1, ''); - set orderId($core.String v) { $_setString(1, v); } - $core.bool hasOrderId() => $_has(1); - void clearOrderId() => clearField(2); - - $core.int get waitNum => $_get(2, 0); - set waitNum($core.int v) { $_setSignedInt32(2, v); } - $core.bool hasWaitNum() => $_has(2); - void clearWaitNum() => clearField(3); -} - -class ReceivingInterpreterOrderReq extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo('ReceivingInterpreterOrderReq', package: const $pb.PackageName('yl_pb')) - ..aOS(1, 'orderId') - ..hasRequiredFields = false - ; - - ReceivingInterpreterOrderReq._() : super(); - factory ReceivingInterpreterOrderReq() => create(); - factory ReceivingInterpreterOrderReq.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory ReceivingInterpreterOrderReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - ReceivingInterpreterOrderReq clone() => ReceivingInterpreterOrderReq()..mergeFromMessage(this); - ReceivingInterpreterOrderReq copyWith(void Function(ReceivingInterpreterOrderReq) updates) => super.copyWith((message) => updates(message as ReceivingInterpreterOrderReq)); - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static ReceivingInterpreterOrderReq create() => ReceivingInterpreterOrderReq._(); - ReceivingInterpreterOrderReq createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - static ReceivingInterpreterOrderReq getDefault() => _defaultInstance ??= create()..freeze(); - static ReceivingInterpreterOrderReq _defaultInstance; - - $core.String get orderId => $_getS(0, ''); - set orderId($core.String v) { $_setString(0, v); } - $core.bool hasOrderId() => $_has(0); - void clearOrderId() => clearField(1); -} - -class ReceivingInterpreterOrderRes extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo('ReceivingInterpreterOrderRes', package: const $pb.PackageName('yl_pb')) - ..a<$core.int>(1, 'errorCode', $pb.PbFieldType.O3) - ..hasRequiredFields = false - ; - - ReceivingInterpreterOrderRes._() : super(); - factory ReceivingInterpreterOrderRes() => create(); - factory ReceivingInterpreterOrderRes.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory ReceivingInterpreterOrderRes.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - ReceivingInterpreterOrderRes clone() => ReceivingInterpreterOrderRes()..mergeFromMessage(this); - ReceivingInterpreterOrderRes copyWith(void Function(ReceivingInterpreterOrderRes) updates) => super.copyWith((message) => updates(message as ReceivingInterpreterOrderRes)); - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static ReceivingInterpreterOrderRes create() => ReceivingInterpreterOrderRes._(); - ReceivingInterpreterOrderRes createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - static ReceivingInterpreterOrderRes getDefault() => _defaultInstance ??= create()..freeze(); - static ReceivingInterpreterOrderRes _defaultInstance; - - $core.int get errorCode => $_get(0, 0); - set errorCode($core.int v) { $_setSignedInt32(0, v); } - $core.bool hasErrorCode() => $_has(0); - void clearErrorCode() => clearField(1); -} - -class CancellationInterpreterOrderReq extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo('CancellationInterpreterOrderReq', package: const $pb.PackageName('yl_pb')) - ..aOS(1, 'orderId') - ..hasRequiredFields = false - ; - - CancellationInterpreterOrderReq._() : super(); - factory CancellationInterpreterOrderReq() => create(); - factory CancellationInterpreterOrderReq.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory CancellationInterpreterOrderReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - CancellationInterpreterOrderReq clone() => CancellationInterpreterOrderReq()..mergeFromMessage(this); - CancellationInterpreterOrderReq copyWith(void Function(CancellationInterpreterOrderReq) updates) => super.copyWith((message) => updates(message as CancellationInterpreterOrderReq)); - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static CancellationInterpreterOrderReq create() => CancellationInterpreterOrderReq._(); - CancellationInterpreterOrderReq createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - static CancellationInterpreterOrderReq getDefault() => _defaultInstance ??= create()..freeze(); - static CancellationInterpreterOrderReq _defaultInstance; - - $core.String get orderId => $_getS(0, ''); - set orderId($core.String v) { $_setString(0, v); } - $core.bool hasOrderId() => $_has(0); - void clearOrderId() => clearField(1); -} - -class CancellationInterpreterOrderRes extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo('CancellationInterpreterOrderRes', package: const $pb.PackageName('yl_pb')) - ..a<$core.int>(1, 'errorCode', $pb.PbFieldType.O3) - ..aOS(2, 'orderId') - ..hasRequiredFields = false - ; - - CancellationInterpreterOrderRes._() : super(); - factory CancellationInterpreterOrderRes() => create(); - factory CancellationInterpreterOrderRes.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory CancellationInterpreterOrderRes.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - CancellationInterpreterOrderRes clone() => CancellationInterpreterOrderRes()..mergeFromMessage(this); - CancellationInterpreterOrderRes copyWith(void Function(CancellationInterpreterOrderRes) updates) => super.copyWith((message) => updates(message as CancellationInterpreterOrderRes)); - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static CancellationInterpreterOrderRes create() => CancellationInterpreterOrderRes._(); - CancellationInterpreterOrderRes createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - static CancellationInterpreterOrderRes getDefault() => _defaultInstance ??= create()..freeze(); - static CancellationInterpreterOrderRes _defaultInstance; - - $core.int get errorCode => $_get(0, 0); - set errorCode($core.int v) { $_setSignedInt32(0, v); } - $core.bool hasErrorCode() => $_has(0); - void clearErrorCode() => clearField(1); - - $core.String get orderId => $_getS(1, ''); - set orderId($core.String v) { $_setString(1, v); } - $core.bool hasOrderId() => $_has(1); - void clearOrderId() => clearField(2); -} - -class DeliveryInterpreterOrderPush extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo('DeliveryInterpreterOrderPush', package: const $pb.PackageName('yl_pb')) - ..aOS(1, 'orderId') - ..aInt64(2, 'createTime') - ..a<$core.int>(3, 'tLanguage', $pb.PbFieldType.OU3) - ..a<$core.int>(4, 'scenes', $pb.PbFieldType.O3) - ..aOS(5, 'desc') - ..hasRequiredFields = false - ; - - DeliveryInterpreterOrderPush._() : super(); - factory DeliveryInterpreterOrderPush() => create(); - factory DeliveryInterpreterOrderPush.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory DeliveryInterpreterOrderPush.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - DeliveryInterpreterOrderPush clone() => DeliveryInterpreterOrderPush()..mergeFromMessage(this); - DeliveryInterpreterOrderPush copyWith(void Function(DeliveryInterpreterOrderPush) updates) => super.copyWith((message) => updates(message as DeliveryInterpreterOrderPush)); - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static DeliveryInterpreterOrderPush create() => DeliveryInterpreterOrderPush._(); - DeliveryInterpreterOrderPush createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - static DeliveryInterpreterOrderPush getDefault() => _defaultInstance ??= create()..freeze(); - static DeliveryInterpreterOrderPush _defaultInstance; - - $core.String get orderId => $_getS(0, ''); - set orderId($core.String v) { $_setString(0, v); } - $core.bool hasOrderId() => $_has(0); - void clearOrderId() => clearField(1); - - Int64 get createTime => $_getI64(1); - set createTime(Int64 v) { $_setInt64(1, v); } - $core.bool hasCreateTime() => $_has(1); - void clearCreateTime() => clearField(2); - - $core.int get tLanguage => $_get(2, 0); - set tLanguage($core.int v) { $_setUnsignedInt32(2, v); } - $core.bool hasTLanguage() => $_has(2); - void clearTLanguage() => clearField(3); - - $core.int get scenes => $_get(3, 0); - set scenes($core.int v) { $_setSignedInt32(3, v); } - $core.bool hasScenes() => $_has(3); - void clearScenes() => clearField(4); - - $core.String get desc => $_getS(4, ''); - set desc($core.String v) { $_setString(4, v); } - $core.bool hasDesc() => $_has(4); - void clearDesc() => clearField(5); -} - diff --git a/lib/proto/interpreter.pbenum.dart b/lib/proto/interpreter.pbenum.dart deleted file mode 100644 index 01ab6c7..0000000 --- a/lib/proto/interpreter.pbenum.dart +++ /dev/null @@ -1,30 +0,0 @@ -/// -// Generated code. Do not modify. -// source: interpreter.proto -// -// @dart = 2.3 -// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type - -// ignore_for_file: UNDEFINED_SHOWN_NAME,UNUSED_SHOWN_NAME -import 'dart:core' as $core show int, dynamic, String, List, Map; -import 'package:protobuf/protobuf.dart' as $pb; - -class InterpreterOrderState extends $pb.ProtobufEnum { - static const InterpreterOrderState Distributeing = InterpreterOrderState._(1, 'Distributeing'); - static const InterpreterOrderState Underway = InterpreterOrderState._(2, 'Underway'); - static const InterpreterOrderState Rescinded = InterpreterOrderState._(3, 'Rescinded'); - static const InterpreterOrderState Completed = InterpreterOrderState._(4, 'Completed'); - - static const $core.List values = [ - Distributeing, - Underway, - Rescinded, - Completed, - ]; - - static final $core.Map<$core.int, InterpreterOrderState> _byValue = $pb.ProtobufEnum.initByValue(values); - static InterpreterOrderState valueOf($core.int value) => _byValue[value]; - - const InterpreterOrderState._($core.int v, $core.String n) : super(v, n); -} - diff --git a/lib/proto/interpreter.pbjson.dart b/lib/proto/interpreter.pbjson.dart deleted file mode 100644 index 6dfbeef..0000000 --- a/lib/proto/interpreter.pbjson.dart +++ /dev/null @@ -1,75 +0,0 @@ -/// -// Generated code. Do not modify. -// source: interpreter.proto -// -// @dart = 2.3 -// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type - -const InterpreterOrderState$json = const { - '1': 'InterpreterOrderState', - '2': const [ - const {'1': 'Distributeing', '2': 1}, - const {'1': 'Underway', '2': 2}, - const {'1': 'Rescinded', '2': 3}, - const {'1': 'Completed', '2': 4}, - ], -}; - -const IssueInterpreterOrderReq$json = const { - '1': 'IssueInterpreterOrderReq', - '2': const [ - const {'1': 'TLanguage', '3': 1, '4': 1, '5': 13, '10': 'TLanguage'}, - const {'1': 'Scenes', '3': 2, '4': 1, '5': 5, '10': 'Scenes'}, - const {'1': 'Desc', '3': 3, '4': 1, '5': 9, '10': 'Desc'}, - ], -}; - -const IssueInterpreterOrderRes$json = const { - '1': 'IssueInterpreterOrderRes', - '2': const [ - const {'1': 'ErrorCode', '3': 1, '4': 1, '5': 5, '10': 'ErrorCode'}, - const {'1': 'OrderId', '3': 2, '4': 1, '5': 9, '10': 'OrderId'}, - const {'1': 'WaitNum', '3': 3, '4': 1, '5': 5, '10': 'WaitNum'}, - ], -}; - -const ReceivingInterpreterOrderReq$json = const { - '1': 'ReceivingInterpreterOrderReq', - '2': const [ - const {'1': 'OrderId', '3': 1, '4': 1, '5': 9, '10': 'OrderId'}, - ], -}; - -const ReceivingInterpreterOrderRes$json = const { - '1': 'ReceivingInterpreterOrderRes', - '2': const [ - const {'1': 'ErrorCode', '3': 1, '4': 1, '5': 5, '10': 'ErrorCode'}, - ], -}; - -const CancellationInterpreterOrderReq$json = const { - '1': 'CancellationInterpreterOrderReq', - '2': const [ - const {'1': 'OrderId', '3': 1, '4': 1, '5': 9, '10': 'OrderId'}, - ], -}; - -const CancellationInterpreterOrderRes$json = const { - '1': 'CancellationInterpreterOrderRes', - '2': const [ - const {'1': 'ErrorCode', '3': 1, '4': 1, '5': 5, '10': 'ErrorCode'}, - const {'1': 'OrderId', '3': 2, '4': 1, '5': 9, '10': 'OrderId'}, - ], -}; - -const DeliveryInterpreterOrderPush$json = const { - '1': 'DeliveryInterpreterOrderPush', - '2': const [ - const {'1': 'OrderId', '3': 1, '4': 1, '5': 9, '10': 'OrderId'}, - const {'1': 'CreateTime', '3': 2, '4': 1, '5': 3, '10': 'CreateTime'}, - const {'1': 'TLanguage', '3': 3, '4': 1, '5': 13, '10': 'TLanguage'}, - const {'1': 'Scenes', '3': 4, '4': 1, '5': 5, '10': 'Scenes'}, - const {'1': 'Desc', '3': 5, '4': 1, '5': 9, '10': 'Desc'}, - ], -}; - diff --git a/lib/proto/interpreter.proto b/lib/proto/interpreter.proto deleted file mode 100644 index a7569c7..0000000 --- a/lib/proto/interpreter.proto +++ /dev/null @@ -1,55 +0,0 @@ -syntax = "proto2"; -package yl_pb; - -//comid = 3 -enum InterpreterOrderState{ - Distributeing = 1; //派发中 - Underway = 2; //进行中 - Rescinded = 3; //已撤销 - Completed = 4; //已完成 -} - -//-------------------------------------------消息------------------------- -//Msg=1 发布翻译管家帮助订单 -message IssueInterpreterOrderReq { - optional uint32 TLanguage =1; //翻译语言 - optional int32 Scenes =2; //场景 - optional string Desc =3; //描述 -} - -//Msg=2 发布翻译管家帮助订单回应 -message IssueInterpreterOrderRes { - optional int32 ErrorCode = 1; //详见错误码文档 - optional string OrderId =2; //订单号 - optional int32 WaitNum =3; //需要等待人数 -} - -//Msg= 3 接收订单消息请求 -message ReceivingInterpreterOrderReq { - optional string OrderId =1; //订单号 -} - -//Msg= 4 接收订单消息回应 -message ReceivingInterpreterOrderRes { - optional int32 ErrorCode = 1; //详见错误码文档 -} - -//Msg= 5 撤销订单消息 -message CancellationInterpreterOrderReq { - optional string OrderId =1; //订单号 -} - -//Msg= 6 撤销订单消息回应 -message CancellationInterpreterOrderRes { - optional int32 ErrorCode = 1; //详见错误码文档 - optional string OrderId = 2; //订单号 -} - -//Msg= 50 派送订单推送 -message DeliveryInterpreterOrderPush { - optional string OrderId =1; //订单号 - optional int64 CreateTime = 2; //创建时间 - optional uint32 TLanguage =3; //翻译语言 - optional int32 Scenes =4; //场景 - optional string Desc =5; //描述 -} \ No newline at end of file diff --git a/lib/proto/transhousekeeper.pb.dart b/lib/proto/transhousekeeper.pb.dart new file mode 100644 index 0000000..a52bdfd --- /dev/null +++ b/lib/proto/transhousekeeper.pb.dart @@ -0,0 +1,354 @@ +/// +// Generated code. Do not modify. +// source: transhousekeeper.proto +// +// @dart = 2.3 +// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type + +import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String; + +import 'package:fixnum/fixnum.dart'; +import 'package:protobuf/protobuf.dart' as $pb; + +import 'chat.pb.dart' as $0; + +export 'transhousekeeper.pbenum.dart'; + +class IssueTransHKOrderReq extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('IssueTransHKOrderReq', package: const $pb.PackageName('yl_pb')) + ..a<$core.int>(1, 'tLanguage', $pb.PbFieldType.OU3) + ..a<$core.int>(2, 'scenes', $pb.PbFieldType.O3) + ..aOS(3, 'desc') + ..hasRequiredFields = false + ; + + IssueTransHKOrderReq._() : super(); + factory IssueTransHKOrderReq() => create(); + factory IssueTransHKOrderReq.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory IssueTransHKOrderReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + IssueTransHKOrderReq clone() => IssueTransHKOrderReq()..mergeFromMessage(this); + IssueTransHKOrderReq copyWith(void Function(IssueTransHKOrderReq) updates) => super.copyWith((message) => updates(message as IssueTransHKOrderReq)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static IssueTransHKOrderReq create() => IssueTransHKOrderReq._(); + IssueTransHKOrderReq createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static IssueTransHKOrderReq getDefault() => _defaultInstance ??= create()..freeze(); + static IssueTransHKOrderReq _defaultInstance; + + $core.int get tLanguage => $_get(0, 0); + set tLanguage($core.int v) { $_setUnsignedInt32(0, v); } + $core.bool hasTLanguage() => $_has(0); + void clearTLanguage() => clearField(1); + + $core.int get scenes => $_get(1, 0); + set scenes($core.int v) { $_setSignedInt32(1, v); } + $core.bool hasScenes() => $_has(1); + void clearScenes() => clearField(2); + + $core.String get desc => $_getS(2, ''); + set desc($core.String v) { $_setString(2, v); } + $core.bool hasDesc() => $_has(2); + void clearDesc() => clearField(3); +} + +class IssueTransHKOrderRes extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('IssueTransHKOrderRes', package: const $pb.PackageName('yl_pb')) + ..a<$core.int>(1, 'errorCode', $pb.PbFieldType.O3) + ..aOS(2, 'orderId') + ..a<$core.int>(3, 'waitNum', $pb.PbFieldType.O3) + ..hasRequiredFields = false + ; + + IssueTransHKOrderRes._() : super(); + factory IssueTransHKOrderRes() => create(); + factory IssueTransHKOrderRes.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory IssueTransHKOrderRes.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + IssueTransHKOrderRes clone() => IssueTransHKOrderRes()..mergeFromMessage(this); + IssueTransHKOrderRes copyWith(void Function(IssueTransHKOrderRes) updates) => super.copyWith((message) => updates(message as IssueTransHKOrderRes)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static IssueTransHKOrderRes create() => IssueTransHKOrderRes._(); + IssueTransHKOrderRes createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static IssueTransHKOrderRes getDefault() => _defaultInstance ??= create()..freeze(); + static IssueTransHKOrderRes _defaultInstance; + + $core.int get errorCode => $_get(0, 0); + set errorCode($core.int v) { $_setSignedInt32(0, v); } + $core.bool hasErrorCode() => $_has(0); + void clearErrorCode() => clearField(1); + + $core.String get orderId => $_getS(1, ''); + set orderId($core.String v) { $_setString(1, v); } + $core.bool hasOrderId() => $_has(1); + void clearOrderId() => clearField(2); + + $core.int get waitNum => $_get(2, 0); + set waitNum($core.int v) { $_setSignedInt32(2, v); } + $core.bool hasWaitNum() => $_has(2); + void clearWaitNum() => clearField(3); +} + +class ReceivingTransHKOrderReq extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('ReceivingTransHKOrderReq', package: const $pb.PackageName('yl_pb')) + ..aOS(1, 'orderId') + ..hasRequiredFields = false + ; + + ReceivingTransHKOrderReq._() : super(); + factory ReceivingTransHKOrderReq() => create(); + factory ReceivingTransHKOrderReq.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory ReceivingTransHKOrderReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + ReceivingTransHKOrderReq clone() => ReceivingTransHKOrderReq()..mergeFromMessage(this); + ReceivingTransHKOrderReq copyWith(void Function(ReceivingTransHKOrderReq) updates) => super.copyWith((message) => updates(message as ReceivingTransHKOrderReq)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static ReceivingTransHKOrderReq create() => ReceivingTransHKOrderReq._(); + ReceivingTransHKOrderReq createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static ReceivingTransHKOrderReq getDefault() => _defaultInstance ??= create()..freeze(); + static ReceivingTransHKOrderReq _defaultInstance; + + $core.String get orderId => $_getS(0, ''); + set orderId($core.String v) { $_setString(0, v); } + $core.bool hasOrderId() => $_has(0); + void clearOrderId() => clearField(1); +} + +class ReceivingTransHKOrderRes extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('ReceivingTransHKOrderRes', package: const $pb.PackageName('yl_pb')) + ..a<$core.int>(1, 'errorCode', $pb.PbFieldType.O3) + ..hasRequiredFields = false + ; + + ReceivingTransHKOrderRes._() : super(); + factory ReceivingTransHKOrderRes() => create(); + factory ReceivingTransHKOrderRes.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory ReceivingTransHKOrderRes.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + ReceivingTransHKOrderRes clone() => ReceivingTransHKOrderRes()..mergeFromMessage(this); + ReceivingTransHKOrderRes copyWith(void Function(ReceivingTransHKOrderRes) updates) => super.copyWith((message) => updates(message as ReceivingTransHKOrderRes)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static ReceivingTransHKOrderRes create() => ReceivingTransHKOrderRes._(); + ReceivingTransHKOrderRes createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static ReceivingTransHKOrderRes getDefault() => _defaultInstance ??= create()..freeze(); + static ReceivingTransHKOrderRes _defaultInstance; + + $core.int get errorCode => $_get(0, 0); + set errorCode($core.int v) { $_setSignedInt32(0, v); } + $core.bool hasErrorCode() => $_has(0); + void clearErrorCode() => clearField(1); +} + +class CancellationTransHKOrderReq extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('CancellationTransHKOrderReq', package: const $pb.PackageName('yl_pb')) + ..aOS(1, 'orderId') + ..hasRequiredFields = false + ; + + CancellationTransHKOrderReq._() : super(); + factory CancellationTransHKOrderReq() => create(); + factory CancellationTransHKOrderReq.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory CancellationTransHKOrderReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + CancellationTransHKOrderReq clone() => CancellationTransHKOrderReq()..mergeFromMessage(this); + CancellationTransHKOrderReq copyWith(void Function(CancellationTransHKOrderReq) updates) => super.copyWith((message) => updates(message as CancellationTransHKOrderReq)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static CancellationTransHKOrderReq create() => CancellationTransHKOrderReq._(); + CancellationTransHKOrderReq createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static CancellationTransHKOrderReq getDefault() => _defaultInstance ??= create()..freeze(); + static CancellationTransHKOrderReq _defaultInstance; + + $core.String get orderId => $_getS(0, ''); + set orderId($core.String v) { $_setString(0, v); } + $core.bool hasOrderId() => $_has(0); + void clearOrderId() => clearField(1); +} + +class CancellationTransHKOrderRes extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('CancellationTransHKOrderRes', package: const $pb.PackageName('yl_pb')) + ..a<$core.int>(1, 'errorCode', $pb.PbFieldType.O3) + ..aOS(2, 'orderId') + ..hasRequiredFields = false + ; + + CancellationTransHKOrderRes._() : super(); + factory CancellationTransHKOrderRes() => create(); + factory CancellationTransHKOrderRes.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory CancellationTransHKOrderRes.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + CancellationTransHKOrderRes clone() => CancellationTransHKOrderRes()..mergeFromMessage(this); + CancellationTransHKOrderRes copyWith(void Function(CancellationTransHKOrderRes) updates) => super.copyWith((message) => updates(message as CancellationTransHKOrderRes)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static CancellationTransHKOrderRes create() => CancellationTransHKOrderRes._(); + CancellationTransHKOrderRes createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static CancellationTransHKOrderRes getDefault() => _defaultInstance ??= create()..freeze(); + static CancellationTransHKOrderRes _defaultInstance; + + $core.int get errorCode => $_get(0, 0); + set errorCode($core.int v) { $_setSignedInt32(0, v); } + $core.bool hasErrorCode() => $_has(0); + void clearErrorCode() => clearField(1); + + $core.String get orderId => $_getS(1, ''); + set orderId($core.String v) { $_setString(1, v); } + $core.bool hasOrderId() => $_has(1); + void clearOrderId() => clearField(2); +} + +class DeliveryTransHKOrderPush extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('DeliveryTransHKOrderPush', package: const $pb.PackageName('yl_pb')) + ..aOS(1, 'orderId') + ..aInt64(2, 'createTime') + ..a<$core.int>(3, 'tLanguage', $pb.PbFieldType.OU3) + ..a<$core.int>(4, 'scenes', $pb.PbFieldType.O3) + ..aOS(5, 'desc') + ..hasRequiredFields = false + ; + + DeliveryTransHKOrderPush._() : super(); + factory DeliveryTransHKOrderPush() => create(); + factory DeliveryTransHKOrderPush.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory DeliveryTransHKOrderPush.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + DeliveryTransHKOrderPush clone() => DeliveryTransHKOrderPush()..mergeFromMessage(this); + DeliveryTransHKOrderPush copyWith(void Function(DeliveryTransHKOrderPush) updates) => super.copyWith((message) => updates(message as DeliveryTransHKOrderPush)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static DeliveryTransHKOrderPush create() => DeliveryTransHKOrderPush._(); + DeliveryTransHKOrderPush createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static DeliveryTransHKOrderPush getDefault() => _defaultInstance ??= create()..freeze(); + static DeliveryTransHKOrderPush _defaultInstance; + + $core.String get orderId => $_getS(0, ''); + set orderId($core.String v) { $_setString(0, v); } + $core.bool hasOrderId() => $_has(0); + void clearOrderId() => clearField(1); + + Int64 get createTime => $_getI64(1); + set createTime(Int64 v) { $_setInt64(1, v); } + $core.bool hasCreateTime() => $_has(1); + void clearCreateTime() => clearField(2); + + $core.int get tLanguage => $_get(2, 0); + set tLanguage($core.int v) { $_setUnsignedInt32(2, v); } + $core.bool hasTLanguage() => $_has(2); + void clearTLanguage() => clearField(3); + + $core.int get scenes => $_get(3, 0); + set scenes($core.int v) { $_setSignedInt32(3, v); } + $core.bool hasScenes() => $_has(3); + void clearScenes() => clearField(4); + + $core.String get desc => $_getS(4, ''); + set desc($core.String v) { $_setString(4, v); } + $core.bool hasDesc() => $_has(4); + void clearDesc() => clearField(5); +} + +class CancellationTransHKOrderPush extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('CancellationTransHKOrderPush', package: const $pb.PackageName('yl_pb')) + ..aOS(1, 'orderId') + ..hasRequiredFields = false + ; + + CancellationTransHKOrderPush._() : super(); + factory CancellationTransHKOrderPush() => create(); + factory CancellationTransHKOrderPush.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory CancellationTransHKOrderPush.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + CancellationTransHKOrderPush clone() => CancellationTransHKOrderPush()..mergeFromMessage(this); + CancellationTransHKOrderPush copyWith(void Function(CancellationTransHKOrderPush) updates) => super.copyWith((message) => updates(message as CancellationTransHKOrderPush)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static CancellationTransHKOrderPush create() => CancellationTransHKOrderPush._(); + CancellationTransHKOrderPush createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static CancellationTransHKOrderPush getDefault() => _defaultInstance ??= create()..freeze(); + static CancellationTransHKOrderPush _defaultInstance; + + $core.String get orderId => $_getS(0, ''); + set orderId($core.String v) { $_setString(0, v); } + $core.bool hasOrderId() => $_has(0); + void clearOrderId() => clearField(1); +} + +class TransHKChatStartPush extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('TransHKChatStartPush', package: const $pb.PackageName('yl_pb')) + ..aInt64(1, 'startTime') + ..a<$core.int>(2, 'targetId', $pb.PbFieldType.OU3) + ..a<$0.BaseUserInfo>(3, 'employer', $pb.PbFieldType.OM, $0.BaseUserInfo.getDefault, $0.BaseUserInfo.create) + ..a<$0.BaseUserInfo>(4, 'inter', $pb.PbFieldType.OM, $0.BaseUserInfo.getDefault, $0.BaseUserInfo.create) + ..hasRequiredFields = false + ; + + TransHKChatStartPush._() : super(); + factory TransHKChatStartPush() => create(); + factory TransHKChatStartPush.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory TransHKChatStartPush.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + TransHKChatStartPush clone() => TransHKChatStartPush()..mergeFromMessage(this); + TransHKChatStartPush copyWith(void Function(TransHKChatStartPush) updates) => super.copyWith((message) => updates(message as TransHKChatStartPush)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static TransHKChatStartPush create() => TransHKChatStartPush._(); + TransHKChatStartPush createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static TransHKChatStartPush getDefault() => _defaultInstance ??= create()..freeze(); + static TransHKChatStartPush _defaultInstance; + + Int64 get startTime => $_getI64(0); + set startTime(Int64 v) { $_setInt64(0, v); } + $core.bool hasStartTime() => $_has(0); + void clearStartTime() => clearField(1); + + $core.int get targetId => $_get(1, 0); + set targetId($core.int v) { $_setUnsignedInt32(1, v); } + $core.bool hasTargetId() => $_has(1); + void clearTargetId() => clearField(2); + + $0.BaseUserInfo get employer => $_getN(2); + set employer($0.BaseUserInfo v) { setField(3, v); } + $core.bool hasEmployer() => $_has(2); + void clearEmployer() => clearField(3); + + $0.BaseUserInfo get inter => $_getN(3); + set inter($0.BaseUserInfo v) { setField(4, v); } + $core.bool hasInter() => $_has(3); + void clearInter() => clearField(4); +} + +class TransHKChatEndPush extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo('TransHKChatEndPush', package: const $pb.PackageName('yl_pb')) + ..a<$core.int>(1, 'targetId', $pb.PbFieldType.OU3) + ..aInt64(2, 'endTime') + ..hasRequiredFields = false + ; + + TransHKChatEndPush._() : super(); + factory TransHKChatEndPush() => create(); + factory TransHKChatEndPush.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory TransHKChatEndPush.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + TransHKChatEndPush clone() => TransHKChatEndPush()..mergeFromMessage(this); + TransHKChatEndPush copyWith(void Function(TransHKChatEndPush) updates) => super.copyWith((message) => updates(message as TransHKChatEndPush)); + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static TransHKChatEndPush create() => TransHKChatEndPush._(); + TransHKChatEndPush createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + static TransHKChatEndPush getDefault() => _defaultInstance ??= create()..freeze(); + static TransHKChatEndPush _defaultInstance; + + $core.int get targetId => $_get(0, 0); + set targetId($core.int v) { $_setUnsignedInt32(0, v); } + $core.bool hasTargetId() => $_has(0); + void clearTargetId() => clearField(1); + + Int64 get endTime => $_getI64(1); + set endTime(Int64 v) { $_setInt64(1, v); } + $core.bool hasEndTime() => $_has(1); + void clearEndTime() => clearField(2); +} + diff --git a/lib/proto/transhousekeeper.pbenum.dart b/lib/proto/transhousekeeper.pbenum.dart new file mode 100644 index 0000000..723fd56 --- /dev/null +++ b/lib/proto/transhousekeeper.pbenum.dart @@ -0,0 +1,32 @@ +/// +// Generated code. Do not modify. +// source: transhousekeeper.proto +// +// @dart = 2.3 +// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type + +// ignore_for_file: UNDEFINED_SHOWN_NAME,UNUSED_SHOWN_NAME +import 'dart:core' as $core show int, dynamic, String, List, Map; +import 'package:protobuf/protobuf.dart' as $pb; + +class TransHKOrderState extends $pb.ProtobufEnum { + static const TransHKOrderState Waiting = TransHKOrderState._(1, 'Waiting'); + static const TransHKOrderState Distributeing = TransHKOrderState._(2, 'Distributeing'); + static const TransHKOrderState Underway = TransHKOrderState._(3, 'Underway'); + static const TransHKOrderState Rescinded = TransHKOrderState._(4, 'Rescinded'); + static const TransHKOrderState Completed = TransHKOrderState._(5, 'Completed'); + + static const $core.List values = [ + Waiting, + Distributeing, + Underway, + Rescinded, + Completed, + ]; + + static final $core.Map<$core.int, TransHKOrderState> _byValue = $pb.ProtobufEnum.initByValue(values); + static TransHKOrderState valueOf($core.int value) => _byValue[value]; + + const TransHKOrderState._($core.int v, $core.String n) : super(v, n); +} + diff --git a/lib/proto/transhousekeeper.pbjson.dart b/lib/proto/transhousekeeper.pbjson.dart new file mode 100644 index 0000000..f6b0367 --- /dev/null +++ b/lib/proto/transhousekeeper.pbjson.dart @@ -0,0 +1,101 @@ +/// +// Generated code. Do not modify. +// source: transhousekeeper.proto +// +// @dart = 2.3 +// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type + +const TransHKOrderState$json = const { + '1': 'TransHKOrderState', + '2': const [ + const {'1': 'Waiting', '2': 1}, + const {'1': 'Distributeing', '2': 2}, + const {'1': 'Underway', '2': 3}, + const {'1': 'Rescinded', '2': 4}, + const {'1': 'Completed', '2': 5}, + ], +}; + +const IssueTransHKOrderReq$json = const { + '1': 'IssueTransHKOrderReq', + '2': const [ + const {'1': 'TLanguage', '3': 1, '4': 1, '5': 13, '10': 'TLanguage'}, + const {'1': 'Scenes', '3': 2, '4': 1, '5': 5, '10': 'Scenes'}, + const {'1': 'Desc', '3': 3, '4': 1, '5': 9, '10': 'Desc'}, + ], +}; + +const IssueTransHKOrderRes$json = const { + '1': 'IssueTransHKOrderRes', + '2': const [ + const {'1': 'ErrorCode', '3': 1, '4': 1, '5': 5, '10': 'ErrorCode'}, + const {'1': 'OrderId', '3': 2, '4': 1, '5': 9, '10': 'OrderId'}, + const {'1': 'WaitNum', '3': 3, '4': 1, '5': 5, '10': 'WaitNum'}, + ], +}; + +const ReceivingTransHKOrderReq$json = const { + '1': 'ReceivingTransHKOrderReq', + '2': const [ + const {'1': 'OrderId', '3': 1, '4': 1, '5': 9, '10': 'OrderId'}, + ], +}; + +const ReceivingTransHKOrderRes$json = const { + '1': 'ReceivingTransHKOrderRes', + '2': const [ + const {'1': 'ErrorCode', '3': 1, '4': 1, '5': 5, '10': 'ErrorCode'}, + ], +}; + +const CancellationTransHKOrderReq$json = const { + '1': 'CancellationTransHKOrderReq', + '2': const [ + const {'1': 'OrderId', '3': 1, '4': 1, '5': 9, '10': 'OrderId'}, + ], +}; + +const CancellationTransHKOrderRes$json = const { + '1': 'CancellationTransHKOrderRes', + '2': const [ + const {'1': 'ErrorCode', '3': 1, '4': 1, '5': 5, '10': 'ErrorCode'}, + const {'1': 'OrderId', '3': 2, '4': 1, '5': 9, '10': 'OrderId'}, + ], +}; + +const DeliveryTransHKOrderPush$json = const { + '1': 'DeliveryTransHKOrderPush', + '2': const [ + const {'1': 'OrderId', '3': 1, '4': 1, '5': 9, '10': 'OrderId'}, + const {'1': 'CreateTime', '3': 2, '4': 1, '5': 3, '10': 'CreateTime'}, + const {'1': 'TLanguage', '3': 3, '4': 1, '5': 13, '10': 'TLanguage'}, + const {'1': 'Scenes', '3': 4, '4': 1, '5': 5, '10': 'Scenes'}, + const {'1': 'Desc', '3': 5, '4': 1, '5': 9, '10': 'Desc'}, + ], +}; + +const CancellationTransHKOrderPush$json = const { + '1': 'CancellationTransHKOrderPush', + '2': const [ + const {'1': 'OrderId', '3': 1, '4': 1, '5': 9, '10': 'OrderId'}, + ], +}; + +const TransHKChatStartPush$json = const { + '1': 'TransHKChatStartPush', + '2': const [ + const {'1': 'StartTime', '3': 1, '4': 1, '5': 3, '10': 'StartTime'}, + const {'1': 'TargetId', '3': 2, '4': 1, '5': 13, '10': 'TargetId'}, + const {'1': 'Employer', '3': 3, '4': 1, '5': 11, '6': '.yl_pb.BaseUserInfo', '10': 'Employer'}, + const {'1': 'Inter', '3': 4, '4': 1, '5': 11, '6': '.yl_pb.BaseUserInfo', '10': 'Inter'}, + ], +}; + +const TransHKChatEndPush$json = const { + '1': 'TransHKChatEndPush', + '2': const [ + const {'1': 'TargetId', '3': 1, '4': 1, '5': 13, '10': 'TargetId'}, + const {'1': 'EndTime', '3': 2, '4': 1, '5': 3, '10': 'EndTime'}, + ], +}; + diff --git a/lib/proto/interpreter.pbserver.dart b/lib/proto/transhousekeeper.pbserver.dart similarity index 73% rename from lib/proto/interpreter.pbserver.dart rename to lib/proto/transhousekeeper.pbserver.dart index 207f54e..022f037 100644 --- a/lib/proto/interpreter.pbserver.dart +++ b/lib/proto/transhousekeeper.pbserver.dart @@ -1,9 +1,9 @@ /// // Generated code. Do not modify. -// source: interpreter.proto +// source: transhousekeeper.proto // // @dart = 2.3 // ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type -export 'interpreter.pb.dart'; +export 'transhousekeeper.pb.dart'; diff --git a/lib/proto/transhousekeeper.proto b/lib/proto/transhousekeeper.proto new file mode 100644 index 0000000..c760e94 --- /dev/null +++ b/lib/proto/transhousekeeper.proto @@ -0,0 +1,82 @@ +syntax = "proto2"; + +import "chat.proto"; + +package yl_pb; + +//comid = 3 +enum TransHKOrderState{ + Waiting = 1; //等待中 + Distributeing = 2; //派发中 + Underway = 3; //进行中 + Rescinded = 4; //已撤销 + Completed = 5; //已完成 +} + +//-------------------------------------------消息------------------------- +//Msg=1 发布翻译管家帮助订单 +message IssueTransHKOrderReq { + optional uint32 TLanguage =1; //翻译语言 + optional int32 Scenes =2; //场景 + optional string Desc =3; //描述 +} + +//Msg=2 发布翻译管家帮助订单回应 +message IssueTransHKOrderRes { + optional int32 ErrorCode = 1; //详见错误码文档 + optional string OrderId =2; //订单号 + optional int32 WaitNum =3; //需要等待人数 +} + +//Msg= 3 接收订单消息请求 +message ReceivingTransHKOrderReq { + optional string OrderId =1; //订单号 +} + +//Msg= 4 接收订单消息回应 +message ReceivingTransHKOrderRes { + optional int32 ErrorCode = 1; //详见错误码文档 +} + +//Msg= 5 撤销订单消息 +message CancellationTransHKOrderReq { + optional string OrderId =1; //订单号 +} + +//Msg= 6 撤销订单消息回应 +message CancellationTransHKOrderRes { + optional int32 ErrorCode = 1; //详见错误码文档 + optional string OrderId = 2; //订单号 +} + + + +//Msg= 20 派送订单推送 +message DeliveryTransHKOrderPush { + optional string OrderId =1; //订单号 + optional int64 CreateTime = 2; //创建时间 + optional uint32 TLanguage =3; //翻译语言 + optional int32 Scenes =4; //场景 + optional string Desc =5; //描述 +} + +//Msg= 21 订单取消推送 +message CancellationTransHKOrderPush { + optional string OrderId =1; //订单号 +} + + + +//Msg = 30 翻译官价聊天开始推送 +message TransHKChatStartPush { + optional int64 StartTime = 1; //开始时间 + optional uint32 TargetId = 2; //目标聊天用户 + optional BaseUserInfo Employer = 3; //雇主信息 + optional BaseUserInfo Inter = 4; //翻译官信息 +} + +//Msg = 31 翻译官价聊天结束推送 +message TransHKChatEndPush { + optional uint32 TargetId = 1; //发送目标Id SessionId or GroudId + optional int64 EndTime = 2; //结束时间 +} \ No newline at end of file diff --git a/lib/utils/HttpUtil.dart b/lib/utils/HttpUtil.dart index e565c98..7661a77 100644 --- a/lib/utils/HttpUtil.dart +++ b/lib/utils/HttpUtil.dart @@ -44,9 +44,9 @@ class HttpUtil { //static const String BaseUrl = 'http://192.168.0.223:7001/'; //static const String BaseUrl = 'http://192.168.0.207:9080/'; - static const String BaseUrl = 'http://120.79.107.63:9080/'; +// static const String BaseUrl = 'http://120.79.107.63:9080/'; //static const String BaseUrl = 'http://192.168.0.177:9016/'; - //static const String BaseUrl = 'https://datasm.chengyouhd.com/'; + static const String BaseUrl = 'https://datasm.chengyouhd.com/'; static HttpUtil _getInstance() { if (_instance == null) { diff --git a/lib/utils/msgHandler.dart b/lib/utils/msgHandler.dart index 27e52fa..a30ab78 100644 --- a/lib/utils/msgHandler.dart +++ b/lib/utils/msgHandler.dart @@ -11,7 +11,6 @@ import 'package:chat/home/IndexPage.dart'; import 'package:chat/models/ChatMsg.dart'; import 'package:chat/models/group_info_model.dart'; import 'package:chat/proto/all.pbserver.dart'; -import 'package:chat/proto/interpreter.pb.dart'; import 'package:chat/utils/NetUtil.dart'; import 'package:chat/utils/blacklist_mgr.dart'; import 'package:chat/utils/friend_list_mgr.dart'; @@ -1228,78 +1227,78 @@ class MsgHandler { debugPrint('发布翻译管家帮助订单 fromLanguage:$fromLanguage toLanguage: $toLanguage | ${fromLanguage|toLanguage}' ); - var seq = IssueInterpreterOrderReq.create(); - seq.tLanguage = fromLanguage|toLanguage; - - NetWork().sendMsg(ComId.TranslateOrder, 1, seq); +// var seq = IssueInterpreterOrderReq.create(); +// seq.tLanguage = fromLanguage|toLanguage; +// +// NetWork().sendMsg(ComId.TranslateOrder, 1, seq); } //发布翻译管家帮助订单回应 static handlerCreateTranslateOrder(List msgContent) { debugPrint('发布翻译管家帮助订单回应'); - var res = IssueInterpreterOrderRes.fromBuffer(msgContent); - if (res.errorCode == 0) { - -// GroupInfoMgr().updateMemberMsgFree(res.groupId, res.messageFree); - debugPrint('发布翻译管家帮助订单回应-订单号： ${res.orderId} 等待人数 ${res.waitNum}'); - } else { - debugPrint('发布翻译管家帮助订单回应${res.errorCode}'); - } +// var res = IssueInterpreterOrderRes.fromBuffer(msgContent); +// if (res.errorCode == 0) { +// +//// GroupInfoMgr().updateMemberMsgFree(res.groupId, res.messageFree); +// debugPrint('发布翻译管家帮助订单回应-订单号： ${res.orderId} 等待人数 ${res.waitNum}'); +// } else { +// debugPrint('发布翻译管家帮助订单回应${res.errorCode}'); +// } } //撤销订单消息 static sendCancelTranslateOrder( String orderId) { - debugPrint('取消订单 fromLanguage:$orderId' ); - var seq = CancellationInterpreterOrderReq.create(); - seq.orderId = orderId; - - NetWork().sendMsg(ComId.TranslateOrder, 5, seq); +// debugPrint('取消订单 fromLanguage:$orderId' ); +// var seq = CancellationInterpreterOrderReq.create(); +// seq.orderId = orderId; +// +// NetWork().sendMsg(ComId.TranslateOrder, 5, seq); } //撤销订单消息回应 static handlerCancelTranslateOrder(List msgContent) { debugPrint('撤销订单消息回应'); - var res = CancellationInterpreterOrderRes.fromBuffer(msgContent); - if (res.errorCode == 0) { - -// GroupInfoMgr().updateMemberMsgFree(res.groupId, res.messageFree); - debugPrint('撤销订单消息回应成功： ${res.orderId}'); - } else { - debugPrint('撤销订单消息回应成功失败${res.errorCode}'); - } +// var res = CancellationInterpreterOrderRes.fromBuffer(msgContent); +// if (res.errorCode == 0) { +// +//// GroupInfoMgr().updateMemberMsgFree(res.groupId, res.messageFree); +// debugPrint('撤销订单消息回应成功： ${res.orderId}'); +// } else { +// debugPrint('撤销订单消息回应成功失败${res.errorCode}'); +// } } //派送订单推送 static handlerDeliveryInterpreterOrderPush(List msgContent) { - debugPrint('撤销订单消息回应'); - var res = DeliveryInterpreterOrderPush.fromBuffer(msgContent); - print('OrderId: ${res.orderId} createTime: ${res.createTime} tLanguage:${res.tLanguage} scenes:${res.scenes} desc${res.desc}'); +// debugPrint('撤销订单消息回应'); +// var res = DeliveryInterpreterOrderPush.fromBuffer(msgContent); +// print('OrderId: ${res.orderId} createTime: ${res.createTime} tLanguage:${res.tLanguage} scenes:${res.scenes} desc${res.desc}'); } //接收订单请求 static sendReceiveOrder( String orderId) { - debugPrint('接收订单消息请求 orderId:$orderId' ); - var seq = ReceivingInterpreterOrderReq.create(); - seq.orderId = orderId; - - NetWork().sendMsg(ComId.TranslateOrder,3, seq); +// debugPrint('接收订单消息请求 orderId:$orderId' ); +// var seq = ReceivingInterpreterOrderReq.create(); +// seq.orderId = orderId; +// +// NetWork().sendMsg(ComId.TranslateOrder,3, seq); } //接收订单消息回应 static handlerReceiveOrder(List msgContent) { debugPrint('接收订单消息回应'); - var res = ReceivingInterpreterOrderRes.fromBuffer(msgContent); - if (res.errorCode == 0) { - -// GroupInfoMgr().updateMemberMsgFree(res.groupId, res.messageFree); - debugPrint('接收订单消息回应成功： '); - } else { - debugPrint('接收订单消息回应失败${res.errorCode}'); - } +// var res = ReceivingInterpreterOrderRes.fromBuffer(msgContent); +// if (res.errorCode == 0) { +// +//// GroupInfoMgr().updateMemberMsgFree(res.groupId, res.messageFree); +// debugPrint('接收订单消息回应成功： '); +// } else { +// debugPrint('接收订单消息回应失败${res.errorCode}'); +// } }