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

lib/chat/ChatPageItem.dart

@@ -189,7 +189,7 @@ class _ChatPageItemState extends State<ChatPageItem>
 
     return Container(
       width: Screen.width,
-      margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 8),
+      margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 4),
       child: Column(
         children: <Widget>[
           showTime == null

lib/chat/file_msg_item.dart

@@ -93,6 +93,7 @@ class FileMsgItem extends StatelessWidget {
                   children: <Widget>[
                     Container(
                       child: fixedText(name, fontSize: 13),
+                      padding: EdgeInsets.only(bottom: 2),
                       constraints: BoxConstraints(
                           maxWidth: Screen.width - 120 - 122, maxHeight: 50),
                     ),

lib/chat/group_chat_item.dart

@@ -189,7 +189,7 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
     return Container(
       width: Screen.width,
       color: Colors.white.withOpacity(0),
-      margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 8),
+      margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 4),
       child: Column(
         children: <Widget>[
           showTime == null

lib/home/send_msg_state.dart

@@ -21,12 +21,12 @@ class _SendMsgStateState extends State<SendMsgState> {
    
         if (msg.state == MsgState.SendingFailed) {
           return Padding(
-              padding: EdgeInsets.only(right: 10),
+              padding: EdgeInsets.only(right: 5),
               child: Icon(Icons.error_outline,
-                  size: 12, color: Color(0xFFc0c0c0)));
+                  size: 12, color: Colors.red));
         } else if (msg.state <= MsgState.Sending) {
           return Padding(
-              padding: EdgeInsets.only(right: 10),
+              padding: EdgeInsets.only(right: 5),
               child: Icon(
                   IconData(0xe657, fontFamily: Constants.IconFontFamily),
                   size: 12,

lib/utils/HttpUtil.dart

@@ -1102,8 +1102,9 @@ class HttpUtil {
         showToast('请稍后再试');
         return;
       }
-      data['content'] =
-          base64Encode(File(msgModel.localFile).readAsBytesSync());
+      data['content'] = base64Encode(File(msgModel.localFile).readAsBytesSync());
+      print('语音转换的文字: ${utf8.decode(msgModel.enTranslateContent)}');
+      data['vcontent'] = base64Encode(msgModel.enTranslateContent);
     }
 
     data["tuserids"] = [UserData().basicInfo.userId];
@@ -1124,7 +1125,7 @@ class HttpUtil {
 
     if (msgModel.translateContent != null &&
         msgModel.translateContent.length > 0) {
-      data['mcontent'] = base64Encode(msgModel.enTranslateContent);
+      data['mcontent'] = base64Encode(msgModel.translateContent);
     }
 
     Response res =