Merge branch 'master' of https://git.yht521.com/huangjiahao/Hibok

lib/chat/ChatPage.dart

@@ -385,7 +385,7 @@ class _ChatPageState extends State<ChatPage> {
         ]),
       ],
     ));
-    actions.add(TranslateSateWidget(friendId: friendInfo.userId));
+    //actions.add(TranslateSateWidget(friendId: friendInfo.userId));
     actions.add(Container(
         margin: EdgeInsets.only(top: 1),
         child: myPop.PopupMenuButton(
@@ -715,7 +715,9 @@ class _ChatPageState extends State<ChatPage> {
 
     return Container(
       padding: EdgeInsets.fromLTRB(10, 10, 10, 10),
-      decoration: BoxDecoration(color: Colors.white,border: Border(bottom: BorderSide(color:   Colors.grey, width: .3))),
+      decoration: BoxDecoration(
+          color: Colors.white,
+          border: Border(bottom: BorderSide(color: Colors.grey, width: .3))),
       child: Row(
         children: <Widget>[
           ClipRRect(
@@ -877,7 +879,11 @@ class _ChatPageState extends State<ChatPage> {
   }
 
   _deleteItem(msg) {
-    MessageMgr().emit('Cancel Request', msg);
+    if (msg.state == MsgState.Uploading) {
+      print('取消上传');
+      UploadUtil().cancelSendMsg(msg);
+    }
+
     print('#### 开始删除--');
     msgList.remove(msg);
     setState(() {});

lib/chat/ChatPageItem.dart

@@ -13,6 +13,7 @@ import 'package:chat/chat/redbag_widget.dart';
 import 'package:chat/chat/upload_item.dart';
 import 'package:chat/chat/video_view.dart';
 import 'package:chat/data/UserData.dart';
+import 'package:chat/data/chat_data_mgr.dart';
 import 'package:chat/data/constants.dart';
 import 'package:chat/generated/i18n.dart';
 import 'package:chat/models/ChatMsg.dart';
@@ -31,6 +32,7 @@ import 'package:chat/utils/file_cache_mgr.dart';
 import 'package:chat/utils/msgHandler.dart';
 import 'package:chat/utils/screen.dart';
 import 'package:chat/utils/sound_util.dart';
+import 'package:chat/utils/sql_util.dart';
 import 'package:chat/utils/upload_util.dart';
 import 'package:chat/utils/video_anim.dart';
 import 'package:chat/utils/wpop/w_popup_menu.dart';
@@ -86,8 +88,6 @@ class _ChatPageItemState extends State<ChatPageItem>
 
   String curSoundUrl;
 
-  CancelToken _cancelToken = CancelToken();
-
   bool isLongPressed = false;
 
   double maxWidth = Screen.width - 140;
@@ -105,28 +105,14 @@ class _ChatPageItemState extends State<ChatPageItem>
     textList = widget.msg.getTransTextList();
 
     MessageMgr().on('Update Translate Message', updateTranslateMsg);
-    MessageMgr().on('Cancel Request', _deleteItem);
-
-    MessageMgr().on('Cancel Request', _deleteItem);
   }
 
   @override
   void dispose() {
-    MessageMgr().off('Cancel Request', _deleteItem);
     MessageMgr().off('Update Translate Message', updateTranslateMsg);
     super.dispose();
   }
 
-  _deleteItem(msg) {
-    if (msg == widget.msg) {
-      print(widget.msg.state);
-      if (widget.msg.state == MsgState.Uploading) {
-        print('取消上传');
-        UploadUtil().cancelRequests(_cancelToken);
-      }
-    }
-  }
-
   updateTextList() {
     textList.clear();
     curTextType = 0;
@@ -616,7 +602,6 @@ class _ChatPageItemState extends State<ChatPageItem>
         child: ClipRRect(
           child: UploadImgItem(
               msg: widget.msg,
-              cancelToken: _cancelToken,
               child: Container(
                 height: imgSize.height,
                 width: imgSize.width,
@@ -641,7 +626,6 @@ class _ChatPageItemState extends State<ChatPageItem>
           children: <Widget>[
             UploadImgItem(
                 msg: widget.msg,
-                cancelToken: _cancelToken,
                 child: Container(
                   width: imgSize.width,
                   height: imgSize.height,
@@ -702,7 +686,6 @@ class _ChatPageItemState extends State<ChatPageItem>
   Widget _fileMsgItem() {
     return UploadImgItem(
         msg: widget.msg,
-        cancelToken: _cancelToken,
         child: Container(
             height: 100,
             constraints: BoxConstraints(maxWidth: Screen.width - 120),
@@ -1083,7 +1066,8 @@ class _ChatPageItemState extends State<ChatPageItem>
                     print('请求人工翻译成功,进行扣费');
                     setState(() {
                       widget.msg.transTag = 2;
-
+                      SqlUtil().updateUserTranslateState(widget.msg.sessionId,
+                          widget.msg.time, widget.msg.transTag);
                       //优先扣券
                       if (voucher > 0) {
                         int costQuan = min(voucher, needMoney);
@@ -1402,13 +1386,13 @@ class _ChatPageItemState extends State<ChatPageItem>
 
     double width = 130;
     double minWidth = 0;
-    if (textList.length > 0 && textList[curTextType].length>0) {
+    if (textList.length > 0 && textList[curTextType].length > 0) {
       print('textList哒哒哒哒哒 ${textList[curTextType]}');
       width = _getTextWidth(textList[curTextType]) + 20;
       width = min(width, Screen.width - 120);
 
-      if(width<130){
-        width=130;
+      if (width < 130) {
+        width = 130;
       }
 
       showMsg.add(Padding(

lib/chat/group_chat_item.dart

@@ -14,6 +14,7 @@ import 'package:chat/chat/video_view.dart';
 import 'package:chat/data/UserData.dart';
 import 'package:chat/data/constants.dart';
 import 'package:chat/utils/friend_list_mgr.dart';
+import 'package:chat/utils/sql_util.dart';
 import 'package:chat/utils/wpop/w_popup_menu.dart';
 import 'package:flutter/services.dart';
 import 'package:chat/generated/i18n.dart';
@@ -87,8 +88,6 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
 
   String curSoundUrl;
 
-  CancelToken _cancelToken = CancelToken();
-
   bool isLongPressed = false;
 
   double maxWidth = Screen.width - 140;
@@ -106,26 +105,14 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
     textList = widget.msg.getTransTextList();
 
     MessageMgr().on('Update Translate Message', updateTranslateMsg);
-    MessageMgr().on('Cancel Request', _deleteItem);
   }
 
   @override
   void dispose() {
-    MessageMgr().off('Cancel Request', _deleteItem);
     MessageMgr().off('Update Translate Message', updateTranslateMsg);
     super.dispose();
   }
 
-  _deleteItem(msg) {
-    if (msg == widget.msg) {
-      print(widget.msg.state);
-      if (widget.msg.state == MsgState.Uploading) {
-        print('取消上传');
-        UploadUtil().cancelRequests(_cancelToken);
-      }
-    }
-  }
-
   updateTextList() {
     textList.clear();
     curTextType = 0;
@@ -578,7 +565,6 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
         child: ClipRRect(
           child: UploadImgItem(
               msg: widget.msg,
-              cancelToken: _cancelToken,
               child: Container(
                 height: imgSize.height,
                 width: imgSize.width,
@@ -603,7 +589,6 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
           children: <Widget>[
             UploadImgItem(
                 msg: widget.msg,
-                cancelToken: _cancelToken,
                 child: Container(
                   width: imgSize.width,
                   height: imgSize.height,
@@ -660,7 +645,6 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
   Widget _fileMsgItem() {
     return UploadImgItem(
         msg: widget.msg,
-        cancelToken: _cancelToken,
         child: Container(
             height: 100,
             constraints: BoxConstraints(maxWidth: Screen.width - 120),
@@ -1063,7 +1047,8 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
                     print('请求人工翻译成功,进行扣费');
                     setState(() {
                       widget.msg.transTag = 2;
-
+                      SqlUtil().updateUserTranslateState(widget.msg.sessionId,
+                          widget.msg.time, widget.msg.transTag);
                       //优先扣券
                       if (voucher > 0) {
                         int costQuan = min(voucher, needMoney);
@@ -1367,13 +1352,13 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
 
     double width = 130;
     double minWidth = 0;
-    if (textList.length > 0 && textList[curTextType].length>0) {
+    if (textList.length > 0 && textList[curTextType].length > 0) {
       width = _getTextWidth(textList[curTextType]) + 20;
       width = min(width, Screen.width - 120);
       minWidth = max(width, 150);
 
-      if(width<130){
-        width=130;
+      if (width < 130) {
+        width = 130;
       }
 
       showMsg.add(Padding(

lib/chat/group_chat_view.dart

@@ -307,122 +307,127 @@ class _GroupChatPageState extends State<GroupChatPage> {
           Provider<GroupInfoModel>.value(value: widget.groupInfoModel),
         ],
         child: GestureDetector(
-            onTap:hideKeyBoard, child: ExtendedTextSelectionPointerHandler(
-          ///选择文字，消除弹窗
-          builder: (states) {
-            return Listener(
-              child: Scaffold(
-                  resizeToAvoidBottomInset: false,
-                  backgroundColor: const Color(0xFFE2E9F1),
-                  appBar: AppBar(
-                      backgroundColor: AppColors.NewAppbarBgColor,
-                      title: Text(
-                        widget.groupInfoModel.getGroupName(refMap),
-                        textScaleFactor: 1.0,
-                        style: TextStyle(
-                            color: Constants.BlackTextColor, fontSize: 16.47),
-                      ),
-                      leading: CustomUI.buildCustomLeading(context),
-                      titleSpacing: -10,
-                      elevation: 1,
-                      centerTitle: false,
-                      actions: actions),
-                  body: SafeArea(
-                      child: Stack(
-                    children: <Widget>[
-                      Column(
+            onTap: hideKeyBoard,
+            child: ExtendedTextSelectionPointerHandler(
+              ///选择文字，消除弹窗
+              builder: (states) {
+                return Listener(
+                  child: Scaffold(
+                      resizeToAvoidBottomInset: false,
+                      backgroundColor: const Color(0xFFE2E9F1),
+                      appBar: AppBar(
+                          backgroundColor: AppColors.NewAppbarBgColor,
+                          title: Text(
+                            widget.groupInfoModel.getGroupName(refMap),
+                            textScaleFactor: 1.0,
+                            style: TextStyle(
+                                color: Constants.BlackTextColor,
+                                fontSize: 16.47),
+                          ),
+                          leading: CustomUI.buildCustomLeading(context),
+                          titleSpacing: -10,
+                          elevation: 1,
+                          centerTitle: false,
+                          actions: actions),
+                      body: SafeArea(
+                          child: Stack(
                         children: <Widget>[
-                          NetStateWidget(),
-                          Expanded(child: _buildMessageList()),
-                          InputBar(sendMsg: sendMsg),
-                        ],
-                      ),
-                      isHaveUnreadNews
-                          ? Positioned(
-                              top: 32.5,
-                              right: 0,
-                              child: InkWell(
-                                  onTap: () {
-                                    jumpToMsg(
-                                        isAlterYou ? alterTime : unreadTime);
-                                    clearUnreadNews();
-                                  },
-                                  child: Container(
-                                    alignment: Alignment.center,
-                                    decoration: BoxDecoration(
-                                      boxShadow: [
-                                        BoxShadow(
-                                          color: Color(0x33000000), //阴影颜色
-                                          blurRadius: 7, //阴影大小
-                                        )
-                                      ],
-                                      borderRadius: BorderRadius.only(
-                                          topLeft: Radius.circular(80),
-                                          bottomLeft: Radius.circular(80)),
-                                      color: Colors.white,
-                                    ),
-                                    constraints: BoxConstraints(minWidth: 120),
-                                    height: 39,
-                                    child: Row(
-                                      children: <Widget>[
-                                        SizedBox(width: 16.5),
-                                        Image.asset(
-                                          'assets/images/up.png',
-                                          width: 12,
+                          Column(
+                            children: <Widget>[
+                              NetStateWidget(),
+                              Expanded(child: _buildMessageList()),
+                              InputBar(sendMsg: sendMsg),
+                            ],
+                          ),
+                          isHaveUnreadNews
+                              ? Positioned(
+                                  top: 32.5,
+                                  right: 0,
+                                  child: InkWell(
+                                      onTap: () {
+                                        jumpToMsg(isAlterYou
+                                            ? alterTime
+                                            : unreadTime);
+                                        clearUnreadNews();
+                                      },
+                                      child: Container(
+                                        alignment: Alignment.center,
+                                        decoration: BoxDecoration(
+                                          boxShadow: [
+                                            BoxShadow(
+                                              color: Color(0x33000000), //阴影颜色
+                                              blurRadius: 7, //阴影大小
+                                            )
+                                          ],
+                                          borderRadius: BorderRadius.only(
+                                              topLeft: Radius.circular(80),
+                                              bottomLeft: Radius.circular(80)),
+                                          color: Colors.white,
                                         ),
-                                        SizedBox(width: 10),
-                                        Container(
-                                            child: Text(
+                                        constraints:
+                                            BoxConstraints(minWidth: 120),
+                                        height: 39,
+                                        child: Row(
+                                          children: <Widget>[
+                                            SizedBox(width: 16.5),
+                                            Image.asset(
+                                              'assets/images/up.png',
+                                              width: 12,
+                                            ),
+                                            SizedBox(width: 10),
+                                            Container(
+                                                child: Text(
+                                                  isAlterYou
+                                                      ? '$alterUserName'
+                                                      : I18n.of(context)
+                                                          .new_msg
+                                                          .replaceFirst(
+                                                              '/s1',
+                                                              unreadNums
+                                                                  .toString()),
+                                                  style: TextStyle(
+                                                      color: Color(0xFF3875E9)),
+                                                  overflow:
+                                                      TextOverflow.ellipsis,
+                                                ),
+                                                constraints: BoxConstraints(
+                                                    maxWidth: isAlterYou
+                                                        ? 60
+                                                        : Screen.width)),
+                                            Text(
                                               isAlterYou
-                                                  ? '$alterUserName'
-                                                  : I18n.of(context)
-                                                      .new_msg
-                                                      .replaceFirst(
-                                                          '/s1',
-                                                          unreadNums
-                                                              .toString()),
+                                                  ? '@${I18n.of(context).you}'
+                                                  : '',
                                               style: TextStyle(
                                                   color: Color(0xFF3875E9)),
-                                              overflow: TextOverflow.ellipsis,
                                             ),
-                                            constraints: BoxConstraints(
-                                                maxWidth: isAlterYou
-                                                    ? 60
-                                                    : Screen.width)),
-                                        Text(
-                                          isAlterYou
-                                              ? '@${I18n.of(context).you}'
-                                              : '',
-                                          style: TextStyle(
-                                              color: Color(0xFF3875E9)),
+                                            SizedBox(width: 14),
+                                          ],
                                         ),
-                                        SizedBox(width: 14),
-                                      ],
-                                    ),
-                                  )))
-                          : Container()
-                    ],
-                  ))),
-              onPointerDown: (value) {
-                for (var state in states) {
-                  if (!state.containsPosition(value.position)) {
-                    //clear other selection
-                    state.clearSelection();
-                  }
-                }
-              },
-              onPointerMove: (value) {
-                //clear other selection
-                for (var state in states) {
-                  if (!state.containsPosition(value.position)) {
+                                      )))
+                              : Container()
+                        ],
+                      ))),
+                  onPointerDown: (value) {
+                    for (var state in states) {
+                      if (!state.containsPosition(value.position)) {
+                        //clear other selection
+                        state.clearSelection();
+                      }
+                    }
+                  },
+                  onPointerMove: (value) {
                     //clear other selection
-                    state.clearSelection();
-                  }
-                }
+                    for (var state in states) {
+                      if (!state.containsPosition(value.position)) {
+                        //clear other selection
+                        state.clearSelection();
+                      }
+                    }
+                  },
+                );
               },
-            );
-          },
-        )));
+            )));
   }
 
   Widget _buildMessageList() {
@@ -510,7 +515,11 @@ class _GroupChatPageState extends State<GroupChatPage> {
   }
 
   _deleteItem(msg) {
-    MessageMgr().emit('Cancel Request', msg);
+    if (msg.state == MsgState.Uploading) {
+      print('取消上传');
+      UploadUtil().cancelSendMsg(msg);
+    }
+
     print('#### 开始删除--');
     msgList.remove(msg);
     setState(() {});

lib/chat/input_bar.dart

@@ -902,6 +902,13 @@ class InputBarState extends State<InputBar>
   }
 
   _sendMessage(String messageText, [bool isGift = false]) {
+
+    var testMsg = messageText.replaceAll(' ', '');
+    if (testMsg.length <=0 ) {
+      showToast('不能发送空白消息');
+      return;
+    }
+
     bool isGroup = Provider.of<bool>(context);
 
     int friendId = 0;

lib/chat/msg_state_widge.dart

@@ -1,6 +1,8 @@
 import 'package:chat/models/ChatMsg.dart';
+import 'package:chat/proto/chat.pbserver.dart';
 import 'package:chat/utils/MessageMgr.dart';
 import 'package:chat/utils/msgHandler.dart';
+import 'package:chat/utils/upload_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -81,11 +83,31 @@ class _MsgStateWidgetState extends State<MsgStateWidget> {
     } else if (sendState == MsgState.SendingSuccess) {
       return Container(width: 0, height: 0);
     } else {
-      return Align(
-          alignment: Alignment.center,
-          child: Padding(
-              padding: EdgeInsets.only(top: 5),
-              child: CupertinoActivityIndicator()));
+      if (widget.msg.state == MsgState.Uploading) {
+        return Container(
+          child: IconButton(
+            iconSize: 22,
+            icon: Icon(
+              Icons.pause_circle_outline,
+              color: Colors.red,
+            ),
+            onPressed: () {
+              print('暂停发送');
+              UploadUtil().cancelSendMsg(widget.msg);
+              setState(() {
+                sendState = MsgState.UploadFailed;
+              });
+              MsgHandler.sendChatMsg(widget.msg);
+            },
+          ),
+        );
+      } else {
+        return Align(
+            alignment: Alignment.center,
+            child: Padding(
+                padding: EdgeInsets.only(top: 5),
+                child: CupertinoActivityIndicator()));
+      }
     }
   }
 }

lib/chat/upload_item.dart

@@ -12,10 +12,9 @@ class UploadImgItem extends StatefulWidget {
   final MsgModel msg;
   final Widget child;
   final bool isShowProgress;
-  final CancelToken cancelToken;
 
   UploadImgItem(
-      {this.msg, this.child, this.isShowProgress = true, this.cancelToken});
+      {this.msg, this.child, this.isShowProgress = true});
 
   @override
   _UploadItemState createState() => _UploadItemState();
@@ -58,7 +57,7 @@ class _UploadItemState extends State<UploadImgItem> {
     }
 
     widget.msg.state = MsgState.Uploading;
-    await UploadUtil().uploadFile(widget.msg, cancelToken: widget.cancelToken);
+    await UploadUtil().uploadFile(widget.msg);
 
     if (mounted) {
       this.setState(() {});

lib/data/chat_data_mgr.dart

@@ -139,7 +139,6 @@ class ChatDataMgr {
     }
 
     int maxLen = min(curIndex + 4, record.length);
-      print('curIndex:$curIndex maxLen:$maxLen}');
     for (var i = curIndex + 1; i < maxLen; i++) {
       var shortDesc = record[i].shortRecordForTranslator();
 //      print('shortDesc'+shortDesc['Content']);

lib/utils/HttpUtil.dart

@@ -1178,7 +1178,7 @@ class HttpUtil {
         callback();
       }
 
-      SqlUtil().updateUserTranslateRate(msg.sessionId, msg.time, msg.transTag);
+      SqlUtil().updateUserTranslateState(msg.sessionId, msg.time, msg.transTag);
       return true;
     }
 

lib/utils/chat_data_table.dart

@@ -169,8 +169,8 @@ class ChatDataTableModel {
         whereArgs: [curUserId, session, sendTime]);
   }
 
-  //更新人工翻译评价
-  updateUserTranslateRate(int session, int sendTime, int tranState) async {
+  //更新人工翻译状态
+  updateUserTranslateState(int session, int sendTime, int tranState) async {
     var curUserId = UserData().basicInfo.userId;
 
     sql.db.update(table, {'transTag': tranState},

lib/utils/group_chat_table.dart

@@ -172,7 +172,7 @@ class GroupChatTableModel {
   }
 
   //更新人工翻译评价
-  updateUserTranslateRate(int session, int sendTime, int tranState) async {
+  updateUserTranslateState(int session, int sendTime, int tranState) async {
     var curUserId = UserData().basicInfo.userId;
 
     sql.db.update(table, {'transTag': tranState},

lib/utils/sql_util.dart

@@ -119,9 +119,11 @@ class SqlUtil {
         session, sendTime, transContent, tranState);
   }
 
-  //更新人工翻译评价
-  updateUserTranslateRate(int session, int sendTime, int tranState) async {
-    chatDataTableModel.updateUserTranslateRate(session, sendTime, tranState);
+
+
+  //更新人工翻译状态
+  updateUserTranslateState(int session, int sendTime, int tranState) async {
+    chatDataTableModel.updateUserTranslateState(session, sendTime, tranState);
   }
 
   //更新消息发送状态

lib/utils/upload_util.dart

@@ -42,6 +42,9 @@ class UploadUtil {
   //进度流
   Map<String, StreamController<double>> streamMap = {};
 
+  //取消map
+  Map<String, CancelToken> cancelMap = {};
+
   //缓存进度，方便快速显示
   Map<String, double> streamLastPercentMap = {};
 
@@ -104,6 +107,20 @@ class UploadUtil {
     return streamMap[fileId];
   }
 
+  getCancelToken(String fileId) {
+    if (cancelMap[fileId] == null) {
+      cancelMap[fileId] = CancelToken();
+    }
+    return cancelMap[fileId];
+  }
+
+  cancelSendMsg(MsgModel msgModel){
+    var token = cancelMap[msgModel.extraFile];
+    if (token != null) {
+      token.cancel('用户取消');
+    }
+  }
+
   Future uploadFile(MsgModel msg, {CancelToken cancelToken}) async {
     Response response;
 
@@ -132,7 +149,7 @@ class UploadUtil {
       print('开始上传文件${msg.extraFile}  url:${uploadUrl + 'uploadchatfile'}');
 
       var streamController = getStream(msg.extraFile);
-
+      var cancelToken = getCancelToken(msg.extraFile);
       response = await dio.post(uploadUrl + 'uploadchatfile', data: formData,
           onSendProgress: (int progress, int total) {
         streamController.sink.add(progress / total);
@@ -141,6 +158,7 @@ class UploadUtil {
 
       streamController.close();
       streamMap.remove(msg.extraFile);
+      cancelMap.remove(msg.extraFile);
       print('uploadFile response  $response');
       print('###msgContent  ${msg.msgContent.length}');
 
@@ -199,10 +217,8 @@ class UploadUtil {
   Future downloadFile(MsgModel msg, {CancelToken cancelToken}) async {
     Response response;
 
-
-
     var fullUrl = getFullUrl(msg.extraFile, msg.sessionId, msg.channelType);
-    if(msg.extraFile.contains('http://')){
+    if (msg.extraFile.contains('http://')) {
       fullUrl = msg.extraFile;
     }