diff --git a/lib/chat/ChatPage.dart b/lib/chat/ChatPage.dart index 2782af0..7e1f554 100644 --- a/lib/chat/ChatPage.dart +++ b/lib/chat/ChatPage.dart @@ -366,7 +366,7 @@ class _ChatPageState extends State { ? _buildTranslationButler() : Container(), Expanded(child: _buildMessageList()), - InputBar(sendMsg: sendMsg), + InputBar(sendMsg: sendMsg,isTranslateHK: widget.isTranslateButler,), ], ))), behavior: HitTestBehavior.translucent, diff --git a/lib/chat/ChatPageItem.dart b/lib/chat/ChatPageItem.dart index c7be6b2..a6b9b52 100644 --- a/lib/chat/ChatPageItem.dart +++ b/lib/chat/ChatPageItem.dart @@ -294,7 +294,7 @@ class _ChatPageItemState extends State // } - } + } return Container(); } diff --git a/lib/chat/group_chat_view.dart b/lib/chat/group_chat_view.dart index 8d6a1ff..491faa9 100644 --- a/lib/chat/group_chat_view.dart +++ b/lib/chat/group_chat_view.dart @@ -495,7 +495,7 @@ class _GroupChatPageState extends State { itemPositionsListener: itemPositionListener, padding: EdgeInsets.all(8.0), reverse: true, - hitCallback: hideKeyBoard, +// hitCallback: hideKeyBoard, )), ); } diff --git a/lib/chat/input_bar.dart b/lib/chat/input_bar.dart index fd6312b..ee4ff1a 100644 --- a/lib/chat/input_bar.dart +++ b/lib/chat/input_bar.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; +import 'package:chat/chat/ChatPageItem.dart'; import 'package:chat/chat/keyboard_icon.dart'; import 'package:chat/chat/my_extended_text_selection_controls.dart'; import 'package:chat/chat/record_view.dart'; @@ -41,8 +42,8 @@ import 'my_special_text_span_builder.dart'; class InputBar extends StatefulWidget { final Function sendMsg; - - InputBar({this.sendMsg}); + final bool isTranslateHK; + InputBar({this.sendMsg,this.isTranslateHK=false}); @override InputBarState createState() => InputBarState(); @@ -840,13 +841,19 @@ class InputBarState extends State } } + ChatChannelType channelType =isGroup ? ChatChannelType.Group : ChatChannelType.Session; + if(widget.isTranslateHK){ + channelType = ChatChannelType.TransHK; + print('聊天是 TransHK'); + } + MsgModel msg = MsgHandler.createSendMsg( isGift ? ChatType.EmoticonType : ChatType.TextChatType, messageText, friendId: friendId, refMsg: refMsg, refShortTxt: _getRefShortText(), altUsers: alterUsers, - channelType: isGroup ? ChatChannelType.Group : ChatChannelType.Session); + channelType: channelType); widget.sendMsg(msg); diff --git a/lib/data/translate_hk_data_mgr.dart b/lib/data/translate_hk_data_mgr.dart index ffd0420..b1e0b31 100644 --- a/lib/data/translate_hk_data_mgr.dart +++ b/lib/data/translate_hk_data_mgr.dart @@ -36,7 +36,7 @@ class TranslateHKMgr { String orderId; int waitNum=0; - + bool isUser=false; int orderStatus=0; diff --git a/lib/utils/msgHandler.dart b/lib/utils/msgHandler.dart index cf7f504..3d74190 100644 --- a/lib/utils/msgHandler.dart +++ b/lib/utils/msgHandler.dart @@ -439,11 +439,20 @@ class MsgHandler { ///接到开始翻译管家消息-打开翻译管家页面 if(notice.noticeType==TransHKChatNoticeType.StartChat){ - Future.delayed(Duration(seconds: 3),(){ - curActiveSession = sessionId; - print('curActiveSession:$curActiveSession'); - MessageMgr().emit(MessageMgr.TRANSLATE_HK_START_CHAT, friendId.id); - }); + + + if(TranslateHKMgr().isUser){ + //TRANSLATE_HK_RECEIVE_ORDER 发送开始聊天弹窗 + }else{ + Future.delayed(Duration(seconds: 3),(){ + curActiveSession = sessionId; + print('curActiveSession:$curActiveSession'); + MessageMgr().emit(MessageMgr.TRANSLATE_HK_START_CHAT, friendId.id); + }); + } + + + } }else{//私聊通知消息 @@ -970,7 +979,7 @@ class MsgHandler { handlerReceiveOrder(content); }else if(msgId ==6){ handlerCancelTranslateOrder(content); - }else if(msgId==50){ + }else if(msgId==20){ handlerDeliveryInterpreterOrderPush(content); } break; @@ -1268,10 +1277,12 @@ 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 = IssueTransHKOrderReq.create(); + seq.tLanguage = fromLanguage|toLanguage; + seq.scenes =scences; + seq.desc = extraDesc; + TranslateHKMgr().isUser=true; + NetWork().sendMsg(ComId.TranslateOrder, 1, seq); } //发布翻译管家帮助订单回应 @@ -1287,19 +1298,19 @@ class MsgHandler { // GroupInfoMgr().updateMemberMsgFree(res.groupId, res.messageFree); debugPrint('发布翻译管家帮助订单回应-订单号: ${res.orderId} 等待人数 ${res.waitNum}'); } else { - debugPrint('发布翻译管家帮助订单回应${res.errorCode}'); + debugPrint('发布翻译管家帮助订单失败 ${res.errorCode}'); } } //撤销订单消息 - static sendCancelTranslateOrder( String orderId) { + static sendCancelTranslateOrder( ) { -// debugPrint('取消订单 fromLanguage:$orderId' ); -// var seq = CancellationInterpreterOrderReq.create(); -// seq.orderId = orderId; -// -// NetWork().sendMsg(ComId.TranslateOrder, 5, seq); + debugPrint('取消订单 orderid:${TranslateHKMgr().orderId}' ); + var seq = CancellationTransHKOrderReq.create(); + seq.orderId = TranslateHKMgr().orderId; + + NetWork().sendMsg(ComId.TranslateOrder, 5, seq); } //撤销订单消息回应