From 26725ca35b6ca5d3b81c8b5f1da190f297f0fd20 Mon Sep 17 00:00:00 2001 From: zdc Date: Fri, 10 Apr 2020 09:27:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E9=97=B4=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 6 +++--- lib/chat/ChatPageItem.dart | 2 +- lib/chat/input_bar.dart | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index b7fee24..c2c5d18 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -56,9 +56,9 @@ android { // manifestPlaceholders = [ // AMAP_KEY : "1fd4e93e3b4b13747da41f484c955fe2", /// 高德地图key // ] - ndk { - abiFilters 'armeabi-v7a' - } + // ndk { + // abiFilters 'armeabi-v7a' + // } multiDexEnabled true manifestPlaceholders = [ JPUSH_PKGNAME : 'com.cyhd.henhoandroid', diff --git a/lib/chat/ChatPageItem.dart b/lib/chat/ChatPageItem.dart index 8e64096..081d1e3 100644 --- a/lib/chat/ChatPageItem.dart +++ b/lib/chat/ChatPageItem.dart @@ -714,7 +714,7 @@ class _ChatPageItemState extends State mainAxisAlignment: MainAxisAlignment.end, children: [ MsgStateWidget(widget.msg), - SizedBox(width: 3), + SizedBox(width: 1), _msgLayout(context, widget.msg), SizedBox(width: 10), Column( diff --git a/lib/chat/input_bar.dart b/lib/chat/input_bar.dart index 94b56ea..3e88fcb 100644 --- a/lib/chat/input_bar.dart +++ b/lib/chat/input_bar.dart @@ -398,7 +398,7 @@ class InputBarState extends State child: Column( children: [ Container( - padding: EdgeInsets.symmetric(horizontal: 7, vertical: 7), + padding: EdgeInsets.symmetric(horizontal: 7, vertical: 3), alignment: Alignment.topCenter, decoration: BoxDecoration( color: Colors.white, From 2d84ad4f7639736d15be77cae90c9d88be97f940 Mon Sep 17 00:00:00 2001 From: zdc Date: Fri, 10 Apr 2020 11:34:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E8=87=AA=E5=B7=B1=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/home/add_friend.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/home/add_friend.dart b/lib/home/add_friend.dart index 536d296..d2addd8 100644 --- a/lib/home/add_friend.dart +++ b/lib/home/add_friend.dart @@ -1,3 +1,4 @@ +import 'package:chat/data/UserData.dart'; import 'package:chat/data/constants.dart'; import 'package:chat/generated/i18n.dart'; import 'package:chat/models/ref_name_provider.dart'; @@ -70,7 +71,7 @@ class _AddFriendPageState extends State { onTap: () { var content = _txtCtrl.text; if (_txtCtrl.text.length == 0) { - content = widget.originalName; + content = UserData().basicInfo.nickName; } switch (widget.pageType) { case SendMessagePageType.AddFriends: @@ -146,7 +147,7 @@ class _AddFriendPageState extends State { decoration: InputDecoration( contentPadding: EdgeInsets.only(right: 10, left: 15, top: 10, bottom: 10), - hintText: widget.originalName, + hintText: UserData().basicInfo.nickName, hintStyle: TextStyle(fontSize: 16, color: Colors.grey), border: InputBorder.none, suffixIcon: Padding( From 639b9b1371741fa559242c8513eae07a8ba62e27 Mon Sep 17 00:00:00 2001 From: jiahao <283739569@qq.com> Date: Fri, 10 Apr 2020 12:30:47 +0800 Subject: [PATCH 3/4] 1 --- lib/chat/ChatPage.dart | 2 +- lib/chat/group_chat_view.dart | 2 +- lib/home/LoginPage.dart | 1 - lib/utils/HttpUtil.dart | 4 ++-- lib/utils/net_state_util.dart | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/chat/ChatPage.dart b/lib/chat/ChatPage.dart index a9adece..fa00612 100644 --- a/lib/chat/ChatPage.dart +++ b/lib/chat/ChatPage.dart @@ -451,7 +451,7 @@ class _ChatPageState extends State { Provider.value(value: widget.friendId), ], child: GestureDetector( - onTapDown: (args){hideKeyBoard();}, + onTap: hideKeyBoard, child: ExtendedTextSelectionPointerHandler( ///选择文字，消除弹窗 diff --git a/lib/chat/group_chat_view.dart b/lib/chat/group_chat_view.dart index 830f2fa..d950a05 100644 --- a/lib/chat/group_chat_view.dart +++ b/lib/chat/group_chat_view.dart @@ -290,7 +290,7 @@ class _GroupChatPageState extends State { Provider.value(value: widget.groupInfoModel), ], child: GestureDetector( - onTapDown: (args){hideKeyBoard();}, + onTap:hideKeyBoard, child: ExtendedTextSelectionPointerHandler( ///选择文字，消除弹窗 builder: (states) { diff --git a/lib/home/LoginPage.dart b/lib/home/LoginPage.dart index acdbb32..03a7497 100644 --- a/lib/home/LoginPage.dart +++ b/lib/home/LoginPage.dart @@ -36,7 +36,6 @@ class _LoginPageState extends State { if (keyHeight > 0) { UserData().setKeyboardHeight(keyHeight); } - Widget appBar = AppBar( backgroundColor: AppColors.NewAppbarBgColor, title: Text( diff --git a/lib/utils/HttpUtil.dart b/lib/utils/HttpUtil.dart index af2015e..89e4846 100644 --- a/lib/utils/HttpUtil.dart +++ b/lib/utils/HttpUtil.dart @@ -46,7 +46,7 @@ class HttpUtil { //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://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) { @@ -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 = diff --git a/lib/utils/net_state_util.dart b/lib/utils/net_state_util.dart index b2902ae..a7f0c82 100644 --- a/lib/utils/net_state_util.dart +++ b/lib/utils/net_state_util.dart @@ -17,7 +17,7 @@ class NetStateBloc { } _updateConnectionStatus(ConnectivityResult result) async { - print('网络状态改变$result'); +// print('网络状态改变$result'); if (result == ConnectivityResult.none) { lastNet = result; _streamController.sink.add(ChatState.connecting.index); From 1187f0ae49fcb7175eb92f92c8e73aad54e65e05 Mon Sep 17 00:00:00 2001 From: jiahao <283739569@qq.com> Date: Fri, 10 Apr 2020 12:32:04 +0800 Subject: [PATCH 4/4] 1 --- lib/chat/group_chat_view.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/chat/group_chat_view.dart b/lib/chat/group_chat_view.dart index 7e67f11..41aec0e 100644 --- a/lib/chat/group_chat_view.dart +++ b/lib/chat/group_chat_view.dart @@ -306,9 +306,8 @@ class _GroupChatPageState extends State { Provider.value(value: true), Provider.value(value: widget.groupInfoModel), ], - child: GestureDetector(onTapDown: (args) { - hideKeyBoard(); - }, child: ExtendedTextSelectionPointerHandler( + child: GestureDetector( + onTap:hideKeyBoard, child: ExtendedTextSelectionPointerHandler( ///选择文字，消除弹窗 builder: (states) { return Listener(