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

ios/Flutter/flutter_export_environment.sh

@@ -2,10 +2,9 @@
 # This is a generated file; do not edit or check into version control.
 export "FLUTTER_ROOT=/Users/random/sdk/flutter_sdk"
 export "FLUTTER_APPLICATION_PATH=/Users/random/code/flutter/project/hibok"
-export "FLUTTER_TARGET=/Users/random/code/flutter/project/hibok/lib/main.dart"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
-export "FLUTTER_FRAMEWORK_DIR=/Users/random/sdk/flutter_sdk/bin/cache/artifacts/engine/ios"
-export "FLUTTER_BUILD_NAME=1.0.9"
-export "FLUTTER_BUILD_NUMBER=14"
-export "TRACK_WIDGET_CREATION=true"
+export "FLUTTER_FRAMEWORK_DIR=/Users/random/sdk/flutter_sdk/bin/cache/artifacts/engine/ios-release"
+export "FLUTTER_BUILD_NAME=1.1.0"
+export "FLUTTER_BUILD_NUMBER=15"

ios/Podfile.lock

@@ -151,6 +151,8 @@ PODS:
   - TOCropViewController (2.5.2)
   - url_launcher (0.0.1):
     - Flutter
+  - vibration (1.2.4):
+    - Flutter
   - video_player (0.0.1):
     - Flutter
   - video_thumbnail (0.0.1):
@@ -209,6 +211,7 @@ DEPENDENCIES:
   - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
