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

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',

lib/chat/ChatPage.dart

@@ -451,7 +451,7 @@ class _ChatPageState extends State<ChatPage> {
               Provider<int>.value(value: widget.friendId),
             ],
             child: GestureDetector(
-                onTapDown: (args){hideKeyBoard();},
+                onTap: hideKeyBoard,
                 child: ExtendedTextSelectionPointerHandler(
                   ///选择文字，消除弹窗
 

lib/chat/ChatPageItem.dart

@@ -716,7 +716,7 @@ class _ChatPageItemState extends State<ChatPageItem>
         mainAxisAlignment: MainAxisAlignment.end,
         children: <Widget>[
           MsgStateWidget(widget.msg),
-          SizedBox(width: 3),
+          SizedBox(width: 1),
           _msgLayout(context, widget.msg),
           SizedBox(width: 10),
           Column(

lib/chat/group_chat_view.dart

@@ -306,9 +306,8 @@ class _GroupChatPageState extends State<GroupChatPage> {
           Provider<bool>.value(value: true),
           Provider<GroupInfoModel>.value(value: widget.groupInfoModel),
         ],
-        child: GestureDetector(onTapDown: (args) {
-          hideKeyBoard();
-        }, child: ExtendedTextSelectionPointerHandler(
+        child: GestureDetector(
+            onTap:hideKeyBoard, child: ExtendedTextSelectionPointerHandler(
           ///选择文字，消除弹窗
           builder: (states) {
             return Listener(

lib/chat/input_bar.dart

@@ -400,7 +400,7 @@ class InputBarState extends State<InputBar>
           child: Column(
             children: <Widget>[
               Container(
-                padding: EdgeInsets.symmetric(horizontal: 7, vertical: 7),
+                padding: EdgeInsets.symmetric(horizontal: 7, vertical: 3),
                 alignment: Alignment.topCenter,
                 decoration: BoxDecoration(
                     color: Colors.white,

lib/home/LoginPage.dart

@@ -36,7 +36,6 @@ class _LoginPageState extends State<LoginPage> {
     if (keyHeight > 0) {
       UserData().setKeyboardHeight(keyHeight);
     }
-
     Widget appBar = AppBar(
       backgroundColor: AppColors.NewAppbarBgColor,
       title: Text(

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<AddFriendPage> {
           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<AddFriendPage> {
         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(

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) {

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);