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

i18n/en-US.json

@@ -1152,7 +1152,7 @@
     "you_get": " you got rewards from others",
     "enter_num_qian": " number of exchanges (unit K) ",
     "enter_num_qian1": " number of withdrawals (unit K) ",
-    "daily_translate_voucher": "Translation voucher",
+    "daily_translate_voucher": " Voucher",
     "msg_notice": "Notice message",
     "select_notice_people": "Select notice people",
     "search_phone": "Search phone number",
@@ -1164,7 +1164,7 @@
     "search_plach": "Search location",
     "finding_place": "Find location",
     "real_time_helper": "Real-time helper",
-    "translation_butler": "Translation assistant",
+    "translation_butler": "Real-time translation service",
     "travel_butler": "Travel assistant",
     "translation_butler_tips": "Your real-time personal translator, it can help you solve the language barrier anytime and anywhere",
     "choose_language": "Please select the language to be translated",
@@ -1249,5 +1249,7 @@
     "splash_tips_content4": "Unobstructed travel chat",
     "splash_tips_content5": "Worry-free your trip",
     "shock_notice": "Vibration notification",
-    "max_upload_size": "最多上传/s1张"
+    "max_upload_size": "最多上传/s1张",
+    "travel_tips2":"Your personal butler, to solve the problem of taxis going to the wrong destination caused by the language"
+
 }

i18n/ja-JP.json

@@ -1164,7 +1164,7 @@
     "search_plach": "位置検索",
     "finding_place": "位置を検索",
     "real_time_helper": "リアルタイムヘルプ",
-    "translation_butler": "翻訳バトラー",
+    "translation_butler": "リアルタイム翻訳サービス",
     "travel_butler": "トラベルバトラー",
     "translation_butler_tips": "あなたのリアルタイムの個人通訳は、いつでもどこでも言語の不通を解決してくれます",
     "choose_language": "翻訳する言語を選んでください",
@@ -1248,5 +1248,7 @@
     "splash_tips_content4": "出行聊天畅通无阻",
     "splash_tips_content5": "无忧你的旅行" ,
     "shock_notice": "震动通知",
-    "max_upload_size": "最多上传/s1张"
+    "max_upload_size": "最多上传/s1张",
+    "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题"
+
 }

i18n/ko-KR.json

@@ -1164,7 +1164,7 @@
     "search_plach": "위치 검색",
     "finding_place": "위치 찾기",
     "real_time_helper": "실시 도움",
-    "translation_butler": "번역 집사",
+    "translation_butler": "실시간 번역 서비스",
     "travel_butler": "출행 집사",
     "translation_butler_tips": " 당신의 실시간 밀착 통역으로 언제 어디서나 말이 통하지 않는 것을 해결해 드립니다.",
     "choose_language": "번역할 언어를 선택하세요.",
@@ -1249,5 +1249,7 @@
     "splash_tips_content4": "出行聊天畅通无阻",
     "splash_tips_content5": "无忧你的旅行" ,
     "shock_notice": "震动通知",
-    "max_upload_size": "最多上传/s1张"
+    "max_upload_size": "最多上传/s1张",
+    "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题"
+
 }

i18n/vi-VN.json

@@ -1164,7 +1164,7 @@
     "search_plach": "Rà soát địa điểm",
     "finding_place": " Tìm địa điểm",
     "real_time_helper": "Hỗ trợ nhanh",
-    "translation_butler": "Trợ lý phiên dịch",
+    "translation_butler": "Dịch vụ dịch thuật thời gian thực",
     "travel_butler": " Trợ lý chỉ đường",
     "translation_butler_tips": "Trợ lý dịch thuật giúp bạn giải quyết trở ngại ngôn ngữ",
     "choose_language": " Vui lòng chọn một ngôn ngữ để dịch ",
@@ -1248,5 +1248,7 @@
     "splash_tips_content4": "出行聊天畅通无阻",
     "splash_tips_content5": "无忧你的旅行" ,
     "shock_notice": "震动通知",
-    "max_upload_size": "最多上传/s1张"
+    "max_upload_size": "最多上传/s1张",
+    "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题"
+
 }

i18n/zh-CN.json

@@ -1164,7 +1164,7 @@
   "search_plach": "搜索位置",
   "finding_place": "查找位置",
   "real_time_helper": "实时帮",
-  "translation_butler": "翻译管家",
+  "translation_butler": "实时翻译服务",
   "travel_butler": "出行管家",
   "translation_butler_tips": "您的实时贴身翻译，随时随地帮您解决语言不通",
   "choose_language": "请选择要翻译的语言",
