Merge remote-tracking branch 'master/master'

# Conflicts:
#	i18n/en-US.json
#	i18n/ja-JP.json
#	i18n/ko-KR.json
#	i18n/vi-VN.json
#	i18n/zh-CN.json
#	i18n/zh-HK.json
#	lib/generated/i18n.dart

i18n/en-US.json

@@ -1220,5 +1220,7 @@
     "translation_more_desc": "更多描述",
     "feedback_assistant": "反馈小助手",
     "feedback_tips":"有什么问题都可以反馈给我哦",
-    "forward":"Forward"
+    "man_retranslate":"人工重译",
+    "robot_retranslate":"机器重译",
+    "see_original":"查看原文"
 }

i18n/ja-JP.json

@@ -1220,5 +1220,7 @@
     "translation_more_desc": "更多描述",
     "feedback_assistant": "反馈小助手",
     "feedback_tips":"有什么问题都可以反馈给我哦",
-    "forward":"转发"
+    "man_retranslate":"人工重译",
+    "robot_retranslate":"机器重译",
+    "see_original":"查看原文"
 }

i18n/ko-KR.json

@@ -1220,5 +1220,7 @@
     "translation_more_desc": "更多描述",
     "feedback_assistant": "反馈小助手",
     "feedback_tips": "有什么问题都可以反馈给我哦",
-    "forward":"转发"
+    "man_retranslate":"人工重译",
+    "robot_retranslate":"机器重译",
+    "see_original":"查看原文"
 }

i18n/vi-VN.json

@@ -1220,5 +1220,7 @@
     "translation_more_desc": "更多描述",
     "feedback_assistant": "反馈小助手",
     "feedback_tips":"有什么问题都可以反馈给我哦",
-    "forward":"转发"
+    "man_retranslate":"人工重译",
+    "robot_retranslate":"机器重译",
+    "see_original":"查看原文"
 }

i18n/zh-CN.json

@@ -1220,6 +1220,7 @@
   "max_file": "文件大于/s1M",
   "feedback_assistant":"反馈小助手",
   "feedback_tips":"有什么问题都可以反馈给我哦",
-  "forward":"转发"
-
+  "man_retranslate":"人工重译",
+  "robot_retranslate":"机器重译",
+  "see_original":"查看原文"
 }

i18n/zh-HK.json

@@ -1220,5 +1220,7 @@
     "translation_more_desc": "更多描述",
     "feedback_assistant": "反饋小助手",
     "feedback_tips":"有什麼問題都可以反饋給我哦",
-    "forward":"转发"
+    "man_retranslate":"人工重譯",
+    "robot_retranslate":"機器重譯",
+    "see_original":"查看原文"
 }

lib/chat/ChatPageItem.dart