+  - vibration (from `.symlinks/plugins/vibration/ios`)
   - video_player (from `.symlinks/plugins/video_player/ios`)
   - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`)
   - wifi_info_plugin (from `.symlinks/plugins/wifi_info_plugin/ios`)
@@ -332,6 +335,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite/ios"
   url_launcher:
     :path: ".symlinks/plugins/url_launcher/ios"
+  vibration:
+    :path: ".symlinks/plugins/vibration/ios"
   video_player:
     :path: ".symlinks/plugins/video_player/ios"
   video_thumbnail:
@@ -406,6 +411,7 @@ SPEC CHECKSUMS:
   sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0
   TOCropViewController: e9da34f484aedd4e5d5a8ab230ba217cfe16c729
   url_launcher: a1c0cc845906122c4784c542523d8cacbded5626
+  vibration: f0c5bb486671fb81e973bfb451d89f8efd07c9c9
   video_player: 69c5f029fac4ffe4fc8a85ea7f7b793709661549
   video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
   wifi_info_plugin: ff6048382842ec5c7594460750ae96ad54bd3044

ios/Runner.xcodeproj/project.pbxproj

@@ -542,7 +542,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = QJ9M3998Q6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -556,7 +556,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chengyouhudong.hibok;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -578,14 +578,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = QJ9M3998Q6;
 				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "";
@@ -610,14 +610,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = QJ9M3998Q6;
 				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.chengyouhudong.hibok.share;
@@ -640,14 +640,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share ExtensionProfile.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = QJ9M3998Q6;
 				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.chengyouhudong.hibok.share;
@@ -777,7 +777,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -791,7 +791,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chengyouhudong.hibok;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -811,7 +811,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = QJ9M3998Q6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -825,7 +825,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chengyouhudong.hibok;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/home/homeMain.dart

@@ -34,6 +34,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:chat/utils/my_bottom_navigation_bar.dart' as myBottm;
 
 import 'friend_page.dart';
+import 'group_chat_page.dart';
 
 class NavigationIconView {
   final BottomNavigationBarItem item;
@@ -361,79 +362,22 @@ class _HomeMainState extends State<HomeMain> {
       I18n.of(context).me
     ];
 
-    _navigationViews = [
-      NavigationIconView(
-          title: _titles[2],
-          icon: IconData(
-            0xe67c,
-            fontFamily: 'iconfont',
-          ),
-          isShowdot: true,
-          iconSize: 29),
-      NavigationIconView(
-          title: _titles[0],
-          isShowdot: true,
-          iconMargin: EdgeInsets.only(top: 2),
-          type: 5,
-          icon: IconData(
-            0xe66e,
-            fontFamily: 'iconfont',
-          ),
-          iconSize: 26.5),
-      NavigationIconView(
-          title: _titles[1],
-          icon: IconData(
-            0xe656,
-            fontFamily: 'iconfont',
-          ),
-          isCenter: true,
-          iconSize: 31),
-      NavigationIconView(
-          title: _titles[1],
-          isShowdot: true,
-          icon: IconData(
-            0xe60b,
-            fontFamily: 'iconfont',
-          ),
-          type: 6,
-          iconSize: 26.5),
-      NavigationIconView(
-          title: _titles[3],
-          icon: IconData(
-            0xe67b,
-            fontFamily: 'iconfont',
-          ),
-          iconSize: 26.5),
-    ];
-
-    _pages = [
-      RealTimeHelperPage(),
-      FriendPage(),
-      FindPage(),
-      ConversActionPage(),
-//      GroupChatListPage(),
-      ProfilePage(
-        userId: UserData().basicInfo.userId,
-      ),
-    ];
-
 //    _navigationViews = [
 //      NavigationIconView(
-//          title: _titles[1],
-//          isShowdot: true,
+//          title: _titles[2],
 //          icon: IconData(
-//            0xe60b,
+//            0xe67c,
 //            fontFamily: 'iconfont',
 //          ),
-//          type: 1,
-//          iconSize: 26.5),
+//          isShowdot: true,
+//          iconSize: 29),
 //      NavigationIconView(
 //          title: _titles[0],
 //          isShowdot: true,
 //          iconMargin: EdgeInsets.only(top: 2),
 //          type: 5,
 //          icon: IconData(
-//            0xe663,
+//            0xe66e,
 //            fontFamily: 'iconfont',
 //          ),
 //          iconSize: 26.5),
@@ -445,17 +389,15 @@ class _HomeMainState extends State<HomeMain> {
 //          ),
 //          isCenter: true,
 //          iconSize: 31),
-//
 //      NavigationIconView(
-//          title: _titles[3],
+//          title: _titles[1],
 //          isShowdot: true,
 //          icon: IconData(
-//            0xe66e,
+//            0xe60b,
 //            fontFamily: 'iconfont',
 //          ),
-//          type: 4,
+//          type: 6,
 //          iconSize: 26.5),
-//
 //      NavigationIconView(
 //          title: _titles[3],
 //          icon: IconData(
@@ -466,16 +408,75 @@ class _HomeMainState extends State<HomeMain> {
 //    ];
 //
 //    _pages = [
-//      ConversActionPage(),
-////      RealTimeHelperPage(),
+//      RealTimeHelperPage(),
 //      FriendPage(),
 //      FindPage(),
-////      ConversActionPage(),
-//      GroupChatListPage(),
+//      ConversActionPage(),
+////      GroupChatListPage(),
 //      ProfilePage(
 //        userId: UserData().basicInfo.userId,
 //      ),
 //    ];
+
+    _navigationViews = [
+      NavigationIconView(
+          title: _titles[1],
+          isShowdot: true,
+          icon: IconData(
+            0xe60b,
+            fontFamily: 'iconfont',
+          ),
+          type: 1,
+          iconSize: 26.5),
+      NavigationIconView(
+          title: _titles[0],
+          isShowdot: true,
+          iconMargin: EdgeInsets.only(top: 2),
+          type: 5,
+          icon: IconData(
+            0xe663,
+            fontFamily: 'iconfont',
+          ),
+          iconSize: 26.5),
+      NavigationIconView(
+          title: _titles[1],
+          icon: IconData(
+            0xe656,
+            fontFamily: 'iconfont',
+          ),
+          isCenter: true,
+          iconSize: 31),
+
+      NavigationIconView(
+          title: _titles[3],
+          isShowdot: true,
+          icon: IconData(
+            0xe66e,
+            fontFamily: 'iconfont',
+          ),
+          type: 4,
+          iconSize: 26.5),
+
+      NavigationIconView(
+          title: _titles[3],
+          icon: IconData(
+            0xe67b,
+            fontFamily: 'iconfont',
+          ),
+          iconSize: 26.5),
+    ];
+
+    _pages = [
+      ConversActionPage(),
+//      RealTimeHelperPage(),
+      FriendPage(),
+      FindPage(),
+//      ConversActionPage(),
+      GroupChatListPage(),
+      ProfilePage(
+        userId: UserData().basicInfo.userId,
+      ),
+    ];
   }
 
   @override

lib/utils/HttpUtil.dart

@@ -44,9 +44,9 @@ class HttpUtil {
 
   //static const String BaseUrl = 'http://192.168.0.223:7001/';
   //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://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/msgHandler.dart

@@ -256,8 +256,6 @@ class MsgHandler {
   static int tempGroupId = 0;
   static int mLastClickTime = 0;
   static int timeInterval = 2500;
-//  static int receivedCount=0;
-  static int time;
   static handlerReceiveMsg(PushChat chat) async {
 
     bool isGroup = false;
@@ -486,7 +484,7 @@ class MsgHandler {
       } else {
         //聊天消息
         //time = DateTime.now().millisecondsSinceEpoch;
-        print('******收到聊天消息 $time');
+        //print('******收到聊天消息 $time');
         int sessionId = chat.targetId;
         print('sessionId $sessionId');
         if (isGroup) {

pubspec.yaml

@@ -1,7 +1,7 @@
 name: chat
 description: A new Flutter project.
 #修改版本号后get-clean
-version: 1.0.9+14
+version: 1.1.0+15
 
 environment:
   sdk: ">=2.1.0 <3.0.0"