diff --git a/assets/img_splash_4.png b/assets/img_splash_4.png new file mode 100644 index 0000000..0258739 Binary files /dev/null and b/assets/img_splash_4.png differ diff --git a/assets/img_splash_5.png b/assets/img_splash_5.png new file mode 100644 index 0000000..d69020a Binary files /dev/null and b/assets/img_splash_5.png differ diff --git a/i18n/en-US.json b/i18n/en-US.json index e47db0b..cd31aaf 100644 --- a/i18n/en-US.json +++ b/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", @@ -1248,5 +1248,7 @@ "travel_introduction": "Are you traveling further and further away from your destination? Choose your starting point and ending point, the travel manager will accurately measure the distance for you", "splash_tips_content4": "Unobstructed travel chat", "splash_tips_content5": "Worry-free your trip", - "shock_notice": "Vibration notification" + "shock_notice": "Vibration notification", + "travel_tips2":"Your personal butler, to solve the problem of taxis going to the wrong destination caused by the language" + } \ No newline at end of file diff --git a/i18n/ja-JP.json b/i18n/ja-JP.json index 6564381..cee440e 100644 --- a/i18n/ja-JP.json +++ b/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": "翻訳する言語を選んでください", @@ -1247,5 +1247,7 @@ "travel_introduction": "是否在离目的地越行越远？选择你的起点和终点，出行管家为你精准测距", "splash_tips_content4": "出行聊天畅通无阻", "splash_tips_content5": "无忧你的旅行" , - "shock_notice": "震动通知" + "shock_notice": "震动通知", + "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题" + } \ No newline at end of file diff --git a/i18n/ko-KR.json b/i18n/ko-KR.json index 3e1a5d4..9a1d11c 100644 --- a/i18n/ko-KR.json +++ b/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": "번역할 언어를 선택하세요.", @@ -1248,5 +1248,7 @@ "travel_introduction": "是否在离目的地越行越远？选择你的起点和终点，出行管家为你精准测距", "splash_tips_content4": "出行聊天畅通无阻", "splash_tips_content5": "无忧你的旅行" , - "shock_notice": "震动通知" + "shock_notice": "震动通知", + "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题" + } \ No newline at end of file diff --git a/i18n/vi-VN.json b/i18n/vi-VN.json index 8510fd3..c643b7f 100644 --- a/i18n/vi-VN.json +++ b/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 ", @@ -1247,5 +1247,7 @@ "travel_introduction": "是否在离目的地越行越远？选择你的起点和终点，出行管家为你精准测距", "splash_tips_content4": "出行聊天畅通无阻", "splash_tips_content5": "无忧你的旅行" , - "shock_notice": "震动通知" + "shock_notice": "震动通知", + "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题" + } \ No newline at end of file diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index ee308c8..fd04513 100644 --- a/i18n/zh-CN.json +++ b/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": "请选择要翻译的语言", @@ -1248,5 +1248,6 @@ "travel_introduction": "是否在离目的地越行越远？选择你的起点和终点，出行管家为你精准测距", "splash_tips_content4": "出行聊天畅通无阻", "splash_tips_content5": "无忧你的旅行", - "shock_notice":"震动通知" + "shock_notice":"震动通知", + "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题" } \ No newline at end of file diff --git a/i18n/zh-HK.json b/i18n/zh-HK.json index 05dd178..c68a581 100644 --- a/i18n/zh-HK.json +++ b/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": "請選擇您的語言和要翻譯的語言", @@ -1247,5 +1247,7 @@ "travel_introduction": "是否在离目的地越行越远？选择你的起点和终点，出行管家为你精准测距", "splash_tips_content4": "出行聊天畅通无阻", "splash_tips_content5": "无忧你的旅行", - "shock_notice": "震動通知" + "shock_notice": "震動通知", + "travel_tips2":"您的贴身出行管家,解决语言不通打车走错路的问题" + } \ No newline at end of file diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 1f29032..ce13729 100644 --- a/lib/generated/i18n.dart +++ b/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" diff --git a/lib/home/realtimehelper/real_time_helper_page.dart b/lib/home/realtimehelper/real_time_helper_page.dart index 792f17c..a4cbd24 100644 --- a/lib/home/realtimehelper/real_time_helper_page.dart +++ b/lib/home/realtimehelper/real_time_helper_page.dart @@ -168,7 +168,7 @@ class RealTimeHelperPageState extends State { 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 { 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 { } Widget helperCard(String title, String assets, Function callBack, - {Color textColor,String tips}) { + {Color textColor }) { return Stack(children: [ InkWell( child: Container( @@ -223,13 +223,6 @@ class RealTimeHelperPageState extends State { 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,) ],); } diff --git a/lib/home/realtimehelper/translation_butler_page.dart b/lib/home/realtimehelper/translation_butler_page.dart index 154295c..691242e 100644 --- a/lib/home/realtimehelper/translation_butler_page.dart +++ b/lib/home/realtimehelper/translation_butler_page.dart @@ -363,14 +363,30 @@ class TranslationButlerPageState extends State { return ListView( controller: _scrollController, children: [ + 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: [ + 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( diff --git a/lib/home/realtimehelper/travel_butler_page.dart b/lib/home/realtimehelper/travel_butler_page.dart index fb98f7a..a3f228c 100644 --- a/lib/home/realtimehelper/travel_butler_page.dart +++ b/lib/home/realtimehelper/travel_butler_page.dart @@ -67,6 +67,27 @@ class TravelButlerPageState extends State { color: Color(0xffE8EAF0), child: ListView( children: [ + + + Padding( + padding: EdgeInsets.only(left: 20, right: 10, top: 15), + child: Row(children: [ + 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( diff --git a/lib/utils/HttpUtil.dart b/lib/utils/HttpUtil.dart index a7a1233..fa07f13 100644 --- a/lib/utils/HttpUtil.dart +++ b/lib/utils/HttpUtil.dart @@ -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,