From e972171164718bbc1d5d7db72678b7bb77fb5b46 Mon Sep 17 00:00:00 2001 From: ZCM <772112648@qq.com> Date: Tue, 17 Mar 2020 18:31:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=201.=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=95=8C=E9=9D=A2=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=8F=8C=E5=9B=BE=E6=A0=87=E9=97=AE=E9=A2=98=E3=80=82=202.?= =?UTF-8?q?=E8=BF=9E=E9=BA=A6=EF=BC=8C=E7=A7=81=E8=81=8A=E6=8B=89=E9=BB=91?= =?UTF-8?q?=E5=8F=8A=E6=97=B6=E6=80=A7=E9=97=AE=E9=A2=98=203.=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=B5=84=E6=96=99=E5=90=8D=E5=AD=97=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=A1=86=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/en-US.json | 4 +- i18n/ja-JP.json | 4 +- i18n/ko-KR.json | 4 +- i18n/vi-VN.json | 4 +- i18n/zh-CN.json | 4 +- i18n/zh-HK.json | 4 +- lib/chat/ChatPage.dart | 9 +-- lib/chat/util_keyboard.dart | 61 ++++++++---------- lib/generated/i18n.dart | 85 ++++++++++++++++++++++--- lib/home/ProfilePage.dart | 16 ++--- lib/home/SearchPage.dart | 4 +- lib/map/google_map_location_picker.dart | 3 +- lib/map/search_input.dart | 3 +- lib/utils/blacklist_mgr.dart | 18 ++++++ 14 files changed, 153 insertions(+), 70 deletions(-) diff --git a/i18n/en-US.json b/i18n/en-US.json index 8916cb1..580e122 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -1160,5 +1160,7 @@ "not_add_Myself":"你不能添加自己", "you_are_blaklisted":"对方已拉黑了你", "confrim_recovery":"确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)", - "send_to": "發送到" + "send_to": "發送到", + "search_plach":"搜索位置", + "finding_place":"查找位置" } \ No newline at end of file diff --git a/i18n/ja-JP.json b/i18n/ja-JP.json index 4365a7e..c99e44f 100644 --- a/i18n/ja-JP.json +++ b/i18n/ja-JP.json @@ -1160,5 +1160,7 @@ "not_add_Myself":"你不能添加自己", "you_are_blaklisted":"对方已拉黑了你", "confrim_recovery":"确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)", - "send_to": "發送到" + "send_to": "發送到", + "search_plach":"搜索位置", + "finding_place":"查找位置" } \ No newline at end of file diff --git a/i18n/ko-KR.json b/i18n/ko-KR.json index e52acc3..dbc040f 100644 --- a/i18n/ko-KR.json +++ b/i18n/ko-KR.json @@ -1159,5 +1159,7 @@ "not_have_user":"用户不存在", "you_are_blaklisted":"对方已拉黑了你", "confrim_recovery":"确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)", - "send_to": "發送到" + "send_to": "發送到", + "search_plach":"搜索位置", + "finding_place":"查找位置" } \ No newline at end of file diff --git a/i18n/vi-VN.json b/i18n/vi-VN.json index 5d007ed..5925cf4 100644 --- a/i18n/vi-VN.json +++ b/i18n/vi-VN.json @@ -1160,5 +1160,7 @@ "not_add_Myself":"你不能添加自己", "you_are_blaklisted":"对方已拉黑了你", "confrim_recovery":"确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)", - "send_to": "發送到" + "send_to": "發送到", + "search_plach":"搜索位置", + "finding_place":"查找位置" } \ No newline at end of file diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index da6c991..51586a8 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -1160,5 +1160,7 @@ "not_add_Myself":"你不能添加自己", "you_are_blaklisted":"对方已拉黑了你", "confrim_recovery":"确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)", - "send_to": "发送到" + "send_to": "发送到", + "search_plach":"搜索位置", + "finding_place":"查找位置" } \ No newline at end of file diff --git a/i18n/zh-HK.json b/i18n/zh-HK.json index c1e6be8..68f8967 100644 --- a/i18n/zh-HK.json +++ b/i18n/zh-HK.json @@ -1160,5 +1160,7 @@ "not_add_Myself":"你不能添加自己", "you_are_blaklisted":"對方已拉黑了你", "confrim_recovery":"確定恢復已被焚毀的照片嗎?\n(已經看過的用戶可以再看一次)", - "send_to": "發送到" + "send_to": "發送到", + "search_plach":"搜索位置", + "finding_place":"查找位置" } \ No newline at end of file diff --git a/lib/chat/ChatPage.dart b/lib/chat/ChatPage.dart index f52bf34..05aa0b2 100644 --- a/lib/chat/ChatPage.dart +++ b/lib/chat/ChatPage.dart @@ -36,6 +36,7 @@ import 'ChatPageItem.dart'; import 'input_bar.dart'; import 'package:chat/utils/PopUpMenu.dart' as myPop; import 'package:chat/models/money_change.dart'; + class ChatPage extends StatefulWidget { final int friendId; final int enterType; // 0默认 1图片 @@ -479,13 +480,7 @@ class _ChatPageState extends State { sendMsg(MsgModel msg) { print('对方是否拉黑你 ${friendInfo.isBlackened}'); - if (BlacklistMgr.isBlaklistMe(friendInfo.userId)) { - showToast(I18n.of(context).you_are_blaklisted); - return; - } - - if (BlacklistMgr.isInMyblaklist(friendInfo.userId)) { - showToast(I18n.of(context).reject_message); + if (BlacklistMgr.isBlack(friendInfo.userId)) { return; } diff --git a/lib/chat/util_keyboard.dart b/lib/chat/util_keyboard.dart index ef4e6c7..662e728 100644 --- a/lib/chat/util_keyboard.dart +++ b/lib/chat/util_keyboard.dart @@ -32,7 +32,6 @@ import 'package:file_picker/file_picker.dart'; import '../r.dart'; - class UtilKeyboard extends StatelessWidget { final double keyboardHeight; final Function sendMsg; @@ -163,13 +162,8 @@ class UtilKeyboard extends StatelessWidget { showToast(I18n.of(context).cantt_voice); return; } - if (BlacklistMgr.isBlaklistMe(info.userId)) { - showToast(I18n.of(context).you_are_blaklisted); - return; - } - if (BlacklistMgr.isInMyblaklist(info.userId)) { - showToast(I18n.of(context).reject_message); + if (BlacklistMgr.isBlack(info.userId)) { return; } @@ -303,39 +297,38 @@ class UtilKeyboard extends StatelessWidget { int fileSize = file.lengthSync(); print('选择的文件 ${file.path} 大小 $fileSize'); - if (fileSize > 33 * 1024 * 1024) { - showToast('文件大于33M'); - return; - } - - int friendId = 0; - if (!isGroup) { - friendId = Provider.of(context); - } + if (fileSize > 33 * 1024 * 1024) { + showToast('文件大于33M'); + return; + } - var fileName = file.path.split('/').last; - print('fileName $fileName'); + int friendId = 0; + if (!isGroup) { + friendId = Provider.of(context); + } - var ext = ''; - var extList = fileName.split('.'); - if (extList.length > 1) { - ext = extList.last; - } - print('ext $ext'); + var fileName = file.path.split('/').last; + print('fileName $fileName'); - var fileMsg = FileChat.create(); - fileMsg.type = ext; - fileMsg.size = fileSize; - fileMsg.name = fileName; + var ext = ''; + var extList = fileName.split('.'); + if (extList.length > 1) { + ext = extList.last; + } + print('ext $ext'); - var msg = MsgHandler.createSendMsg(ChatType.FileChatType, fileMsg.writeToBuffer(), - friendId: friendId, - localFile: file.path, - channelType: - isGroup ? ChatChannelType.Group : ChatChannelType.Session); + var fileMsg = FileChat.create(); + fileMsg.type = ext; + fileMsg.size = fileSize; + fileMsg.name = fileName; - sendMsg(msg); + var msg = MsgHandler.createSendMsg( + ChatType.FileChatType, fileMsg.writeToBuffer(), + friendId: friendId, + localFile: file.path, + channelType: isGroup ? ChatChannelType.Group : ChatChannelType.Session); + sendMsg(msg); } void _sendVideo(BuildContext context) async { diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index deadd30..19590e1 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -2357,6 +2357,10 @@ class I18n implements WidgetsLocalizations { String get confrim_recovery => "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)"; /// "發送到" String get send_to => "發送到"; + /// "搜索位置" + String get search_plach => "搜索位置"; + /// "查找位置" + String get finding_place => "查找位置"; } class _I18n_en_US extends I18n { @@ -5846,8 +5850,7 @@ class _I18n_vi_VN extends I18n { /// "你不能添加自己" @override String get not_add_Myself => "你不能添加自己"; - - /// "对方已拉黑了你" + /// "对方已拉黑了你" @override String get you_are_blaklisted => "对方已拉黑了你"; /// "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)" @@ -5856,6 +5859,12 @@ class _I18n_vi_VN extends I18n { /// "發送到" @override String get send_to => "發送到"; + /// "搜索位置" + @override + String get search_plach => "搜索位置"; + /// "查找位置" + @override + String get finding_place => "查找位置"; @override TextDirection get textDirection => TextDirection.ltr; @@ -8840,9 +8849,9 @@ class _I18n_zh_HK extends I18n { /// "今日簽到可領取/s1積分" @override String get today_score => "今日簽到可領取/s1積分"; - /// "1、每日簽到可領取積分，累計天數越多積分越高\n2、積分可兌換H幣，兌換將消耗對應積分，請慎重兌換\n3、每月最後一天將重置簽到，清零積分，請記得及時兌換" + /// "1、每日簽到可領取積分，累計天數越多積分越高。\n2、積分可兌換H幣，兌換將消耗對應積分，請慎重兌換。\n3、每月最後一天將重置簽到，清零積分，請記得及時兌換。" @override - String get sign_tips => "1、每日簽到可領取積分，累計天數越多積分越高\n2、積分可兌換H幣，兌換將消耗對應積分，請慎重兌換\n3、每月最後一天將重置簽到，清零積分，請記得及時兌換"; + String get sign_tips => "1、每日簽到可領取積分，累計天數越多積分越高。\n2、積分可兌換H幣，兌換將消耗對應積分，請慎重兌換。\n3、每月最後一天將重置簽到，清零積分，請記得及時兌換。"; /// "簽到" @override String get sign_in => "簽到"; @@ -9341,6 +9350,21 @@ class _I18n_zh_HK extends I18n { /// "你不能添加自己" @override String get not_add_Myself => "你不能添加自己"; + /// "對方已拉黑了你" + @override + String get you_are_blaklisted => "對方已拉黑了你"; + /// "確定恢復已被焚毀的照片嗎?\n(已經看過的用戶可以再看一次)" + @override + String get confrim_recovery => "確定恢復已被焚毀的照片嗎?\n(已經看過的用戶可以再看一次)"; + /// "發送到" + @override + String get send_to => "發送到"; + /// "搜索位置" + @override + String get search_plach => "搜索位置"; + /// "查找位置" + @override + String get finding_place => "查找位置"; @override TextDirection get textDirection => TextDirection.ltr; @@ -12325,9 +12349,9 @@ class _I18n_zh_CN extends _I18n_zh_HK { /// "今日签到可领取/s1积分" @override String get today_score => "今日签到可领取/s1积分"; - /// "1、每日签到可领取积分，累计天数越多积分越高\n2、积分可兑换H币，兑换将消耗对应积分，请慎重兑换\n3、每月最后一天将重置签到，清零积分，请记得及时兑换" + /// "1、每日签到可领取积分，累计天数越多积分越高。\n2、积分可兑换H币，兑换将消耗对应积分，请慎重兑换。\n3、每月最后一天将重置签到，清零积分，请记得及时兑换。" @override - String get sign_tips => "1、每日签到可领取积分，累计天数越多积分越高\n2、积分可兑换H币，兑换将消耗对应积分，请慎重兑换\n3、每月最后一天将重置签到，清零积分，请记得及时兑换"; + String get sign_tips => "1、每日签到可领取积分，累计天数越多积分越高。\n2、积分可兑换H币，兑换将消耗对应积分，请慎重兑换。\n3、每月最后一天将重置签到，清零积分，请记得及时兑换。"; /// "签到" @override String get sign_in => "签到"; @@ -12826,6 +12850,21 @@ class _I18n_zh_CN extends _I18n_zh_HK { /// "你不能添加自己" @override String get not_add_Myself => "你不能添加自己"; + /// "对方已拉黑了你" + @override + String get you_are_blaklisted => "对方已拉黑了你"; + /// "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)" + @override + String get confrim_recovery => "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)"; + /// "发送到" + @override + String get send_to => "发送到"; + /// "搜索位置" + @override + String get search_plach => "搜索位置"; + /// "查找位置" + @override + String get finding_place => "查找位置"; @override TextDirection get textDirection => TextDirection.ltr; @@ -16308,6 +16347,21 @@ class _I18n_ko_KR extends I18n { /// "用户不存在" @override String get not_have_user => "用户不存在"; + /// "对方已拉黑了你" + @override + String get you_are_blaklisted => "对方已拉黑了你"; + /// "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)" + @override + String get confrim_recovery => "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)"; + /// "發送到" + @override + String get send_to => "發送到"; + /// "搜索位置" + @override + String get search_plach => "搜索位置"; + /// "查找位置" + @override + String get finding_place => "查找位置"; @override TextDirection get textDirection => TextDirection.ltr; @@ -19292,9 +19346,9 @@ class _I18n_ja_JP extends I18n { /// "本日サインして/s1ポイントが受け入れる" @override String get today_score => "本日サインして/s1ポイントが受け入れる"; - /// "1.毎日サインしてポイントが受け入れます、累積日数が多ければ多いほどポイントが高くなります\n2.ポイントはH幤に交換できます、交換はポイントを消費しますので慎重に交換してください\n3.サインは毎月の最終日にリセットされ、ポイントもクリアされます。時間内に交換することを忘れないでください " + /// "1.毎日サインしてポイントが受け入れます、累積日数が多ければ多いほどポイントが高くなります.\n2.ポイントはH幤に交換できます、交換はポイントを消費しますので慎重に交換してください.\n3.サインは毎月の最終日にリセットされ、ポイントもクリアされます。時間内に交換することを忘れないでください." @override - String get sign_tips => "1.毎日サインしてポイントが受け入れます、累積日数が多ければ多いほどポイントが高くなります\n2.ポイントはH幤に交換できます、交換はポイントを消費しますので慎重に交換してください\n3.サインは毎月の最終日にリセットされ、ポイントもクリアされます。時間内に交換することを忘れないでください "; + String get sign_tips => "1.毎日サインしてポイントが受け入れます、累積日数が多ければ多いほどポイントが高くなります.\n2.ポイントはH幤に交換できます、交換はポイントを消費しますので慎重に交換してください.\n3.サインは毎月の最終日にリセットされ、ポイントもクリアされます。時間内に交換することを忘れないでください."; /// "サイン" @override String get sign_in => "サイン"; @@ -19793,6 +19847,21 @@ class _I18n_ja_JP extends I18n { /// "你不能添加自己" @override String get not_add_Myself => "你不能添加自己"; + /// "对方已拉黑了你" + @override + String get you_are_blaklisted => "对方已拉黑了你"; + /// "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)" + @override + String get confrim_recovery => "确定恢复已被焚毁的照片吗?\n(已经看过的用户可以再看一次)"; + /// "發送到" + @override + String get send_to => "發送到"; + /// "搜索位置" + @override + String get search_plach => "搜索位置"; + /// "查找位置" + @override + String get finding_place => "查找位置"; @override TextDirection get textDirection => TextDirection.ltr; diff --git a/lib/home/ProfilePage.dart b/lib/home/ProfilePage.dart index a7ff2c4..768d699 100644 --- a/lib/home/ProfilePage.dart +++ b/lib/home/ProfilePage.dart @@ -1090,9 +1090,8 @@ class _ProfilePageState extends State top: 20, child: InkWell( onTap: () async { - if (!userInfo.isLike) { - HttpUtil().setLove(userInfo.userId, () { + HttpUtil().setLove(userInfo.userId, () { MessageMgr().emit('refresh_love_list', {'UserId': userInfo.userId, 'flag': 0}); setState(() { @@ -2090,7 +2089,8 @@ class _ProfilePageState extends State description: I18n.of(context).recovery_photo, showDivider: false, showRightIcon: false, - onPressed: () async {CustomUI.buildOneConfirm( + onPressed: () async { + CustomUI.buildOneConfirm( context, I18n.of(context).confrim_recovery, I18n.of(context).determine, () async { @@ -2320,7 +2320,7 @@ class _ProfilePageState extends State ), onTap: isblack ? () async { - HttpUtil().cancleBlackUser( + HttpUtil().cancleBlackUser( userInfo.userId, () { Navigator.of(context).pop(); isblack = false; @@ -2529,13 +2529,7 @@ class _ProfilePageState extends State showToast(I18n.of(context).cantt_voice); return; } - if (BlacklistMgr.isBlaklistMe(userInfo.userId)) { - showToast(I18n.of(context).you_are_blaklisted); - return; - } - - if (BlacklistMgr.isInMyblaklist(userInfo.userId)) { - showToast(I18n.of(context).reject_message); + if (BlacklistMgr.isBlack(userInfo.userId)) { return; } //对方关闭陌生人消息，则提示 diff --git a/lib/home/SearchPage.dart b/lib/home/SearchPage.dart index 85e39d6..ee37cd3 100644 --- a/lib/home/SearchPage.dart +++ b/lib/home/SearchPage.dart @@ -175,8 +175,8 @@ class _SearchPageState extends State { child: Stack( children: [ SmartRefresher( - enablePullDown: list.length > 0, - enablePullUp: true, + enablePullDown: !isLoading, + enablePullUp: !isLoading, header: MaterialClassicHeader(), footer: CustomUI.buildLoadingFooter(), controller: _refreshController, diff --git a/lib/map/google_map_location_picker.dart b/lib/map/google_map_location_picker.dart index c2740a2..4d93602 100644 --- a/lib/map/google_map_location_picker.dart +++ b/lib/map/google_map_location_picker.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:convert'; +import 'package:chat/generated/i18n.dart'; import 'package:chat/map/auto_comp_iete_item.dart'; import 'package:chat/map/location_provider.dart'; import 'package:chat/map/location_result.dart'; @@ -137,7 +138,7 @@ class LocationPickerState extends State { ), Expanded( child: Text( - "Finding place...", + "${I18n.of(context).finding_place}...", style: TextStyle( fontSize: 16, ), diff --git a/lib/map/search_input.dart b/lib/map/search_input.dart index 91a04c0..ee5a9e6 100644 --- a/lib/map/search_input.dart +++ b/lib/map/search_input.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:chat/generated/i18n.dart'; import 'package:flutter/material.dart'; /// Custom Search input field, showing the search and clear icons. @@ -80,7 +81,7 @@ class SearchInputState extends State { keyboardAppearance: Brightness.light, style: TextStyle(textBaseline: TextBaseline.alphabetic), decoration: InputDecoration( - hintText: 'Search place', + hintText: I18n.of(context).search_plach, border: InputBorder.none, ), controller: editController, diff --git a/lib/utils/blacklist_mgr.dart b/lib/utils/blacklist_mgr.dart index f92e9a2..5294116 100644 --- a/lib/utils/blacklist_mgr.dart +++ b/lib/utils/blacklist_mgr.dart @@ -1,3 +1,7 @@ +import 'package:chat/generated/i18n.dart'; +import 'package:chat/utils/LoadingDialog.dart'; + +import 'package:oktoast/oktoast.dart'; class BlacklistMgr { //我拉黑的用户id @@ -30,4 +34,18 @@ class BlacklistMgr { static bool isBlaklistMe(int userId) { return blacklistMeSet.contains(userId); } + + //判断是否被别人拉黑或者拉黑别人 + static bool isBlack(int userId) { + if (isBlaklistMe(userId)) { + showToast(I18n.of(LoadingManage.context).you_are_blaklisted); + return true; + } + + if (BlacklistMgr.isInMyblaklist(userId)) { + showToast(I18n.of(LoadingManage.context).reject_message); + return true; + } + return false; + } } From 636b60da59479bb4f35daffc7498d82b40ba47fe Mon Sep 17 00:00:00 2001 From: ZCM <772112648@qq.com> Date: Wed, 18 Mar 2020 14:51:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A8=E5=B1=80context?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/chat/ChatPage.dart | 27 --------------------------- lib/data/constants.dart | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/lib/chat/ChatPage.dart b/lib/chat/ChatPage.dart index 05aa0b2..9ae1bde 100644 --- a/lib/chat/ChatPage.dart +++ b/lib/chat/ChatPage.dart @@ -366,33 +366,6 @@ class _ChatPageState extends State { child: Scaffold( resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFE2E9F1), - // appBar: PreferredSize( - // preferredSize: Size.fromHeight(58), - // child: Container( - // color: AppBarTheme.of(context).color, - // child: SafeArea( - // child: Container( - // height: 56, - // child: Row(children: [ - // SizedBox(width: 10), - // CustomUI.buildCustomLeading(context), - // Text( - // Provider.of(context) - // .getRefName(friendInfo.userId, - // friendInfo.nickName), - // textScaleFactor: 1.0, - // style: TextStyle( - // textBaseline: TextBaseline.ideographic, - // color: Constants.BlackTextColor, - // fontSize: 16.47), - // ), - // Expanded( - // child: Row( - // mainAxisAlignment: - // MainAxisAlignment.end, - // children: actions)) - // ]), - // )))), appBar: AppBar( title: Text( '${Provider.of(context).getRefName(friendInfo.userId, friendInfo.nickName)}', diff --git a/lib/data/constants.dart b/lib/data/constants.dart index 8cc703a..c8d6515 100644 --- a/lib/data/constants.dart +++ b/lib/data/constants.dart @@ -117,7 +117,7 @@ class Constants { static NavigatorState getCurrentState() => navigatorKey.currentState; /// 获取当前的context - static BuildContext getCurrentContext() => navigatorKey.currentContext; + static BuildContext getCurrentContext() => navigatorKey.currentState.overlay.context;//navigatorKey.currentContext; ///在pubspec.yaml中修改版本号 static String versionName = '1.0.0';