Merge remote-tracking branch 'master/master'

# Conflicts:
#	lib/home/group_all_member.dart
#	lib/home/group_setting.dart

i18n/en-US.json

@@ -1215,10 +1215,9 @@
     "translation_scenes_3": "KTV/酒吧",
     "translation_scenes_4": "其他",
     "file": "文件",
-    "max_file":"文件大于/s1M",
-    "translation_scenes_4": "其他",
+    "max_file": "文件大于/s1M",
     "translation_input_limit": "还可以输入/s1字",
-    "translation_more_desc": "更多描述"
-
-
+    "translation_more_desc": "更多描述",
+    "feedback_assistant": "反馈小助手",
+    "feedback_tips":"有什么问题都可以反馈给我哦"
 }

i18n/ja-JP.json

@@ -1215,8 +1215,9 @@
     "translation_scenes_3": "KTV/酒吧",
     "translation_scenes_4": "其他",
     "file": "文件",
-    "max_file":"文件大于/s1M",
-    "translation_scenes_4": "其他",
+    "max_file": "文件大于/s1M",
     "translation_input_limit": "还可以输入/s1字",
-    "translation_more_desc": "更多描述"
+    "translation_more_desc": "更多描述",
+    "feedback_assistant": "反馈小助手",
+    "feedback_tips":"有什么问题都可以反馈给我哦"
 }

i18n/ko-KR.json

@@ -1157,6 +1157,7 @@
     "select_notice_people": "选择提醒的人",
     "search_phone": "查找手机号",
     "not_have_user": "用户不存在",
+    "not_add_Myself": "你不能添加自己",
     "you_are_blaklisted": "对方已拉黑了你",
     "confrim_recovery": "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)",
     "send_to": "發送到",
@@ -1214,8 +1215,9 @@
     "translation_scenes_3": "KTV/酒吧",
     "translation_scenes_4": "其他",
     "file": "文件",
-    "max_file":"文件大于/s1M",
-    "translation_scenes_4": "其他",
+    "max_file": "文件大于/s1M",
     "translation_input_limit": "还可以输入/s1字",
-    "translation_more_desc": "更多描述"
+    "translation_more_desc": "更多描述",
+    "feedback_assistant": "反馈小助手",
+    "feedback_tips": "有什么问题都可以反馈给我哦"
 }

i18n/vi-VN.json

@@ -1153,16 +1153,16 @@
     "enter_num_qian": "Số lượng hối đổi (đơn vị K)",
     "enter_num_qian1": "Số lượng tiền rút (đơn vị K)",
     "daily_translate_voucher": "翻译券",
-    "msg_notice":"通知消息",
-    "select_notice_people":"选择提醒的人",
-    "search_phone":"查找手机号",
-    "not_have_user":"用户不存在",
-    "not_add_Myself":"你不能添加自己",
-    "you_are_blaklisted":"对方已拉黑了你",
-    "confrim_recovery":"确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)",
+    "msg_notice": "通知消息",
+    "select_notice_people": "选择提醒的人",
+    "search_phone": "查找手机号",
+    "not_have_user": "用户不存在",
+    "not_add_Myself": "你不能添加自己",
+    "you_are_blaklisted": "对方已拉黑了你",
+    "confrim_recovery": "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)",
     "send_to": "發送到",
-    "search_plach":"搜索位置",
-    "finding_place":"查找位置",
+    "search_plach": "搜索位置",
+    "finding_place": "查找位置",
     "real_time_helper": "实时帮",
     "translation_butler": "翻译管家",
     "travel_butler": "出行管家",
@@ -1215,8 +1215,9 @@
     "translation_scenes_3": "KTV/酒吧",
     "translation_scenes_4": "其他",
     "file": "文件",
-    "max_file":"文件大于/s1M",
-    "translation_scenes_4": "其他",
+    "max_file": "文件大于/s1M",
     "translation_input_limit": "还可以输入/s1字",
-    "translation_more_desc": "更多描述"
+    "translation_more_desc": "更多描述",
+    "feedback_assistant": "反馈小助手",
+    "feedback_tips":"有什么问题都可以反馈给我哦"
 }

i18n/zh-CN.json

@@ -1214,9 +1214,10 @@
   "translation_scenes_2": "餐厅/酒店",
   "translation_scenes_3": "KTV/酒吧",
   "translation_scenes_4": "其他",
-    "translation_input_limit": "还可以输入/s1字",
-    "translation_more_desc": "更多描述",
-  "translation_scenes_4": "其他",
+  "translation_input_limit": "还可以输入/s1字",
+  "translation_more_desc": "更多描述",
   "file": "文件",
-  "max_file":"文件大于/s1M"
+  "max_file": "文件大于/s1M",
+  "feedback_assistant":"反馈小助手",
+  "feedback_tips":"有什么问题都可以反馈给我哦"
 }

i18n/zh-HK.json

@@ -1215,10 +1215,9 @@
     "translation_scenes_3": "KTV/酒吧",
     "translation_scenes_4": "其他",
     "file": "文件",
-    "max_file":"文件大於/s1M",
-    "translation_scenes_4": "其他",
+    "max_file": "文件大於/s1M",
     "translation_input_limit": "还可以输入/s1字",
-    "translation_more_desc": "更多描述"
-
-
+    "translation_more_desc": "更多描述",
+    "feedback_assistant": "反饋小助手",
+    "feedback_tips":"有什麼問題都可以反饋給我哦"
 }

lib/chat/company_server_view.dart