@@ -830,14 +830,14 @@ class _ChatPageItemState extends State<ChatPageItem>
 
     if (transTag == 1) {
       //机器翻译中
-      userTranslateWidget = _translateItemWidget(0xe670, '人工重译', null);
+      userTranslateWidget = _translateItemWidget(0xe670, I18n.of(context).man_retranslate, null); 
 
       machineTranslateWidget =
           _translateItemWidget(0xe671, I18n.of(context).robotTranslate, null);
     } else if (transTag == 2) {
       //人工翻译中
-      userTranslateWidget = _translateItemWidget(0xe670, '人工翻译中', null);
-      machineTranslateWidget = _translateItemWidget(0xe671, '机器重译', () {
+      userTranslateWidget = _translateItemWidget(0xe670, I18n.of(context).ManTranslate, null);
+      machineTranslateWidget = _translateItemWidget(0xe671, I18n.of(context).robot_retranslate, () {
         setState(() {
           curTextType += 1;
           curTextType %= textList.length;
@@ -847,7 +847,7 @@ class _ChatPageItemState extends State<ChatPageItem>
       //机器翻译完成
       userTranslateWidget = _translateItemWidget(
           0xe670,
-          '人工重译',
+          I18n.of(context).man_retranslate,
           isTranslating
               ? null
               : () async {
@@ -889,7 +889,7 @@ class _ChatPageItemState extends State<ChatPageItem>
                     });
                   }
                 });
-      machineTranslateWidget = _translateItemWidget(0xe671, '机器重译', () {
+      machineTranslateWidget = _translateItemWidget(0xe671, I18n.of(context).robot_retranslate, () {
         setState(() {
           curTextType += 1;
           curTextType %= textList.length;
@@ -944,7 +944,7 @@ class _ChatPageItemState extends State<ChatPageItem>
                   ))
                 ],
               )));
-      machineTranslateWidget = _translateItemWidget(0xe675, '查看原文', () {
+      machineTranslateWidget = _translateItemWidget(0xe675, I18n.of(context).see_original, () {
         setState(() {
           curTextType = textList.length - 1;
         });

lib/chat/gift_msg_item.dart

@@ -30,7 +30,10 @@ class GiftMsgItem extends StatelessWidget {
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
-          fixedText(str, fontSize: 14, color: Colors.white),
+          Container(
+            child: fixedText(str, fontSize: 14, color: Colors.white),
+            constraints: BoxConstraints(maxWidth: Screen.width - 175),
+          ),
           SizedBox(width: 10),
           Image.asset(imgPath, height: 25, width: 25, fit: BoxFit.contain),
         ],

lib/chat/group_chat_item.dart

@@ -820,16 +820,18 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
 
     if (transTag == 1) {
       //机器翻译中
-      userTranslateWidget = _translateItemWidget(0xe670, '人工重译', null);
+      userTranslateWidget =
+          _translateItemWidget(0xe670, I18n.of(context).man_retranslate, null);
 
       machineTranslateWidget =
           _translateItemWidget(0xe671, I18n.of(context).robotTranslate, null);
     } else if (transTag == 2) {
       //人工翻译中
-      userTranslateWidget = _translateItemWidget(0xe670, '人工翻译中', null);
+      userTranslateWidget =
+          _translateItemWidget(0xe670, I18n.of(context).ManTranslate, null);
       machineTranslateWidget = _translateItemWidget(
           0xe671,
-          '机器重译',
+          I18n.of(context).robot_retranslate,
           textList.length <= 1
               ? null
               : () {
@@ -842,7 +844,7 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
       //机器翻译完成
       userTranslateWidget = _translateItemWidget(
           0xe670,
-          '人工重译',
+          I18n.of(context).man_retranslate,
           isTranslating
               ? null
               : () async {
@@ -886,7 +888,7 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
                 });
       machineTranslateWidget = _translateItemWidget(
           0xe671,
-          '机器重译',
+          I18n.of(context).robot_retranslate,
           textList.length <= 1
               ? null
               : () {
@@ -944,7 +946,8 @@ class _GroupChatPageItemState extends State<GroupChatPageItem>
                   ))
                 ],
               )));
-      machineTranslateWidget = _translateItemWidget(0xe675, '查看原文', () {
+      machineTranslateWidget =
+          _translateItemWidget(0xe675, I18n.of(context).see_original, () {
         setState(() {
           curTextType = textList.length - 1;
         });

lib/generated/i18n.dart

@@ -2475,8 +2475,12 @@ class I18n implements WidgetsLocalizations {
   String get feedback_assistant => "反馈小助手";
   /// "有什么问题都可以反馈给我哦"
   String get feedback_tips => "有什么问题都可以反馈给我哦";
-  /// "Forward"
-  String get forward => "Forward";
+  /// "人工重译"
+  String get man_retranslate => "人工重译";
+  /// "机器重译"
+  String get robot_retranslate => "机器重译";
+  /// "查看原文"
+  String get see_original => "查看原文";
 }
 
 class _I18n_en_US extends I18n {
@@ -6152,9 +6156,15 @@ class _I18n_vi_VN extends I18n {
   /// "有什么问题都可以反馈给我哦"
   @override
   String get feedback_tips => "有什么问题都可以反馈给我哦";
-  /// "转发"
+  /// "人工重译"
   @override
-  String get forward => "转发";
+  String get man_retranslate => "人工重译";
+  /// "机器重译"
+  @override
+  String get robot_retranslate => "机器重译";
+  /// "查看原文"
+  @override
+  String get see_original => "查看原文";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -9826,9 +9836,15 @@ class _I18n_zh_HK extends I18n {
   /// "有什麼問題都可以反饋給我哦"
   @override
   String get feedback_tips => "有什麼問題都可以反饋給我哦";
-  /// "转发"
+  /// "人工重譯"
+  @override
+  String get man_retranslate => "人工重譯";
+  /// "機器重譯"
   @override
-  String get forward => "转发";
+  String get robot_retranslate => "機器重譯";
+  /// "查看原文"
+  @override
+  String get see_original => "查看原文";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -13500,9 +13516,15 @@ class _I18n_zh_CN extends _I18n_zh_HK {
   /// "有什么问题都可以反馈给我哦"
   @override
   String get feedback_tips => "有什么问题都可以反馈给我哦";
-  /// "转发"
+  /// "人工重译"
+  @override
+  String get man_retranslate => "人工重译";
+  /// "机器重译"
   @override
-  String get forward => "转发";
+  String get robot_retranslate => "机器重译";
+  /// "查看原文"
+  @override
+  String get see_original => "查看原文";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -17174,9 +17196,15 @@ class _I18n_ko_KR extends I18n {
   /// "有什么问题都可以反馈给我哦"
   @override
   String get feedback_tips => "有什么问题都可以反馈给我哦";
-  /// "转发"
+  /// "人工重译"
+  @override
+  String get man_retranslate => "人工重译";
+  /// "机器重译"
+  @override
+  String get robot_retranslate => "机器重译";
+  /// "查看原文"
   @override
-  String get forward => "转发";
+  String get see_original => "查看原文";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;
@@ -20848,9 +20876,15 @@ class _I18n_ja_JP extends I18n {
   /// "有什么问题都可以反馈给我哦"
   @override
   String get feedback_tips => "有什么问题都可以反馈给我哦";
-  /// "转发"
+  /// "人工重译"
+  @override
+  String get man_retranslate => "人工重译";
+  /// "机器重译"
+  @override
+  String get robot_retranslate => "机器重译";
+  /// "查看原文"
   @override
-  String get forward => "转发";
+  String get see_original => "查看原文";
 
   @override
   TextDirection get textDirection => TextDirection.ltr;

lib/home/ProfilePage.dart

@@ -1713,8 +1713,8 @@ class _ProfilePageState extends State<ProfilePage>
     //   return;
     // }
 
-    //自己是女性，且未认证,提示去认证
-    if (!UserData().isMan() && !UserData().basicInfo.isAttestation) {
+    //自己是女性，且未认证,提示去认证(好友除外)
+    if (!UserData().isMan() && !UserData().basicInfo.isAttestation && !FriendListMgr().isMyFriend(userInfo.userId)){
       CustomUI.buildNotTrue(context);
       return;
     }
@@ -1879,10 +1879,10 @@ class _ProfilePageState extends State<ProfilePage>
 
     heightStr = (userInfo.height == 0.0 || userInfo.height == null)
         ? I18n.of(context).not_show
-        : '${userInfo.height}M';
+        : '${userInfo.height.toInt()}CM';
     weightStr = (userInfo.weight == 0.0 || userInfo.weight == null)
         ? I18n.of(context).not_show
-        : '${userInfo.weight}KG';
+        : '${userInfo.weight.toInt()}KG';
 
     List<Widget> basicList = [
       userInfo.height != null && userInfo.height != 0