1

# Conflicts:
#	lib/chat/group_chat_view.dart

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