@@ -46,7 +46,7 @@ class _CompanyServerPageState extends State<CompanyServerPage> {
   UserInfo companyInfo = UserInfo(
       userId: companyId,
       headimgurl: R.assetsImagesServerIcon,
-      nickName: '反馈小助手');
+      nickName: I18n.of(Constants.getCurrentContext()).feedback_assistant);
 
   @override
   void initState() {
@@ -278,7 +278,7 @@ class _CompanyServerPageState extends State<CompanyServerPage> {
           ? Padding(
               padding: EdgeInsets.all(8),
               child: Text(
-                '有什么问题都可以反馈给我哦',
+                I18n.of(context).feedback_tips,
                 textAlign: TextAlign.center,
                 textScaleFactor: 1.0,
                 style: TextStyle(color: Colors.grey, fontSize: 12),
@@ -318,7 +318,7 @@ class _CompanyServerPageState extends State<CompanyServerPage> {
           backgroundColor: const Color(0xFFE2E9F1),
           appBar: AppBar(
             title: Text(
-              '反馈小助手',
+              I18n.of(context).feedback_assistant,
               textScaleFactor: 1.0,
               style:
                   TextStyle(color: Constants.BlackTextColor, fontSize: 16.47),

lib/chat/group_chat_item.dart

@@ -12,6 +12,7 @@ import 'package:chat/chat/upload_item.dart';
 import 'package:chat/chat/video_view.dart';
 import 'package:chat/data/UserData.dart';
 import 'package:chat/data/constants.dart';
+import 'package:chat/utils/friend_list_mgr.dart';
 import 'package:chat/utils/wpop/w_popup_menu.dart';
 import 'package:flutter/services.dart';
 import 'package:chat/generated/i18n.dart';
@@ -1299,7 +1300,9 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
                         child: Image.asset(R.assetsImagesDefaultNorAvatar))),
             onTap: () {
               AppNavigator.pushProfileInfoPage(context, memberModel.memberId,
-                  fromWhere: 2, addMode: 1);
+                  fromWhere: 2,
+                  addMode:
+                      FriendListMgr().isMyFriend(memberModel.memberId) ? 1 : 0);
             },
             onLongPress: () {
               print('long press user');

lib/chat/group_chat_view.dart

@@ -33,7 +33,6 @@ import 'input_bar.dart';
 import 'package:chat/models/ref_name_provider.dart';
 import 'package:fixnum/fixnum.dart';
 
-
 class GroupChatPage extends StatefulWidget {
   final GroupInfoModel groupInfoModel;
   final int enterType; // 0默认  1图片
@@ -91,13 +90,11 @@ class _GroupChatPageState extends State<GroupChatPage> {
 
     msgList = ChatDataMgr().getGroupRecord();
 
-
-    for(int k=0;k<msgList.length;k++){
+    for (int k = 0; k < msgList.length; k++) {
       MsgModel msg = msgList[k];
-      print('msgList ${msg.msgType} ${msg.from}'  );
+      print('msgList ${msg.msgType} ${msg.from}');
     }
 
-
     msgMgr.on('New Chat Message', receiveMsg);
     msgMgr.on('Keyboard Hide', dealWithKeyboardHide);
     msgMgr.on('Update Group Info', updateGroupInfo);
@@ -111,7 +108,8 @@ class _GroupChatPageState extends State<GroupChatPage> {
         //转发消息
         MsgModel originMsg = widget.enterContent;
         MsgModel msg = MsgHandler.createSendMsg(
-            ChatType.valueOf(originMsg.msgType), originMsg.msgContent,channelType: ChatChannelType.Group);
+            ChatType.valueOf(originMsg.msgType), originMsg.msgContent,
+            channelType: ChatChannelType.Group);
         msg.extraInfo = originMsg.extraInfo;
         msg.extraFile = originMsg.extraFile;
         msg.localFile = originMsg.localFile;
@@ -124,8 +122,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
     });
   }
 
-
-  void _sendFile( File file) async {
+  void _sendFile(File file) async {
 //    File file = await FilePicker.getFile();
     int fileSize = file.lengthSync();
     print('选择的文件 ${file.path} 大小 $fileSize');
@@ -135,7 +132,6 @@ class _GroupChatPageState extends State<GroupChatPage> {
       return;
     }
 
-
     var fileName = file.path.split('/').last;
     print('fileName  $fileName');
 
@@ -151,17 +147,13 @@ class _GroupChatPageState extends State<GroupChatPage> {
     fileMsg.size = fileSize;
     fileMsg.name = fileName;
 
-    var msg = MsgHandler.createSendMsg(ChatType.FileChatType, fileMsg.writeToBuffer(),
-        friendId: 0,
-        localFile: file.path,
-        channelType:
-        ChatChannelType.Group);
+    var msg = MsgHandler.createSendMsg(
+        ChatType.FileChatType, fileMsg.writeToBuffer(),
+        friendId: 0, localFile: file.path, channelType: ChatChannelType.Group);
 
     sendMsg(msg);
-
   }
 
-
   updateGroupInfo(args) {
     print('更新群信息');
     if (mounted) {
@@ -384,7 +376,8 @@ class _GroupChatPageState extends State<GroupChatPage> {
                 textScaleFactor: 1.0,
                 style: TextStyle(color: Colors.grey),
               ))
-          : Scrollbar(child: ListView.builder(
+          : Scrollbar(
+              child: ListView.builder(
               reverse: true,
               shrinkWrap: true,
               itemCount: msgList.length,
@@ -425,21 +418,18 @@ class _GroupChatPageState extends State<GroupChatPage> {
   }
 
   MsgModel msg;
-  int count=0;
-  testBig(MsgModel msg)async{
-
-
-
-    for(int k=0;k<100;k++){
+  int count = 0;
+  testBig(MsgModel msg) async {
+    for (int k = 0; k < 100; k++) {
       msg.msgContent = utf8.encode('测试$count');
       Int64 time = Int64((DateTime.now()).millisecondsSinceEpoch);
       msg.time = time.toInt();
       MsgHandler.insertMsgToDB(msg);
       MsgHandler.sendChatMsg(msg);
-      await Future.delayed(Duration(milliseconds: 300),(){});
+      await Future.delayed(Duration(milliseconds: 300), () {});
       count++;
     }
-    count=0;
+    count = 0;
     print('攻击完毕');
     showToast('攻击完毕');
   }
@@ -512,6 +502,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
                 padding: EdgeInsets.fromLTRB(15, 15, 15, 13),
                 child: Text(
                   I18n.of(context).quit_group_tips,
+                  textScaleFactor: 1.0,
                   style: TextStyle(fontSize: 12, color: Color(0xff777777)),
                 ),
               ),
@@ -524,6 +515,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
                   height: 60,
                   alignment: Alignment.center,
                   child: Text(I18n.of(context).determine,
+                      textScaleFactor: 1.0,
                       style: TextStyle(
                           fontSize: 18, color: Constants.ConfrimButtonColor)),
                 ),
@@ -540,6 +532,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
                   height: 60,
                   alignment: Alignment.center,
                   child: Text(I18n.of(context).cancel,
+                   textScaleFactor: 1.0,
                       style: TextStyle(fontSize: 18, color: Color(0xff4B4B4B))),
                 ),
               )

lib/generated/i18n.dart

@@ -2471,6 +2471,10 @@ class I18n implements WidgetsLocalizations {
   String get translation_input_limit => "还可以输入/s1字";
   /// "更多描述"
   String get translation_more_desc => "更多描述";
+  /// "反馈小助手"
+  String get feedback_assistant => "反馈小助手";
+  /// "有什么问题都可以反馈给我哦"
+  String get feedback_tips => "有什么问题都可以反馈给我哦";
 }
 
 class _I18n_en_US extends I18n {
@@ -6140,6 +6144,12 @@ class _I18n_vi_VN extends I18n {
   /// "更多描述"
   @override
   String get translation_more_desc => "更多描述";
+  /// "反馈小助手"
+  @override
+  String get feedback_assistant => "反馈小助手";
+  /// "有什么问题都可以反馈给我哦"
+  @override
+  String get feedback_tips => "有什么问题都可以反馈给我哦";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -9805,6 +9815,12 @@ class _I18n_zh_HK extends I18n {
   /// "更多描述"
   @override
   String get translation_more_desc => "更多描述";
+  /// "反饋小助手"
+  @override
+  String get feedback_assistant => "反饋小助手";
+  /// "有什麼問題都可以反饋給我哦"
+  @override
+  String get feedback_tips => "有什麼問題都可以反饋給我哦";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -13470,6 +13486,12 @@ class _I18n_zh_CN extends _I18n_zh_HK {
   /// "更多描述"
   @override
   String get translation_more_desc => "更多描述";
+  /// "反馈小助手"
+  @override
+  String get feedback_assistant => "反馈小助手";
+  /// "有什么问题都可以反馈给我哦"
+  @override
+  String get feedback_tips => "有什么问题都可以反馈给我哦";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -16952,6 +16974,9 @@ class _I18n_ko_KR extends I18n {
   /// "用户不存在"
   @override
   String get not_have_user => "用户不存在";
+  /// "你不能添加自己"
+  @override
+  String get not_add_Myself => "你不能添加自己";
   /// "对方已拉黑了你"
   @override
   String get you_are_blaklisted => "对方已拉黑了你";
@@ -17132,6 +17157,12 @@ class _I18n_ko_KR extends I18n {
   /// "更多描述"
   @override
   String get translation_more_desc => "更多描述";
+  /// "反馈小助手"
+  @override
+  String get feedback_assistant => "反馈小助手";
+  /// "有什么问题都可以反馈给我哦"
+  @override
+  String get feedback_tips => "有什么问题都可以反馈给我哦";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -20797,6 +20828,12 @@ class _I18n_ja_JP extends I18n {
   /// "更多描述"
   @override
   String get translation_more_desc => "更多描述";
+  /// "反馈小助手"
+  @override
+  String get feedback_assistant => "反馈小助手";
+  /// "有什么问题都可以反馈给我哦"
+  @override
+  String get feedback_tips => "有什么问题都可以反馈给我哦";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;

lib/home/ConversActionPage.dart

@@ -636,11 +636,11 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../data/constants.dart'
     show
-    AppColors,
-    AppStyles,
-    Constants,
-    GlobalSearchPageType,
-    GroupOperatingPageType;
+        AppColors,
+        AppStyles,
+        Constants,
+        GlobalSearchPageType,
+        GroupOperatingPageType;
 import 'package:cached_network_image/cached_network_image.dart';
 
 import 'create_group_view.dart';
@@ -650,11 +650,11 @@ import 'group_item_widget.dart';
 class _ConversationItem extends StatelessWidget {
   const _ConversationItem(
       {Key key,
-        this.conversation,
-        this.callback,
-        this.icon,
-        this.bgColor,
-        this.iconSize = 20})
+      this.conversation,
+      this.callback,
+      this.icon,
+      this.bgColor,
+      this.iconSize = 20})
       : assert(conversation != null),
         super(key: key);
   final icon;
@@ -714,7 +714,7 @@ class _ConversationItem extends StatelessWidget {
         alignment: Alignment.center,
         decoration: BoxDecoration(
           borderRadius:
-          BorderRadius.circular(Constants.UnReadMsgNotifyDotSize / 2.0),
+              BorderRadius.circular(Constants.UnReadMsgNotifyDotSize / 2.0),
           color: Color(0xFFFF5454),
         ),
         child: Text(countStr,
@@ -722,9 +722,9 @@ class _ConversationItem extends StatelessWidget {
       );
       _rightArea.add(Expanded(
           child: Align(
-            alignment: Alignment.bottomCenter,
-            child: unreadMsgCountText,
-          )));
+        alignment: Alignment.bottomCenter,
+        child: unreadMsgCountText,
+      )));
     }
 
     return InkWell(
@@ -935,9 +935,9 @@ class _ConversActionPageState extends State<ConversActionPage>
               child: Container(
                 padding: EdgeInsets.only(left: 2),
                 decoration: BoxDecoration(
-                  //color: Constants.LightGreyBackgroundColor,
+                    //color: Constants.LightGreyBackgroundColor,
                     border:
-                    Border(bottom: BorderSide(color: Color(0xffeaeaea)))),
+                        Border(bottom: BorderSide(color: Color(0xffeaeaea)))),
                 alignment: Alignment.centerLeft,
                 child: TabBar(
                   isScrollable: true,
@@ -970,8 +970,8 @@ class _ConversActionPageState extends State<ConversActionPage>
         ),
         body: SafeArea(
             child: TabBarView(
-              children: <Widget>[
-                LastChatPage(),
+          children: <Widget>[
+            LastChatPage(),
 //                ListView.builder(
 ////              controller: _scrollController,
 //                  itemBuilder: (BuildContext context, int index) {
@@ -984,155 +984,155 @@ class _ConversActionPageState extends State<ConversActionPage>
 //                  },
 //                  itemCount: groupList.length + 1,
 //                ),
-                ListView(
-                  children: <Widget>[
-                    SizedBox(height: 8.5),
-                    _ConversationItem(
-                      icon: 'assets/images/chat/icon1.png',
-                      bgColor: Constants.RadioGradient,
-                      conversation: Conversation(
-                        avatar: 'assets/images/ic_tx_news.png',
-                        title: I18n.of(context).radio_message,
-                        desc: RichTitle.normalTitle(
-                            systemInfo['castList'], context, InfoType.Radio),
-                        updateAt: systemInfo['castList'] == null
-                            ? ""
-                            : WebData().getLoginTime(
+            ListView(
+              children: <Widget>[
+                SizedBox(height: 8.5),
+                _ConversationItem(
+                  icon: 'assets/images/chat/icon1.png',
+                  bgColor: Constants.RadioGradient,
+                  conversation: Conversation(
+                    avatar: 'assets/images/ic_tx_news.png',
+                    title: I18n.of(context).radio_message,
+                    desc: RichTitle.normalTitle(
+                        systemInfo['castList'], context, InfoType.Radio),
+                    updateAt: systemInfo['castList'] == null
+                        ? ""
+                        : WebData().getLoginTime(
                             context, systemInfo['castList']['CreateTime']),
-                        unreadMsgCount: systemInfo['castCount'],
+                    unreadMsgCount: systemInfo['castCount'],
+                  ),
+                  callback: () {
+                    setResNum(Constants.CastCount);
+                    Navigator.of(context).push(
+                      new MaterialPageRoute(
+                        builder: (context) {
+                          return InfoListPage(
+                            title: I18n.of(context).radio_message,
+                            type: InfoType.Radio,
+                          );
+                        },
                       ),
-                      callback: () {
-                        setResNum(Constants.CastCount);
-                        Navigator.of(context).push(
-                          new MaterialPageRoute(
-                            builder: (context) {
-                              return InfoListPage(
-                                title: I18n.of(context).radio_message,
-                                type: InfoType.Radio,
-                              );
-                            },
-                          ),
-                        );
-                      },
-                    ),
-                    _ConversationItem(
-                      icon: 'assets/images/chat/icon4.png',
-                      bgColor: Constants.MoneyGradient,
-                      conversation: Conversation(
-                        avatar: 'assets/images/ic_tx_news.png',
-                        title: I18n.of(context).wallet_reminder,
-                        desc: RichTitle.normalTitle(
-                            systemInfo['walletList'], context, InfoType.IncomeMoney),
-                        updateAt: systemInfo['walletList'] == null
-                            ? ""
-                            : WebData().getLoginTime(
+                    );
+                  },
+                ),
+                _ConversationItem(
+                  icon: 'assets/images/chat/icon4.png',
+                  bgColor: Constants.MoneyGradient,
+                  conversation: Conversation(
+                    avatar: 'assets/images/ic_tx_news.png',
+                    title: I18n.of(context).wallet_reminder,
+                    desc: RichTitle.normalTitle(systemInfo['walletList'],
+                        context, InfoType.IncomeMoney),
+                    updateAt: systemInfo['walletList'] == null
+                        ? ""
+                        : WebData().getLoginTime(
                             context, systemInfo['walletList']['CreateTime']),
-                        unreadMsgCount: systemInfo['walletCount'],
+                    unreadMsgCount: systemInfo['walletCount'],
+                  ),
+                  callback: () {
+                    setResNum(Constants.WalletCount);
+                    Navigator.of(context).push(
+                      new MaterialPageRoute(
+                        builder: (context) {
+                          return InfoListPage(
+                            title: I18n.of(context).wallet_reminder,
+                            type: InfoType.IncomeMoney,
+                          );
+                        },
                       ),
-                      callback: () {
-                        setResNum(Constants.WalletCount);
-                        Navigator.of(context).push(
-                          new MaterialPageRoute(
-                            builder: (context) {
-                              return InfoListPage(
-                                title: I18n.of(context).wallet_reminder,
-                                type: InfoType.IncomeMoney,
-                              );
-                            },
-                          ),
-                        );
-                      },
-                    ),
-                    _ConversationItem(
-                      icon: 'assets/images/chat/icon3.png',
-                      iconSize: 27,
-                      bgColor: Constants.ApplyGradient,
-                      conversation: Conversation(
-                        avatar: 'assets/images/ic_tx_news.png',
-                        title: I18n.of(context).application_notice,
-                        desc: RichTitle.normalTitle(
-                            systemInfo['applyList'], context, InfoType.Apply),
-                        updateAt: systemInfo['applyList'] == null
-                            ? ""
-                            : WebData().getLoginTime(
+                    );
+                  },
+                ),
+                _ConversationItem(
+                  icon: 'assets/images/chat/icon3.png',
+                  iconSize: 27,
+                  bgColor: Constants.ApplyGradient,
+                  conversation: Conversation(
+                    avatar: 'assets/images/ic_tx_news.png',
+                    title: I18n.of(context).application_notice,
+                    desc: RichTitle.normalTitle(
+                        systemInfo['applyList'], context, InfoType.Apply),
+                    updateAt: systemInfo['applyList'] == null
+                        ? ""
+                        : WebData().getLoginTime(
                             context, systemInfo['applyList']['CreatTime']),
-                        unreadMsgCount: systemInfo['applyCount'],
+                    unreadMsgCount: systemInfo['applyCount'],
+                  ),
+                  callback: () {
+                    setResNum(Constants.ApplyCount);
+                    Navigator.of(context).push(
+                      new MaterialPageRoute(
+                        builder: (context) {
+                          return InfoListPage(
+                            title: I18n.of(context).application_notice,
+                            type: InfoType.Apply,
+                          );
+                        },
                       ),
-                      callback: () {
-                        setResNum(Constants.ApplyCount);
-                        Navigator.of(context).push(
-                          new MaterialPageRoute(
-                            builder: (context) {
-                              return InfoListPage(
-                                title: I18n.of(context).application_notice,
-                                type: InfoType.Apply,
-                              );
-                            },
-                          ),
-                        );
-                      },
-                    ),
-                    _ConversationItem(
-                      icon: 'assets/images/chat/icon6.png',
-                      bgColor: Constants.EvaGradient,
-                      conversation: Conversation(
-                        avatar: 'assets/images/ic_tx_news.png',
-                        title: I18n.of(context).evaluation_notice,
-                        desc: RichTitle.normalTitle(systemInfo['evaluateList'],
-                            context, InfoType.Evaluation),
-                        updateAt: systemInfo['evaluateList'] == null
-                            ? ''
-                            : WebData().getLoginTime(
+                    );
+                  },
+                ),
+                _ConversationItem(
+                  icon: 'assets/images/chat/icon6.png',
+                  bgColor: Constants.EvaGradient,
+                  conversation: Conversation(
+                    avatar: 'assets/images/ic_tx_news.png',
+                    title: I18n.of(context).evaluation_notice,
+                    desc: RichTitle.normalTitle(systemInfo['evaluateList'],
+                        context, InfoType.Evaluation),
+                    updateAt: systemInfo['evaluateList'] == null
+                        ? ''
+                        : WebData().getLoginTime(
                             context, systemInfo['evaluateList']['CreateTime']),
-                        unreadMsgCount: systemInfo['evaluateCount'],
+                    unreadMsgCount: systemInfo['evaluateCount'],
+                  ),
+                  callback: () {
+                    setResNum(Constants.EvaluateCount);
+                    Navigator.of(context).push(
+                      new MaterialPageRoute(
+                        builder: (context) {
+                          return InfoListPage(
+                            title: I18n.of(context).evaluation_notice,
+                            type: 2,
+                          );
+                        },
                       ),
-                      callback: () {
-                        setResNum(Constants.EvaluateCount);
-                        Navigator.of(context).push(
-                          new MaterialPageRoute(
-                            builder: (context) {
-                              return InfoListPage(
-                                title: I18n.of(context).evaluation_notice,
-                                type: 2,
-                              );
-                            },
-                          ),
-                        );
-                      },
-                    ),
-                    _ConversationItem(
-                      icon: 'assets/images/chat/icon5.png',
-                      bgColor: Constants.ParkGradient,
-                      conversation: Conversation(
-                        avatar: 'assets/images/ic_tx_news.png',
-                        title: I18n.of(context).appName,
-                        desc: RichTitle.normalTitle(
-                            systemInfo['parkList'], context, InfoType.System),
-                        updateAt: systemInfo['parkList'] == null
-                            ? ""
-                            : WebData().getLoginTime(
+                    );
+                  },
+                ),
+                _ConversationItem(
+                  icon: 'assets/images/chat/icon5.png',
+                  bgColor: Constants.ParkGradient,
+                  conversation: Conversation(
+                    avatar: 'assets/images/ic_tx_news.png',
+                    title: I18n.of(context).appName,
+                    desc: RichTitle.normalTitle(
+                        systemInfo['parkList'], context, InfoType.System),
+                    updateAt: systemInfo['parkList'] == null
+                        ? ""
+                        : WebData().getLoginTime(
                             context, systemInfo['parkList']['CreateTime']),
-                        unreadMsgCount: systemInfo['parkCount'],
+                    unreadMsgCount: systemInfo['parkCount'],
+                  ),
+                  callback: () {
+                    setResNum(Constants.ParkCount);
+                    Navigator.of(context).push(
+                      new MaterialPageRoute(
+                        builder: (context) {
+                          return InfoListPage(
+                            title: I18n.of(context).appName,
+                            type: InfoType.System,
+                          );
+                        },
                       ),
-                      callback: () {
-                        setResNum(Constants.ParkCount);
-                        Navigator.of(context).push(
-                          new MaterialPageRoute(
-                            builder: (context) {
-                              return InfoListPage(
-                                title: I18n.of(context).appName,
-                                type: InfoType.System,
-                              );
-                            },
-                          ),
-                        );
-                      },
-                    )
-                  ],
+                    );
+                  },
                 )
               ],
-              controller: tabCtrl,
-            )));
+            )
+          ],
+          controller: tabCtrl,
+        )));
   }
 
   Widget _buildCreateButton() {
@@ -1174,6 +1174,7 @@ class _ConversActionPageState extends State<ConversActionPage>
                   SizedBox(width: 14.0),
                   Text(
                     I18n.of(context).create_group_chat,
+                    textScaleFactor: 1.0,
                     style: TextStyle(fontSize: 15.5),
                   ),
                 ],
@@ -1188,7 +1189,10 @@ class _ConversActionPageState extends State<ConversActionPage>
       decoration: BoxDecoration(
           color: Colors.white,
           border: Border(bottom: Constants.GreyBorderSide)),
-      child: Text(I18n.of(context).group_chat + '(${groupList.length})'),
+      child: Text(
+        I18n.of(context).group_chat + '(${groupList.length})',
+        textScaleFactor: 1.0,
+      ),
     );
 
     return Column(

lib/home/EditData.dart

@@ -153,11 +153,11 @@ class _EditPageState extends State<EditPage> {
       heightStr = (UserData().basicInfo.height == 0.0 ||
               UserData().basicInfo.height == null)
           ? I18n.of(context).not_show
-          : '${UserData().basicInfo.height}M';
+          : '${UserData().basicInfo.height.toInt()}CM';
       weightStr = (UserData().basicInfo.weight == 0.0 ||
               UserData().basicInfo.weight == null)
           ? I18n.of(context).not_show
-          : '${UserData().basicInfo.weight}KG';
+          : '${UserData().basicInfo.weight.toInt()}KG';
       loadSuccess = true;
       setState(() {});
     }
@@ -1005,7 +1005,7 @@ class _EditPageState extends State<EditPage> {
                 border: InputBorder.none,
               ),
               maxLines: 5,
-              inputFormatters: [LengthLimitingTextInputFormatter(100)],
+              inputFormatters: [LengthLimitingTextInputFormatter(50)],
             ),
           )
         ],

lib/home/IndexPage.dart

@@ -189,6 +189,7 @@ class _IndexPageState extends State<IndexPage> {
                 Container(
                   child: Text(
                     I18n.of(context).net_error,
+                    textScaleFactor: 1.0,
                     style: TextStyle(color: Color(0xFF8F8E8E), fontSize: 21.5),
                   ),
                 ),
@@ -207,6 +208,7 @@ class _IndexPageState extends State<IndexPage> {
                         borderRadius: BorderRadius.circular(8)),
                     child: Text(
                       I18n.of(context).re_connect,
+                      textScaleFactor: 1.0,
                       style:
                           TextStyle(color: Color(0xFF3875E9), fontSize: 20.22),
                     ),

lib/home/InfoList.dart

@@ -614,6 +614,7 @@ class _InfoListPageState extends State<InfoListPage>
       rightButton: userInfo['Status'] == 0 || userInfo['Status'] == 3
           ? botton
           : Text(userInfo['Status'] == 1 ? I18n.of(context).appealed : "",
+              textScaleFactor: 1.0,
               style:
                   TextStyle(fontSize: 11, color: Constants.LightGreyTextColor)),
       title:
@@ -684,7 +685,7 @@ class _InfoListPageState extends State<InfoListPage>
       applyInfo: data['Type'] == 6 ? applyInfo : null, // applyInfo,
       bgColor: Constants.ParkGradient,
       title: data['Type'] == 6
-          ? Text(data['Theme'])
+          ? Text(data['Theme'], textScaleFactor: 1.0)
           : RichTitle.getRichTitleWidget(data, context, InfoType.System),
       callback: () {
         if (data['Type'] == 4 && data['Status'] == 1) {
@@ -783,6 +784,7 @@ class _InfoListPageState extends State<InfoListPage>
           backgroundColor: AppColors.NewAppbarBgColor,
           title: Text(
             widget.title,
+            textScaleFactor: 1.0,
             style: TextStyle(color: AppColors.NewAppbarTextColor),
           ),
           leading: CustomUI.buildCustomLeading(context),

lib/home/MessagePushPage.dart

@@ -171,11 +171,11 @@ class _MessagePushPageState extends State<MessagePushPage> {
           womenAgree = !womenAgree;
         });
       }),
-      _buildHiddenButtom(I18n.of(context).applied_successfully, codeSucess, () {
-        setState(() {
-          codeSucess = !codeSucess;
-        });
-      }),
+      // _buildHiddenButtom(I18n.of(context).applied_successfully, codeSucess, () {
+      //   setState(() {
+      //     codeSucess = !codeSucess;
+      //   });
+      // }),
     ];
     List<Widget> women = [
       _buildHiddenButtom(I18n.of(context).private_chat2, privatyMsg, () {

lib/home/MoneyPage.dart

@@ -183,6 +183,7 @@ class MoneyPageState extends State<MoneyPage>
           margin: EdgeInsets.only(top: 20),
           child: Text(
             I18n.of(context).withdrawal_application,
+            textScaleFactor: 1.0,
             style: TextStyle(color: Constants.BlackTextColor, fontSize: 16),
           ),
         ),
@@ -276,6 +277,7 @@ class MoneyPageState extends State<MoneyPage>
           margin: EdgeInsets.only(top: 20),
           child: Text(
             I18n.of(context).charge_h,
+            textScaleFactor: 1.0,
             style: TextStyle(color: Constants.BlackTextColor, fontSize: 16),
           ),
         ),
@@ -438,6 +440,7 @@ class MoneyPageState extends State<MoneyPage>
           width: 120,
           child: Text(
             I18n.of(context).recharge,
+            textScaleFactor: 1.0,
             style: TextStyle(color: const Color(0xFFFF717D), fontSize: 14.8),
           ),
         ));
@@ -461,6 +464,7 @@ class MoneyPageState extends State<MoneyPage>
           width: 120,
           child: Text(
             I18n.of(context).joinvip,
+            textScaleFactor: 1.0,
             style: TextStyle(color: Colors.white, fontSize: 14.8),
           ),
         ));
@@ -503,6 +507,7 @@ class MoneyPageState extends State<MoneyPage>
                           Container(
                             child: Text(
                               I18n.of(context).my_money_info,
+                              textScaleFactor: 1.0,
                               style:
                                   TextStyle(color: Colors.white, fontSize: 12),
                             ),
@@ -519,6 +524,7 @@ class MoneyPageState extends State<MoneyPage>
                     alignment: Alignment.center,
                     child: Text(
                       I18n.of(context).my_left_money,
+                      textScaleFactor: 1.0,
                       style: TextStyle(color: Colors.white, fontSize: 15),
                     ),
                   ),
@@ -528,6 +534,7 @@ class MoneyPageState extends State<MoneyPage>
                     child: Text(
                       '${Provider.of<MoneyChangeProvider>(context).money}' +
                           I18n.of(context).mask_coin,
+                      textScaleFactor: 1.0,
                       style: TextStyle(color: Colors.white, fontSize: 31.29),
                     ),
                   ),
@@ -545,6 +552,7 @@ class MoneyPageState extends State<MoneyPage>
                     alignment: Alignment.centerLeft,
                     child: Text(
                       I18n.of(context).money_tips,
+                      textScaleFactor: 1.0,
                       style: TextStyle(color: Colors.white, fontSize: 11),
                     ),
                   ),
@@ -595,6 +603,7 @@ class MoneyPageState extends State<MoneyPage>
                           Container(
                             child: Text(
                               I18n.of(context).get_money_detail,
+                              textScaleFactor: 1.0,
                               style:
                                   TextStyle(color: Colors.white, fontSize: 12),
                             ),
@@ -604,13 +613,14 @@ class MoneyPageState extends State<MoneyPage>
                             size: 16.0,
                             color: Colors.white,
                           ),
-                           SizedBox(width: 5)
+                          SizedBox(width: 5)
                         ],
                       )),
                   Container(
                     alignment: Alignment.center,
                     child: Text(
                       I18n.of(context).hibok_money,
+                      textScaleFactor: 1.0,
                       style: TextStyle(color: Colors.white, fontSize: 15),
                     ),
                   ),
@@ -624,11 +634,13 @@ class MoneyPageState extends State<MoneyPage>
                             (UserData().incomeMoney + UserData().frozenMoney)
                                     .toString() +
                                 'K',
+                            textScaleFactor: 1.0,
                             style:
                                 TextStyle(color: Colors.white, fontSize: 31.29),
                           ),
                           Text(
                             "(${I18n.of(context).can_withdraw}${UserData().incomeMoney}K)",
+                            textScaleFactor: 1.0,
                             style: TextStyle(color: Colors.white, fontSize: 18),
                           ),
                         ],
@@ -647,6 +659,7 @@ class MoneyPageState extends State<MoneyPage>
                             width: 120,
                             child: Text(
                               I18n.of(context).exchange_cash,
+                              textScaleFactor: 1.0,
                               style: TextStyle(
                                   color: const Color(0xFF4F8BFF),
                                   fontSize: 14.8),
@@ -663,6 +676,7 @@ class MoneyPageState extends State<MoneyPage>
                             width: 120,
                             child: Text(
                               I18n.of(context).charge_h,
+                              textScaleFactor: 1.0,
                               style: TextStyle(
                                   color: Colors.white, fontSize: 14.8),
                             ),
@@ -679,6 +693,7 @@ class MoneyPageState extends State<MoneyPage>
                       alignment: Alignment.centerLeft,
                       child: Text(
                         I18n.of(context).charge_tips,
+                        textScaleFactor: 1.0,
                         style: TextStyle(color: Colors.white, fontSize: 11),
                       ),
                     ),

lib/home/MoneyPageOld.dart

@@ -134,6 +134,7 @@ class _ConversationItem extends StatelessWidget {
                 children: <Widget>[
                   Text(
                     '${money > 0 ? '+' : ''}$money${I18n.of(context).mask_coin}',
+                    textScaleFactor: 1.0,
                     style: TextStyle(
                         fontSize: 14,
                         fontWeight: FontWeight.w500,
@@ -145,6 +146,7 @@ class _ConversationItem extends StatelessWidget {
                           padding: EdgeInsets.only(top: 3),
                           child: Text(
                             I18n.of(context).alreay_back,
+                             textScaleFactor: 1.0,
                             style: TextStyle(
                                 fontSize: 12,
                                 fontWeight: FontWeight.normal,
@@ -303,6 +305,7 @@ class MoneyPageOldState extends State<MoneyPageOld>
           margin: EdgeInsets.only(top: 20),
           child: Text(
             I18n.of(context).withdrawal_application,
+             textScaleFactor: 1.0,
             style: TextStyle(color: Constants.BlackTextColor, fontSize: 16),
           ),
         ),

lib/home/ProfilePage.dart

@@ -1637,42 +1637,32 @@ class _ProfilePageState extends State<ProfilePage>
         highlightColor: Colors.transparent,
         radius: 0.0,
         onTap: callback,
-        child: Column(
-          children: <Widget>[
-            Container(
-              height: 53,
-              margin: EdgeInsets.only(left: 20, bottom: 0, right: 10),
-              child: Row(
-                children: <Widget>[
-                  left,
-                  right,
-                  showIcon
-                      ? Padding(
-                          padding: EdgeInsets.only(right: 10),
-                          child: Icon(
-                            IconData(0xe63c, fontFamily: 'iconfont'),
-                            size: 22.0,
-                            color: Color(AppColors.TabIconNormal),
-                          ))
-                      : Container()
-                ],
-              ),
-            ),
-            showBorder ? _buildDivider() : Container(),
-          ],
+        child: Container(
+          decoration: showBorder
+              ? BoxDecoration(border: Border(bottom: Constants.GreyBorderSide))
+              : null,
+          alignment: Alignment.center,
+          padding: EdgeInsets.only(top: 17,bottom: 17,),
+          margin: EdgeInsets.only(left: 20, bottom: 0, right: 10),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              left,
+              right,
+              showIcon
+                  ? Padding(
+                      padding: EdgeInsets.only(right: 10),
+                      child: Icon(
+                        IconData(0xe63c, fontFamily: 'iconfont'),
+                        size: 22.0,
+                        color: Color(AppColors.TabIconNormal),
+                      ))
+                  : Container()
+            ],
+          ),
         ));
   }
 
-  //下划线
-  Widget _buildDivider() {
-    return new Container(
-      margin: EdgeInsets.symmetric(horizontal: 15),
-      height: 1,
-      decoration:
-          BoxDecoration(border: Border(bottom: Constants.GreyBorderSide)),
-      width: MediaQuery.of(context).size.width,
-    );
-  }
 
   testChatPermission(callback) {
     becomeVip() {

lib/home/SelectPage.dart

@@ -107,6 +107,7 @@ class _SelectPageState extends State<SelectPage> {
             child: new Text(
               value,
               textScaleFactor: 1.0,
+              textAlign: TextAlign.center,
               style: isLeft
                   ? TextStyle(
                       color: leftSelection == key

lib/home/UserAgreement.dart

@@ -18,6 +18,7 @@ class _UserAgreementState extends State<UserAgreement> {
       width: Screen.width,
       child: Text(
         str,
+        textScaleFactor: 1.0,
         style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600),
       ),
     );
@@ -30,6 +31,7 @@ class _UserAgreementState extends State<UserAgreement> {
       width: Screen.width,
       child: Text(
         str,
+        textScaleFactor: 1.0,
         style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600),
       ),
     );
@@ -42,6 +44,7 @@ class _UserAgreementState extends State<UserAgreement> {
       width: Screen.width,
       child: Text(
         str,
+        textScaleFactor: 1.0,
         style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600),
       ),
     );
@@ -53,6 +56,7 @@ class _UserAgreementState extends State<UserAgreement> {
       width: Screen.width,
       child: Text(
         '       ' + str,
+        textScaleFactor: 1.0,
         style: TextStyle(fontSize: 14, height: 1.35),
       ),
     );

lib/home/WhiteAndBlackList.dart

@@ -156,7 +156,9 @@ class _WhiteAndBlackPageState extends State<WhiteAndBlackPage> {
             Padding(
                 padding: EdgeInsets.only(left: 10),
                 child: Text(
-                  WebData().subUserName(userInfo['NickName']),
+                  WebData().subUserName(Provider.of<RefNameProvider>(context)
+                      .getRefName(
+                          userInfo['FollowUserId'], userInfo['NickName'])),
                   textScaleFactor: 1.0,
                   style:
                       TextStyle(fontSize: 15, color: Constants.BlackTextColor),
@@ -169,6 +171,9 @@ class _WhiteAndBlackPageState extends State<WhiteAndBlackPage> {
                     if (list[i]['FollowUserId'] == userInfo['FollowUserId']) {
                       setState(() {
                         list.removeAt(i);
+                        if (list.length == 0) {
+                          _refreshController.refreshCompleted();
+                        }
                       });
                       break;
                     }

lib/home/address_book.dart

@@ -70,7 +70,7 @@ class _ContactItem extends StatelessWidget {
         children: <Widget>[
           _avatarIcon,
           SizedBox(width: 10.0),
-          Expanded(child: Text(title)),
+          Expanded(child: Text(title, textScaleFactor: 1.0)),
           state == 1
               ? InkWell(
                   child: Container(

lib/home/alter_select_view.dart

@@ -71,7 +71,7 @@ class _MemberItem extends StatelessWidget {
         children: <Widget>[
           _avatarIcon,
           SizedBox(width: 10.0),
-          Text(title),
+          Text(title, textScaleFactor: 1.0,),
         ],
       ),
     );
@@ -87,7 +87,7 @@ class _MemberItem extends StatelessWidget {
             color: const Color(AppColors.ContactGroupTitleBgColor),
             alignment: Alignment.centerLeft,
             child:
-                Text(this.groupTitle, style: AppStyles.GroupTitleItemTextStyle),
+                Text(this.groupTitle,  textScaleFactor: 1.0,style: AppStyles.GroupTitleItemTextStyle),
           ),
           _button,
         ],
@@ -219,8 +219,10 @@ class _AlterSelectPageState extends State<AlterSelectPage> {
               width: 20,
               child: Text(
                 word,
+                 textScaleFactor: 1.0,
                 style: TextStyle(
                     fontSize: 10,
+                    
                     color:
                         _currentLetter == word ? Colors.white : Colors.black),
               )));
@@ -340,7 +342,7 @@ class _AlterSelectPageState extends State<AlterSelectPage> {
           ),
           child: Center(
             child:
-                Text(_currentLetter, style: AppStyles.IndexLetterBoxTextStyle),
+                Text(_currentLetter, textScaleFactor: 1.0, style: AppStyles.IndexLetterBoxTextStyle),
           ),
         ),
       ));

lib/home/audio_chat_view.dart

@@ -282,7 +282,14 @@ class _AudioChatPageState extends State<AudioChatPage> {
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              fixedText(userName, fontSize: 20, color: Colors.white70),
+              Container(
+                  width: Screen.width - 50,
+                  child: Text(
+                    userName,
+                    style: TextStyle(fontSize: 20, color: Colors.white70),
+                    textScaleFactor: 1.0,
+                    textAlign: TextAlign.center,
+                  )),
               fixedText('$age', fontSize: 20, color: Colors.white70)
             ],
           ),
@@ -301,13 +308,15 @@ class _AudioChatPageState extends State<AudioChatPage> {
             textAlign: TextAlign.center,
           ),
           SizedBox(height: 20),
-          Text(
-            connectTip,
-            maxLines: 1,
-            style: TextStyle(fontSize: 20, color: Colors.white70),
-            textScaleFactor: 1.0,
-            textAlign: TextAlign.center,
-          ),
+          Container(
+              width: Screen.width - 50,
+              child: Text(
+                connectTip,
+                //maxLines: 2,
+                style: TextStyle(fontSize: 20, color: Colors.white70),
+                textScaleFactor: 1.0,
+                textAlign: TextAlign.center,
+              )),
         ],
       ),
     );
@@ -359,6 +368,7 @@ class _AudioChatPageState extends State<AudioChatPage> {
   _bottomToolBar() {
     List<Widget> showWidgets = [
       Text(I18n.of(context).voicing,
+        textScaleFactor: 1.0,
           style: TextStyle(fontSize: 11, color: Colors.white24),
           textAlign: TextAlign.center),
       SizedBox(height: 10),
@@ -520,7 +530,7 @@ class _AudioChatPageState extends State<AudioChatPage> {
                     color: Colors.white,
                   ),
                   child: giftList == null
-                      ? Center(child: Text(I18n.of(context).no_gift))
+                      ? Center(child: Text(I18n.of(context).no_gift, textScaleFactor: 1.0,))
                       : Column(
                           children: <Widget>[
                             Container(

lib/home/create_group_view.dart

@@ -104,6 +104,7 @@ class _FriendSelectItemState extends State<FriendSelectItem> {
             child: Container(
                 child: Text(
               widget.friendModel.getTitle(),
+              textScaleFactor: 1.0,
               overflow: TextOverflow.ellipsis,
             )),
           )
@@ -122,7 +123,7 @@ class _FriendSelectItemState extends State<FriendSelectItem> {
             color: const Color(AppColors.ContactGroupTitleBgColor),
             alignment: Alignment.centerLeft,
             child: Text(widget.groupTitle,
-                style: AppStyles.GroupTitleItemTextStyle),
+                textScaleFactor: 1.0, style: AppStyles.GroupTitleItemTextStyle),
           ),
           _button,
         ],
@@ -482,8 +483,11 @@ class _CreateGroupPageState extends State<CreateGroupPage> {
                 Radius.circular(Constants.IndexLetterBoxRadius)),
           ),
           child: Center(
-            child:
-                Text(_currentLetter, style: AppStyles.IndexLetterBoxTextStyle),
+            child: Text(
+              _currentLetter,
+              style: AppStyles.IndexLetterBoxTextStyle,
+              textScaleFactor: 1.0,
+            ),
           ),
         ),
       ));

lib/home/daily_bonus_page.dart

@@ -430,6 +430,7 @@ class DailyBouusState extends State with SingleTickerProviderStateMixin {
                           padding: EdgeInsets.fromLTRB(18, 0, 18, 18),
                           child: Text(
                             rules,
+                             textScaleFactor: 1.0,
                             style: TextStyle(
                                 color: Color(0xffFF0000), fontSize: 12),
                           ),

lib/home/find_page.dart

@@ -80,6 +80,7 @@ class _FindPageState extends State<FindPage> {
                     margin: EdgeInsets.only(left: 15),
                     child: Text(
                       text,
+                      textScaleFactor: 1.0,
                       style: TextStyle(fontSize: 16),
                     ),
                   ),

lib/home/friend_page.dart

@@ -146,11 +146,13 @@ class _FriendPageState extends State<FriendPage> {
               child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              Text(list[0]['ApplyName'], style: TextStyle(fontSize: 12.66)),
+              Text(list[0]['ApplyName'],
+                  textScaleFactor: 1.0, style: TextStyle(fontSize: 12.66)),
               SizedBox(
                 height: 5,
               ),
               Text(I18n.of(context).apply_fro_friends,
+               textScaleFactor: 1.0,
                   style:
                       TextStyle(fontSize: 10, color: const Color(0xFF6A6A6A))),
             ],
@@ -401,6 +403,7 @@ class _FriendPageState extends State<FriendPage> {
               width: 20,
               child: Text(
                 word,
+                 textScaleFactor: 1.0,
                 style: TextStyle(
                     fontSize: 10,
                     color:
@@ -509,7 +512,7 @@ class _FriendPageState extends State<FriendPage> {
           ),
           child: Center(
             child:
-                Text(_currentLetter, style: AppStyles.IndexLetterBoxTextStyle),
+                Text(_currentLetter,  textScaleFactor: 1.0,style: AppStyles.IndexLetterBoxTextStyle),
           ),
         ),
       ));

lib/home/goddess_hot.dart

@@ -84,6 +84,7 @@ class GoddessHotPageState extends State<GoddessHotPage> {
                     )),
                     Text(
                       name,
+                       textScaleFactor: 1.0,
                       style: TextStyle(
                           fontSize: 10, color: const Color(0xFF777777)),
                     ),
@@ -106,6 +107,7 @@ class GoddessHotPageState extends State<GoddessHotPage> {
           SizedBox(height: 9),
           Text(
             nums.toString() + I18n.of(context).one,
+             textScaleFactor: 1.0,
             style: TextStyle(fontSize: 12.5, color: const Color(0xFF515151)),
           ),
         ],

lib/home/group_all_member.dart

@@ -151,11 +151,12 @@ class GroupAllMemberState extends State<GroupAllMember> {
               SizedBox(
                 height: 5,
               ),
-              SizedBox(
+              Container(
                 width: size - 30,
+                alignment: Alignment.center,
                 child: Text(
                   refName,
-                    textAlign: TextAlign.center,
+                  textScaleFactor: 1.0,
                   style: TextStyle(fontSize: 11, color: Color(0xff818181)),
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,

lib/home/group_announcement.dart

@@ -68,6 +68,7 @@ class _GroupAnnouncementPageState extends State<GroupAnnouncementPage> {
                       borderRadius: BorderRadius.circular(4.5)),
                   child: Text(
                     I18n.of(context).determine,
+                    textScaleFactor: 1.0,
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(
                         color: Constants.ConfrimButtonColor, fontSize: 12.6),
@@ -129,6 +130,7 @@ class _GroupAnnouncementPageState extends State<GroupAnnouncementPage> {
                 ),
                 Text(
                   I18n.of(context).only_host,
+                  textScaleFactor: 1.0,
                   style: TextStyle(color: Colors.grey[350]),
                 ),
                 Expanded(
@@ -167,6 +169,7 @@ class _GroupAnnouncementPageState extends State<GroupAnnouncementPage> {
             children: <Widget>[
               Text(
                 refName,
+                textScaleFactor: 1.0,
                 style: TextStyle(fontSize: 16),
               ),
               SizedBox(height: 6.5),
@@ -203,7 +206,10 @@ class _GroupAnnouncementPageState extends State<GroupAnnouncementPage> {
         : Container(
             //color: Colors.white,
             padding: EdgeInsets.only(right: 20, left: 20, top: 10, bottom: 10),
-            child: Text(widget.groupInfoModel.describe),
+            child: Text(
+              widget.groupInfoModel.describe,
+              textScaleFactor: 1.0,
+            ),
           );
   }
 

lib/home/group_chat_page.dart

@@ -91,6 +91,7 @@ class _GroupChatListPageState extends State<GroupChatListPage> {
               SizedBox(width: 14.0),
               Text(
                 I18n.of(context).create_group_chat,
+                textScaleFactor: 1.0,
                 style: TextStyle(fontSize: 15.5),
               ),
             ],
@@ -105,7 +106,7 @@ class _GroupChatListPageState extends State<GroupChatListPage> {
       decoration: BoxDecoration(
           color: Colors.white,
           border: Border(bottom: Constants.GreyBorderSide)),
-      child: Text(I18n.of(context).group_chat + '(${groupList.length})'),
+      child: Text(I18n.of(context).group_chat + '(${groupList.length})', textScaleFactor: 1.0,),
     );
 
     return Column(

lib/home/group_item_widget.dart

@@ -21,19 +21,18 @@ const double LeftPadding = 15;
 const double ItemHeight = 83.5;
 
 class GroupItem extends StatefulWidget {
-  GroupItem(
-    Key key, {
-    @required this.groupInfoModel,
-    this.onPressed,
-    this.isShowDivder: true,
-  this.enterType=0,this.enterContent
-
-  }) : super(key: key);
+  GroupItem(Key key,
+      {@required this.groupInfoModel,
+      this.onPressed,
+      this.isShowDivder: true,
+      this.enterType = 0,
+      this.enterContent})
+      : super(key: key);
 
   final GroupInfoModel groupInfoModel;
   final VoidCallback onPressed;
   final bool isShowDivder;
-  final int enterType;  // 0默认  1图片
+  final int enterType; // 0默认  1图片
   final dynamic enterContent;
   @override
   _GroupItemState createState() => _GroupItemState();
@@ -86,7 +85,7 @@ class _GroupItemState extends State<GroupItem> {
       ))
     ];
 
-     Map refMap = Provider.of<RefNameProvider>(context).refMap;
+    Map refMap = Provider.of<RefNameProvider>(context).refMap;
     return InkWell(
       child: Container(
         padding: const EdgeInsets.only(
@@ -160,6 +159,7 @@ class _GroupItemState extends State<GroupItem> {
                                                 0
                                         ? '[${ChatDataMgr().groupUnreadProvider.getUnreadCount(widget.groupInfoModel.lastMsg.sessionId)}${I18n.of(context).article}] '
                                         : "",
+                                    textScaleFactor: 1.0,
                                     style: AppStyles.DescStyle),
                                 Container(
                                     constraints: BoxConstraints(
@@ -189,7 +189,8 @@ class _GroupItemState extends State<GroupItem> {
         ),
       ),
       onTap: () {
-        AppNavigator.pushGroupChatPage(context, widget.groupInfoModel,enterType: widget.enterType,enterContent: widget.enterContent);
+        AppNavigator.pushGroupChatPage(context, widget.groupInfoModel,
+            enterType: widget.enterType, enterContent: widget.enterContent);
       },
     );
   }

lib/home/group_manage_page.dart

@@ -124,6 +124,7 @@ class _GroupManagePageState extends State<GroupManagePage> {
       margin: EdgeInsets.only(top: 10, bottom: 10, left: 15, right: 15),
       child: Text(
         I18n.of(context).group_setting_tips,
+         textScaleFactor: 1.0,
         style: TextStyle(fontSize: 10.5, color: Constants.GreyTextColor),
       ),
     );

lib/home/group_qr_view.dart

@@ -52,6 +52,7 @@ class GroupQrPage extends StatelessWidget {
                 padding: EdgeInsets.all(20),
                 child: Text(
                   dayTips,
+                  textScaleFactor: 1.0,
                   style: TextStyle(fontSize: 9),
                 ),
               )
@@ -88,6 +89,7 @@ class GroupQrPage extends StatelessWidget {
                 color: Color(0xf7FFFFFF),
                 child: Text(
                   I18n.of(context).group_open_verification,
+                  textScaleFactor: 1.0,
                   style: TextStyle(color: Color(0xff696969), fontSize: 20),
                 ),
               ))

lib/home/group_setting.dart

@@ -373,6 +373,7 @@ class GroupSettingState extends State<GroupSetting> {
                         padding: EdgeInsets.fromLTRB(15, 15, 15, 13),
                         child: Text(
                           dialogTips,
+                          textScaleFactor: 1.0,
                           style:
                               TextStyle(fontSize: 12, color: Color(0xff777777)),
                         ),
@@ -386,6 +387,7 @@ class GroupSettingState extends State<GroupSetting> {
                           height: 60,
                           alignment: Alignment.center,
                           child: Text(I18n.of(context).determine,
+                              textScaleFactor: 1.0,
                               style: TextStyle(
                                   fontSize: 18,
                                   color: Constants.ConfrimButtonColor)),
@@ -403,6 +405,7 @@ class GroupSettingState extends State<GroupSetting> {
                           height: 60,
                           alignment: Alignment.center,
                           child: Text(I18n.of(context).cancel,
+                              textScaleFactor: 1.0,
                               style: TextStyle(
                                   fontSize: 18, color: Color(0xff4B4B4B))),
                         ),
@@ -419,6 +422,7 @@ class GroupSettingState extends State<GroupSetting> {
             alignment: Alignment.center,
             child: Text(
               title,
+              textScaleFactor: 1.0,
               style:
                   TextStyle(color: Constants.ConfrimButtonColor, fontSize: 15),
             ),
@@ -461,6 +465,7 @@ class GroupSettingState extends State<GroupSetting> {
                                 padding: EdgeInsets.only(top: 0, left: 4),
                                 child: Text(
                                   I18n.of(context).group_announcement,
+                                  textScaleFactor: 1.0,
                                   style: TextStyle(
                                       color: Colors.black, fontSize: 14),
                                 ),
@@ -473,6 +478,7 @@ class GroupSettingState extends State<GroupSetting> {
                                       padding: EdgeInsets.only(top: 3, left: 4),
                                       child: Text(
                                         widget.groupInfoModel.describe,
+                                        textScaleFactor: 1.0,
                                         maxLines: 1,
                                         overflow: TextOverflow.ellipsis,
                                         style: TextStyle(
@@ -559,6 +565,7 @@ class GroupSettingState extends State<GroupSetting> {
                 alignment: Alignment.center,
                 child: Text(
                   refName,
+                  textScaleFactor: 1.0,
                   textAlign: TextAlign.center,
                   style: TextStyle(fontSize: 11, color: Color(0xff818181)),
                   maxLines: 1,

lib/home/homeMain.dart

@@ -400,6 +400,7 @@ class _HomeMainState extends State<HomeMain> {
 
       NavigationIconView(
           title: _titles[3],
+          isShowdot: true,
           icon: IconData(
             0xe66e,
             fontFamily: 'iconfont',

lib/home/invite_detail_page.dart

@@ -32,7 +32,7 @@ class _InviteDetailPageState extends State<InviteDetailPage> {
         I18n.of(context).invite_detail,
         textScaleFactor: 1.0,
       ),
-       leading: CustomUI.buildCustomLeading(context),
+      leading: CustomUI.buildCustomLeading(context),
       centerTitle: true,
     );
 
@@ -59,6 +59,7 @@ class _InviteDetailPageState extends State<InviteDetailPage> {
       width: Screen.width,
       child: Text(
         widget.opt.nickName,
+        textScaleFactor: 1.0,
         style: TextStyle(fontSize: 15),
       ),
     );
@@ -71,6 +72,7 @@ class _InviteDetailPageState extends State<InviteDetailPage> {
         I18n.of(context)
             .invite_members
             .replaceFirst('/s1', widget.originalList.length.toString()),
+        textScaleFactor: 1.0,
         style: TextStyle(fontSize: 15.5),
       ),
     );
@@ -117,6 +119,7 @@ class _InviteDetailPageState extends State<InviteDetailPage> {
                       borderRadius: BorderRadius.all(Radius.circular(6))),
                   child: Text(
                     I18n.of(context).determine,
+                    textScaleFactor: 1.0,
                     style: TextStyle(color: Colors.white, fontSize: 16),
                   ),
                 ),
@@ -160,6 +163,7 @@ class _InviteDetailPageState extends State<InviteDetailPage> {
             margin: EdgeInsets.only(top: 8.5),
             child: Text(
               username,
+              textScaleFactor: 1.0,
               style: TextStyle(fontSize: 10.3, color: Constants.GreyTextColor),
             ),
           )

lib/home/join_group_confirm.dart

@@ -63,6 +63,7 @@ class _JoinGroupConfirmPageState extends State<JoinGroupConfirmPage> {
       width: Screen.width - 40,
       child: Text(
         widget.groupInfoModel.getGroupName(refMap),
+        textScaleFactor: 1.0,
         maxLines: 2,
         overflow: TextOverflow.ellipsis,
         style: TextStyle(fontSize: 15),
@@ -76,6 +77,7 @@ class _JoinGroupConfirmPageState extends State<JoinGroupConfirmPage> {
       child: Text(
         I18n.of(context).total_members.replaceFirst(
             '/s1', widget.groupInfoModel.getMembersInGroup().length.toString()),
+        textScaleFactor: 1.0,
         style: TextStyle(fontSize: 15.5, color: const Color(0xFF6F6F6F)),
       ),
     );
@@ -120,6 +122,7 @@ class _JoinGroupConfirmPageState extends State<JoinGroupConfirmPage> {
                       isInGroup
                           ? I18n.of(context).joined
                           : I18n.of(context).join_now,
+                      textScaleFactor: 1.0,
                       style: TextStyle(color: Colors.white, fontSize: 16),
                     ),
                   ),

lib/home/last_chat_record_widget.dart

@@ -173,11 +173,11 @@ class _LastChatPageState extends State<LastChatPage> {
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  fixedText('反馈助手',
+                  fixedText(I18n.of(context).feedback_assistant,
                       fontSize: 15, fontWeight: FontWeight.w500),
                   SizedBox(height: 5),
                   Text(
-                    '你好,使用过程中遇到任何问题都可以告诉我哦!',
+                    I18n.of(context).feedback_tips,
                     textScaleFactor: 1.0,
                     style: AppStyles.DescStyle,
                   ),

lib/home/money_detail.dart

@@ -82,8 +82,8 @@ class _ConversationItem extends StatelessWidget {
 
     return InkWell(
       child: Container(
-        padding:
-            const EdgeInsets.only(left: 21, top: 12.5, bottom: 12.5, right: 24.5),
+        padding: const EdgeInsets.only(
+            left: 21, top: 12.5, bottom: 12.5, right: 24.5),
         decoration: BoxDecoration(
             color: Color(AppColors.ConversationItemBgColor),
             border: Border(
@@ -128,6 +128,7 @@ class _ConversationItem extends StatelessWidget {
                 children: <Widget>[
                   Text(
                     '${money > 0 ? '+' : ''}${this.isInCome ? money * 1000 : (money.toString() + I18n.of(context).mask_coin)}',
+                    textScaleFactor: 1.0,
                     style: TextStyle(
                         fontSize: 14,
                         fontWeight: FontWeight.w500,
@@ -139,6 +140,7 @@ class _ConversationItem extends StatelessWidget {
                           padding: EdgeInsets.only(top: 3),
                           child: Text(
                             I18n.of(context).alreay_back,
+                            textScaleFactor: 1.0,
                             style: TextStyle(
                                 fontSize: 12,
                                 fontWeight: FontWeight.normal,

lib/home/my_qr.dart

@@ -31,6 +31,7 @@ class MyQr extends StatelessWidget {
             padding: EdgeInsets.all(20),
             child: Text(
               I18n.of(context).scan_and_add,
+              textScaleFactor: 1.0,
               style: TextStyle(fontSize: 12.5),
             ),
           )
@@ -89,7 +90,7 @@ class MyQr extends StatelessWidget {
               children: <Widget>[
                 Row(
                   children: <Widget>[
-                   Container(
+                    Container(
                         constraints: BoxConstraints(maxWidth: 170),
                         child: Text(name,
                             textScaleFactor: 1.0,

lib/home/new_friends.dart

@@ -77,12 +77,17 @@ class _ContactItem extends StatelessWidget {
         children: <Widget>[
           _avatarIcon,
           SizedBox(width: 10.0),
-          Expanded(child: Text(title)),
+          Expanded(
+              child: Text(
+            title,
+            textScaleFactor: 1.0,
+          )),
           state == 1
               ? Container(
                   padding: EdgeInsets.symmetric(horizontal: 21, vertical: 7),
                   child: Text(
                     I18n.of(context).added,
+                    textScaleFactor: 1.0,
                     style: TextStyle(color: const Color(0xFF8A8B8B)),
                   ),
                 )
@@ -92,6 +97,7 @@ class _ContactItem extends StatelessWidget {
                           EdgeInsets.symmetric(horizontal: 21, vertical: 7),
                       child: Text(
                         I18n.of(context).check,
+                        textScaleFactor: 1.0,
                         style: TextStyle(color: Constants.BlueTextColor),
                       ),
                     )
@@ -100,6 +106,7 @@ class _ContactItem extends StatelessWidget {
                           EdgeInsets.symmetric(horizontal: 21, vertical: 7),
                       child: Text(
                         I18n.of(context).rejected,
+                        textScaleFactor: 1.0,
                         style: TextStyle(color: const Color(0xFF8A8B8B)),
                       ),
                     )),
@@ -117,8 +124,11 @@ class _ContactItem extends StatelessWidget {
             padding: EdgeInsets.only(left: 16.0, right: 16.0),
             color: const Color(AppColors.ContactGroupTitleBgColor),
             alignment: Alignment.centerLeft,
-            child:
-                Text(this.groupTitle, style: AppStyles.GroupTitleItemTextStyle),
+            child: Text(
+              this.groupTitle,
+              style: AppStyles.GroupTitleItemTextStyle,
+              textScaleFactor: 1.0,
+            ),
           ),
           _button,
         ],
@@ -292,8 +302,11 @@ class _NewFriendsPageState extends State<NewFriendsPage> {
                 Radius.circular(Constants.IndexLetterBoxRadius)),
           ),
           child: Center(
-            child:
-                Text(_currentLetter, style: AppStyles.IndexLetterBoxTextStyle),
+            child: Text(
+              _currentLetter,
+              style: AppStyles.IndexLetterBoxTextStyle,
+              textScaleFactor: 1.0,
+            ),
           ),
         ),
       ));
@@ -335,6 +348,14 @@ class _NewFriendsPageState extends State<NewFriendsPage> {
                     decoration: InputDecoration(
                       hintText: I18n.of(context).search,
                       hintStyle: TextStyle(fontSize: 14.5),
+                      contentPadding: EdgeInsets.only(
+                          left: 20,
+                          top: (UserData().language == LanguageType.English ||
+                                  UserData().language ==
+                                      LanguageType.Vietnamese)
+                              ? 3
+                              : 10.5,
+                          bottom: 10.5),
                       prefixIcon: Icon(
                         IconData(
                           0xe664,

lib/home/qr_scanner_view.dart

@@ -83,8 +83,8 @@ class _QrScannerPageState extends State<QrScannerPage>
           },
         ),
         backgroundColor: Colors.black,
-        title:
-            Text(I18n.of(context).scan, style: TextStyle(color: Colors.white)),
+        title: Text(I18n.of(context).scan,
+            textScaleFactor: 1.0, style: TextStyle(color: Colors.white)),
         centerTitle: true,
       ),
       backgroundColor: Colors.black.withOpacity(_animation.value),
@@ -254,6 +254,7 @@ class _QrScannerPageState extends State<QrScannerPage>
           SizedBox(height: 5),
           Text(
             iconName,
+            textScaleFactor: 1.0,
             style: TextStyle(color: Colors.white),
           )
         ])));

lib/home/splash_page.dart

@@ -33,17 +33,25 @@ class SplashPageState extends State<SplashPage> {
   void initState() {
     super.initState();
 
-    list.add(SplashBean('assets/images/img_splash_1.png',I18n.of( Constants.getCurrentContext()).splash_tips1 , I18n.of( Constants.getCurrentContext()).splash_tips_content1,
+    list.add(SplashBean(
+        'assets/images/img_splash_1.png',
+        I18n.of(Constants.getCurrentContext()).splash_tips1,
+        I18n.of(Constants.getCurrentContext()).splash_tips_content1,
         Color(0xffEC527D)));
-    list.add(SplashBean('assets/images/img_splash_2.png', I18n.of( Constants.getCurrentContext()).splash_tips2, I18n.of( Constants.getCurrentContext()).splash_tips_content2,
+    list.add(SplashBean(
+        'assets/images/img_splash_2.png',
+        I18n.of(Constants.getCurrentContext()).splash_tips2,
+        I18n.of(Constants.getCurrentContext()).splash_tips_content2,
         Color(0xffB439EB)));
-    list.add(SplashBean('assets/images/img_splash_3.png', I18n.of( Constants.getCurrentContext()).splash_tips3, I18n.of( Constants.getCurrentContext()).splash_tips_content3,
+    list.add(SplashBean(
+        'assets/images/img_splash_3.png',
+        I18n.of(Constants.getCurrentContext()).splash_tips3,
+        I18n.of(Constants.getCurrentContext()).splash_tips_content3,
         Color(0xff2B79F7)));
 
     pageController = PageController(
       initialPage: 0,
     );
-
   }
 
   @override
@@ -72,24 +80,34 @@ class SplashPageState extends State<SplashPage> {
                     Expanded(child: Container()),
                     currentIndex != 2 ? getIndicator() : Container(),
                     currentIndex == 2
-                        ? InkWell(onTap: ()async{
-                      await SPUtils.saveBool(Constants.Splash_OPENED, true);
-                            Navigator.of(context).push(
-                          MaterialPageRoute(
-                            builder: (_) => IndexPage(),
-                          ),
-                        );
-
-                    },child: Padding(
-                      padding: EdgeInsets.only(bottom: 40),
-                      child: Container(
-                        padding: EdgeInsets.only(left: 16,right: 16,top: 5,bottom: 5),
-                        decoration: BoxDecoration(
-                            border: Border.all(
-                                color: Color(0xff2B79F7), width: 1),borderRadius: BorderRadius.circular(16)),
-                        child: Text(I18n.of(context).splash_go,style: TextStyle(fontSize: 18,color: Color(0xff2B79F7)),),
-                      ),
-                    ),)
+                        ? InkWell(
+                            onTap: () async {
+                              await SPUtils.saveBool(
+                                  Constants.Splash_OPENED, true);
+                              Navigator.of(context).push(
+                                MaterialPageRoute(
+                                  builder: (_) => IndexPage(),
+                                ),
+                              );
+                            },
+                            child: Padding(
+                              padding: EdgeInsets.only(bottom: 40),
+                              child: Container(
+                                padding: EdgeInsets.only(
+                                    left: 16, right: 16, top: 5, bottom: 5),
+                                decoration: BoxDecoration(
+                                    border: Border.all(
+                                        color: Color(0xff2B79F7), width: 1),
+                                    borderRadius: BorderRadius.circular(16)),
+                                child: Text(
+                                  I18n.of(context).splash_go,
+                                  textScaleFactor: 1.0,
+                                  style: TextStyle(
+                                      fontSize: 18, color: Color(0xff2B79F7)),
+                                ),
+                              ),
+                            ),
+                          )
                         : Container(),
                   ],
                 ),
@@ -142,10 +160,14 @@ class SplashPageState extends State<SplashPage> {
           ),
           Text(
             data.title,
+            textScaleFactor: 1.0,
             style: TextStyle(color: data.titleColor, fontSize: 30),
           ),
-          SizedBox(height: 6,),
+          SizedBox(
+            height: 6,
+          ),
           Text(data.content,
+              textScaleFactor: 1.0,
               style: TextStyle(color: Color(0xff999999), fontSize: 15)),
         ],
       ),

lib/main.dart

@@ -115,6 +115,7 @@ void setCustomErrorPage(BuildContext context) {
             margin: EdgeInsets.only(top: ScreenUtil().setHeight(50)),
             child: Text(
               I18n.of(Constants.getCurrentContext()).server_error_tips,
+              textScaleFactor: 1.0,
               style: TextStyle(color: Color(0xFF8F8E8E), fontSize: 18),
             ),
           ),

lib/map/google_map_location_picker.dart

@@ -139,6 +139,7 @@ class LocationPickerState extends State<LocationPicker> {
                 Expanded(
                   child: Text(
                     "${I18n.of(context).finding_place}...",
+                    textScaleFactor: 1.0,
                     style: TextStyle(
                       fontSize: 16,
                     ),

lib/map/map.dart

@@ -168,6 +168,7 @@ class MapPickerState extends State<MapPicker> {
                             children: [
                               Text(
                                 address ?? 'Unnamed place',
+                                 textScaleFactor: 1.0,
                                 style: TextStyle(
                                   fontSize: 18,
                                 ),

lib/map/map_view.dart

@@ -98,7 +98,6 @@ class MapViewState extends State<MapView> {
   }
 
   Future reverseGeocodeLatLng(LatLng latLng) async {
-
     /*
     var placeMarks = await Geolocator()
         .placemarkFromCoordinates(latLng.latitude, latLng.longitude);
@@ -114,7 +113,6 @@ class MapViewState extends State<MapView> {
     });
     */
 
-    
     var response = await http.get(
         "https://maps.googleapis.com/maps/api/geocode/json?latlng=${latLng.latitude},${latLng.longitude}"
         "&key=$googleMapApiKey");
@@ -123,10 +121,9 @@ class MapViewState extends State<MapView> {
       Map<String, dynamic> responseJson = jsonDecode(response.body);
 
       setState(() {
-        address =   responseJson['results'][0]['formatted_address'];
+        address = responseJson['results'][0]['formatted_address'];
       });
     }
-    
   }
 
   Set<Marker> _createMarker() {
@@ -175,6 +172,7 @@ class MapViewState extends State<MapView> {
                         children: [
                           Text(
                             address ?? '',
+                            textScaleFactor: 1.0,
                             style: TextStyle(
                               fontSize: 18,
                             ),
@@ -237,7 +235,7 @@ class MapViewState extends State<MapView> {
                           width: double.infinity,
                           color: Colors.white,
                           child: FlatButton(
-                              child: Text(getMapName(mapList[i])),
+                              child: Text(getMapName(mapList[i]), textScaleFactor: 1.0,),
                               onPressed: () {
                                 print('跳转到其他地图');
                                 ScreenShot.openMapForOth(

lib/models/friends_info.dart

@@ -85,6 +85,7 @@ class FriendsInfo extends StatelessWidget {
               child: Container(
                   child: Text(
             title,
+            textScaleFactor: 1.0,
             overflow: TextOverflow.ellipsis,
           )))
         ],
@@ -166,8 +167,8 @@ class FriendsInfo extends StatelessWidget {
             padding: EdgeInsets.only(left: 16.0, right: 16.0),
             color: const Color(AppColors.ContactGroupTitleBgColor),
             alignment: Alignment.centerLeft,
-            child:
-                Text(this.groupTitle, style: AppStyles.GroupTitleItemTextStyle),
+            child: Text(this.groupTitle,
+                textScaleFactor: 1.0, style: AppStyles.GroupTitleItemTextStyle),
           ),
           _button,
         ],

lib/utils/CustomUI.dart

@@ -256,7 +256,7 @@ class CustomUI {
 
               style: TextStyle(
                   fontSize: 14, color: Constants.BlackTextColor, height: 1.30),
-              //textAlign: TextAlign.center,
+              textAlign: TextAlign.center,
             ));
   }