@@ -1249,5 +1249,6 @@
   "splash_tips_content4": "出行聊天畅通无阻",
   "splash_tips_content5": "无忧你的旅行",
   "shock_notice":"震动通知",
-  "max_upload_size": "最多上传/s1张"
+  "max_upload_size": "最多上传/s1张",
+  "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题"
 }

i18n/zh-HK.json

@@ -1164,7 +1164,7 @@
     "search_plach": "搜索位置",
     "finding_place": "查找位置",
     "real_time_helper": "實時幫",
-    "translation_butler": "翻譯管家",
+    "translation_butler": "實時翻譯服務",
     "travel_butler": "出行管家",
     "translation_butler_tips": "您的實時貼身翻譯，隨時隨地幫您解決語言不通",
     "choose_language": "請選擇您的語言和要翻譯的語言",
@@ -1248,5 +1248,7 @@
     "splash_tips_content4": "出行聊天畅通无阻",
     "splash_tips_content5": "无忧你的旅行",
     "shock_notice": "震動通知",
-    "max_upload_size": "最多上传/s1张"
+    "max_upload_size": "最多上传/s1张",
+    "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题"
+
 }

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/data/chat_data_mgr.dart

@@ -314,11 +314,11 @@ class ChatDataMgr {
       print('数据为空，无法插入');
     } else {
       record.insert(0, msg);
-      int after = DateTime.now().millisecondsSinceEpoch-MsgHandler.time;
-      print('******插入数据 use $after');
-      print('******record length ${record.length}  ${msg.sessionId}');
+     // print(MsgHandler.time);
+      //int after = DateTime.now().millisecondsSinceEpoch-MsgHandler.time;
+     // print('******插入数据 use $after');
+     // print('******record length ${record.length}  ${msg.sessionId}');
 
-      //record.add(msg);
       SqlUtil.insert(msg);
 
       updateLastRecordWithMsg(msg);

lib/generated/i18n.dart

@@ -2339,8 +2339,8 @@ class I18n implements WidgetsLocalizations {
   String get enter_num_qian => " number of exchanges (unit K) ";
   /// " number of withdrawals (unit K) "
   String get enter_num_qian1 => " number of withdrawals (unit K) ";
-  /// "Translation voucher"
-  String get daily_translate_voucher => "Translation voucher";
+  /// " Voucher"
+  String get daily_translate_voucher => " Voucher";
   /// "Notice message"
   String get msg_notice => "Notice message";
   /// "Select notice people"
@@ -2363,8 +2363,8 @@ class I18n implements WidgetsLocalizations {
   String get finding_place => "Find location";
   /// "Real-time helper"
   String get real_time_helper => "Real-time helper";
-  /// "Translation assistant"
-  String get translation_butler => "Translation assistant";
+  /// "Real-time translation service"
+  String get translation_butler => "Real-time translation service";
   /// "Travel assistant"
   String get travel_butler => "Travel assistant";
   /// "Your real-time personal translator, it can help you solve the language barrier anytime and anywhere"
@@ -2535,6 +2535,8 @@ class I18n implements WidgetsLocalizations {
   String get shock_notice => "Vibration notification";
   /// "最多上传/s1张"
   String get max_upload_size => "最多上传/s1张";
+  /// "Your personal butler, to solve the problem of taxis going to the wrong destination caused by the language"
+  String get travel_tips2 => "Your personal butler, to solve the problem of taxis going to the wrong destination caused by the language";
 }
 
 class _I18n_en_US extends I18n {
@@ -4719,9 +4721,9 @@ class _I18n_vi_VN extends I18n {
   /// "Xin cung cấp ảnh chụp màn hình liên quan để chúng tôi theo dõi xác thực"
   @override
   String get provide_screenshots => "Xin cung cấp ảnh chụp màn hình liên quan để chúng tôi theo dõi xác thực";
-  /// "Vui lòng mô tả chi tiết (trong vòng 100 từ)"
+  /// "Vui lòng mô tả chi tiết(trong vòng 100 ký tự)"
   @override
-  String get describe_details => "Vui lòng mô tả chi tiết (trong vòng 100 từ)";
+  String get describe_details => "Vui lòng mô tả chi tiết(trong vòng 100 ký tự)";
   /// "Vui lòng chọn lý do báo cáo"
   @override
   String get report_reason => "Vui lòng chọn lý do báo cáo";
@@ -6042,9 +6044,9 @@ class _I18n_vi_VN extends I18n {
   /// "Hỗ trợ nhanh"
   @override
   String get real_time_helper => "Hỗ trợ nhanh";
-  /// "Trợ lý phiên dịch"
+  /// "Dịch vụ dịch thuật thời gian thực"
   @override
-  String get translation_butler => "Trợ lý phiên dịch";
+  String get translation_butler => "Dịch vụ dịch thuật thời gian thực";
   /// " Trợ lý chỉ đường"
   @override
   String get travel_butler => " Trợ lý chỉ đường";
@@ -6297,6 +6299,9 @@ class _I18n_vi_VN extends I18n {
   /// "最多上传/s1张"
   @override
   String get max_upload_size => "最多上传/s1张";
+  /// "您的贴身出行管家,解决语言不通打车走错路的问题"
+  @override
+  String get travel_tips2 => "您的贴身出行管家,解决语言不通打车走错路的问题";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -9800,9 +9805,9 @@ class _I18n_zh_HK extends I18n {
   /// "實時幫"
   @override
   String get real_time_helper => "實時幫";
-  /// "翻譯管家"
+  /// "實時翻譯服務"
   @override
-  String get translation_butler => "翻譯管家";
+  String get translation_butler => "實時翻譯服務";
   /// "出行管家"
   @override
   String get travel_butler => "出行管家";
@@ -10055,6 +10060,9 @@ class _I18n_zh_HK extends I18n {
   /// "最多上传/s1张"
   @override
   String get max_upload_size => "最多上传/s1张";
+  /// "您的贴身出行管家,解决语言不通打车走错路的问题"
+  @override
+  String get travel_tips2 => "您的贴身出行管家,解决语言不通打车走错路的问题";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -13558,9 +13566,9 @@ class _I18n_zh_CN extends _I18n_zh_HK {
   /// "实时帮"
   @override
   String get real_time_helper => "实时帮";
-  /// "翻译管家"
+  /// "实时翻译服务"
   @override
-  String get translation_butler => "翻译管家";
+  String get translation_butler => "实时翻译服务";
   /// "出行管家"
   @override
   String get travel_butler => "出行管家";
@@ -13816,6 +13824,9 @@ class _I18n_zh_CN extends _I18n_zh_HK {
   /// "最多上传/s1张"
   @override
   String get max_upload_size => "最多上传/s1张";
+  /// "您的贴身出行管家,解决语言不通打车走错路的问题"
+  @override
+  String get travel_tips2 => "您的贴身出行管家,解决语言不通打车走错路的问题";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -17319,9 +17330,9 @@ class _I18n_ko_KR extends I18n {
   /// "실시 도움"
   @override
   String get real_time_helper => "실시 도움";
-  /// "번역 집사"
+  /// "실시간 번역 서비스"
   @override
-  String get translation_butler => "번역 집사";
+  String get translation_butler => "실시간 번역 서비스";
   /// "출행 집사"
   @override
   String get travel_butler => "출행 집사";
@@ -17577,6 +17588,9 @@ class _I18n_ko_KR extends I18n {
   /// "最多上传/s1张"
   @override
   String get max_upload_size => "最多上传/s1张";
+  /// "您的贴身出行管家,解决语言不通打车走错路的问题"
+  @override
+  String get travel_tips2 => "您的贴身出行管家,解决语言不通打车走错路的问题";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -21080,9 +21094,9 @@ class _I18n_ja_JP extends I18n {
   /// "リアルタイムヘルプ"
   @override
   String get real_time_helper => "リアルタイムヘルプ";
-  /// "翻訳バトラー"
+  /// "リアルタイム翻訳サービス"
   @override
-  String get translation_butler => "翻訳バトラー";
+  String get translation_butler => "リアルタイム翻訳サービス";
   /// "トラベルバトラー"
   @override
   String get travel_butler => "トラベルバトラー";
@@ -21335,6 +21349,9 @@ class _I18n_ja_JP extends I18n {
   /// "最多上传/s1张"
   @override
   String get max_upload_size => "最多上传/s1张";
+  /// "您的贴身出行管家,解决语言不通打车走错路的问题"
+  @override
+  String get travel_tips2 => "您的贴身出行管家,解决语言不通打车走错路的问题";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;

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/home/realtimehelper/real_time_helper_page.dart

@@ -168,7 +168,7 @@ class RealTimeHelperPageState extends State<RealTimeHelperPage> {
                         builder: (_) => TranslationButlerPage(),
                       ),
                     );
-                  },textColor: Color(0xff2685FA),tips: I18n.of(context).translation_butler_introduction),
+                  },textColor: Color(0xff2685FA)),
               helperCard(
                   I18n.of(context).travel_butler, R.assetsImagesImgTravelButler,
                       () {
@@ -177,7 +177,7 @@ class RealTimeHelperPageState extends State<RealTimeHelperPage> {
                         builder: (_) => TravelButlerPage(),
                       ),
                     );
-                  },textColor: Color(0xffff682d),tips: I18n.of(context).travel_introduction),
+                  },textColor: Color(0xffff682d) ),
               SizedBox(
                 height: 15,
               ),
@@ -189,7 +189,7 @@ class RealTimeHelperPageState extends State<RealTimeHelperPage> {
   }
 
   Widget helperCard(String title, String assets, Function callBack,
-      {Color textColor,String tips}) {
+      {Color textColor }) {
     return Stack(children: <Widget>[
       InkWell(
         child: Container(
@@ -223,13 +223,6 @@ class RealTimeHelperPageState extends State<RealTimeHelperPage> {
         onTap: callBack,
       ),
 
-      Positioned(child: InkWell(child:  Container( width: 40,height: 40,child: Align(child: Icon(
-        IconData(0xe681, fontFamily: Constants.IconFontFamily),
-        color: Color(0xFFFF7E00),
-        size: 28.0,
-      ),alignment: Alignment.center,),),onTap: (){
-        CustomUI.buildTip(context, title, Padding(padding: EdgeInsets.all(10),child: fixedText(tips,fontSize: 14),));
-      },),right: 21,top: 21,)
 
     ],);
   }

lib/home/realtimehelper/translation_butler_page.dart

@@ -363,14 +363,30 @@ class TranslationButlerPageState extends State<TranslationButlerPage> {
     return ListView(
       controller: _scrollController,
       children: <Widget>[
+
         Padding(
           padding: EdgeInsets.only(left: 20, right: 10, top: 15),
-          child: Text(
-            I18n.of(context).translation_butler_tips,
-            textScaleFactor: 1.0,
-            style: TextStyle(color: Color(0xffABABAB), fontSize: 13),
-          ),
-        ),
+          child:  Row(children: <Widget>[
+            Expanded(child:  Text(
+              I18n.of(context).translation_butler_tips,
+              textScaleFactor: 1.0,
+              style: TextStyle(color: Color(0xffABABAB), fontSize: 13),
+            )),
+            InkWell(child:  Container( width: 40,height: 40,child: Align(child: Icon(
+              IconData(0xe681, fontFamily: Constants.IconFontFamily),
+              color: Color(0xFFFF7E00),
+              size: 28.0,
+            ),alignment: Alignment.center,),),onTap: (){
+              CustomUI.buildTip(context, I18n.of(context).translation_butler, Padding(padding: EdgeInsets.all(10),child: fixedText(I18n.of(context).translation_butler_introduction,fontSize: 14),));
+            },)
+          ],),
+        ) ,
+
+
+
+
+
+
         Container(
           margin: EdgeInsets.all(10),
           child: Card(

lib/home/realtimehelper/travel_butler_page.dart

@@ -67,6 +67,27 @@ class TravelButlerPageState extends State<TravelButlerPage> {
           color: Color(0xffE8EAF0),
           child: ListView(
             children: <Widget>[
+
+
+              Padding(
+                padding: EdgeInsets.only(left: 20, right: 10, top: 15),
+                child:  Row(children: <Widget>[
+                  Expanded(child:  Text(
+                    I18n.of(context).travel_tips2,
+                    textScaleFactor: 1.0,
+                    style: TextStyle(color: Color(0xffABABAB), fontSize: 13),
+                  )),
+                  InkWell(child:  Container( width: 40,height: 40,child: Align(child: Icon(
+                    IconData(0xe681, fontFamily: Constants.IconFontFamily),
+                    color: Color(0xFFFF7E00),
+                    size: 28.0,
+                  ),alignment: Alignment.center,),),onTap: (){
+                    CustomUI.buildTip(context, I18n.of(context).travel_butler, Padding(padding: EdgeInsets.all(10),child: fixedText(I18n.of(context).travel_introduction,fontSize: 14),));
+                  },)
+                ],),
+              ) ,
+
+
               Container(
                 margin: EdgeInsets.all(10),
                 child: Card(

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) {
@@ -1111,7 +1111,6 @@ class HttpUtil {
     Map data = {
       "suserid": msgModel.from,
       "chatmsgid": msgModel.time,
-      "slanguage": 1,
       "tlanguage": UserData().language,
       "chattype": msgModel.msgType,
       "chatchanneltype": msgModel.channelType,

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;
@@ -485,8 +483,8 @@ class MsgHandler {
         }
       } else {
         //聊天消息
-        time = DateTime.now().millisecondsSinceEpoch;
-        print('******收到聊天消息 $time');
+        //time = DateTime.now().millisecondsSinceEpoch;
+        //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"