From d8c4504f3e4f2c6bfccfe18e411b77b3714621e3 Mon Sep 17 00:00:00 2001 From: zdc Date: Wed, 8 Apr 2020 10:41:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E4=BA=A4=E8=AF=AD=E9=9F=B3=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/utils/HttpUtil.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/utils/HttpUtil.dart b/lib/utils/HttpUtil.dart index a56dd3d..af2015e 100644 --- a/lib/utils/HttpUtil.dart +++ b/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]; From 453b52f540aa1a883e244f5e19e81e3989fefe97 Mon Sep 17 00:00:00 2001 From: zdc Date: Wed, 8 Apr 2020 11:08:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B9=8B=E9=97=B4=E7=9A=84=E9=97=B4=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/chat/ChatPageItem.dart | 2 +- lib/chat/group_chat_item.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chat/ChatPageItem.dart b/lib/chat/ChatPageItem.dart index e0c0da1..8e64096 100644 --- a/lib/chat/ChatPageItem.dart +++ b/lib/chat/ChatPageItem.dart @@ -189,7 +189,7 @@ class _ChatPageItemState extends State 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: [ showTime == null diff --git a/lib/chat/group_chat_item.dart b/lib/chat/group_chat_item.dart index 9fdc4ec..2cbe02b 100644 --- a/lib/chat/group_chat_item.dart +++ b/lib/chat/group_chat_item.dart @@ -189,7 +189,7 @@ class _GroupChatPageItemState extends State 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: [ showTime == null From 8939fa26e0e0708d509d39eda630f002834c62e5 Mon Sep 17 00:00:00 2001 From: zdc Date: Wed, 8 Apr 2020 15:47:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=8B=E6=96=B9=E9=97=B4=E9=9A=94,?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=99=A8=E7=BF=BB=E8=AF=91=E5=8F=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/chat/file_msg_item.dart | 1 + lib/utils/HttpUtil.dart | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/chat/file_msg_item.dart b/lib/chat/file_msg_item.dart index d544c56..131273c 100644 --- a/lib/chat/file_msg_item.dart +++ b/lib/chat/file_msg_item.dart @@ -93,6 +93,7 @@ class FileMsgItem extends StatelessWidget { children: [ Container( child: fixedText(name, fontSize: 13), + padding: EdgeInsets.only(bottom: 2), constraints: BoxConstraints( maxWidth: Screen.width - 120 - 122, maxHeight: 50), ), diff --git a/lib/utils/HttpUtil.dart b/lib/utils/HttpUtil.dart index af2015e..35dbd75 100644 --- a/lib/utils/HttpUtil.dart +++ b/lib/utils/HttpUtil.dart @@ -1125,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 = From df12eab70cfc0d6a8d0bf806712a39afbf15207b Mon Sep 17 00:00:00 2001 From: zdc Date: Wed, 8 Apr 2020 15:53:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=8F=90=E7=A4=BA=E8=89=B2=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=BA=A2=E8=89=B2=EF=BC=8C=E5=90=8C=E6=97=B6=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/home/send_msg_state.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/home/send_msg_state.dart b/lib/home/send_msg_state.dart index 62b5f50..f3036aa 100644 --- a/lib/home/send_msg_state.dart +++ b/lib/home/send_msg_state.dart @@ -21,12 +21,12 @@ class _SendMsgStateState extends State { 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,