From ee1e44342595bd8806b2e564279c4f52c8e035aa Mon Sep 17 00:00:00 2001 From: ZCM <772112648@qq.com> Date: Wed, 18 Mar 2020 19:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/chat/ChatPageItem.dart | 13 +++++++-- lib/home/ProfilePage.dart | 6 ++-- lib/home/global_search.dart | 19 +++++++----- lib/home/group_setting.dart | 29 ++++++++++--------- lib/home/homeMain.dart | 1 - .../realtimehelper/real_time_helper_page.dart | 18 ------------ .../translation_butler_page.dart | 14 --------- .../realtimehelper/travel_butler_page.dart | 17 ----------- lib/utils/blacklist_mgr.dart | 1 - lib/utils/msgHandler.dart | 2 +- 10 files changed, 44 insertions(+), 76 deletions(-) diff --git a/lib/chat/ChatPageItem.dart b/lib/chat/ChatPageItem.dart index 3f20504..4c50e9a 100644 --- a/lib/chat/ChatPageItem.dart +++ b/lib/chat/ChatPageItem.dart @@ -597,6 +597,11 @@ class _ChatPageItemState extends State child: hasHeadImg ? CachedNetworkImage( imageUrl: UserData().basicInfo.headimgurl, + placeholder: (context, url) => Image.asset( + Constants.DefaultHeadImgUrl, + width: 40, + height: 40, + ), width: 40, height: 40, ) @@ -624,12 +629,11 @@ class _ChatPageItemState extends State print('发送引用的消息'); MessageMgr().emit('Reply Select Message', widget.msg); }); - actionsFunc.add(() { + actionsFunc.add(() { print('转发消息'); AppNavigator.pushForwardPage(context, widget.msg); }); - if (widget.msg.msgType == ChatType.TextChatType.value) { actions.insert(0, I18n.of(context).copy); actionsFunc.insert(0, () { @@ -1279,6 +1283,11 @@ class _ChatPageItemState extends State child: hasHeadImg ? CachedNetworkImage( imageUrl: friendInfo.headimgurl, + placeholder: (context, url) => Image.asset( + Constants.DefaultHeadImgUrl, + width: 40, + height: 40, + ), width: 40, height: 40, ) diff --git a/lib/home/ProfilePage.dart b/lib/home/ProfilePage.dart index 768d699..3329a89 100644 --- a/lib/home/ProfilePage.dart +++ b/lib/home/ProfilePage.dart @@ -1518,7 +1518,9 @@ class _ProfilePageState extends State return; } - if (UserData().addFdDistanceSwitch > 0 && userInfo.distince > 200) { + if (widget.addMode != 3 && + UserData().addFdDistanceSwitch > 0 && + userInfo.distince > 200) { showToast(I18n.of(context).distance_long); return; } @@ -2466,7 +2468,7 @@ class _ProfilePageState extends State ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: widget.addMode == 1 + children: widget.addMode == 1 || widget.addMode == 3 ? [_inviteFdBtn()] : (widget.addMode == 2 ? [_dealInvite()] diff --git a/lib/home/global_search.dart b/lib/home/global_search.dart index 7c27c9a..69ca75e 100644 --- a/lib/home/global_search.dart +++ b/lib/home/global_search.dart @@ -101,7 +101,7 @@ class _GlobalSearchPageState extends State { Navigator.of(context).push( new MaterialPageRoute( builder: (context) { - return ProfilePage(userId: userId, addMode: 1); + return ProfilePage(userId: userId, addMode: 3); }, ), ); @@ -112,10 +112,10 @@ class _GlobalSearchPageState extends State { height: 55.1, width: Screen.width, child: Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, children: [ Container( - margin: EdgeInsets.only(right: 13), + margin: EdgeInsets.only(left: 20,right: 13), width: Constants.ContactAvatarSize, height: Constants.ContactAvatarSize, decoration: BoxDecoration( @@ -132,10 +132,15 @@ class _GlobalSearchPageState extends State { color: Colors.white, ), ), - Text('${I18n.of(context).search_phone}: ', - style: TextStyle(fontSize: 16.23)), - Text(searchStr, - style: TextStyle(fontSize: 16.23, color: Color(0xFF008AFF))) + Container( + child: Text('${I18n.of(context).search_phone}: ', + style: TextStyle(fontSize: 16.23)), + ), + Container( + margin: EdgeInsets.only(top: 5), + child: Text(searchStr, + style: TextStyle( + fontSize: 16.23, color: Color(0xFF008AFF)))) ], ), color: Colors.white)); diff --git a/lib/home/group_setting.dart b/lib/home/group_setting.dart index 34ee06f..7fe56ce 100644 --- a/lib/home/group_setting.dart +++ b/lib/home/group_setting.dart @@ -80,7 +80,7 @@ class GroupSettingState extends State { //清空聊天记录 clearRecord() { - //清楚最后一条数据 + //清楚最后一条数据 widget.groupInfoModel.lastMsg = null; //清空聊天数据 @@ -542,24 +542,27 @@ class GroupSettingState extends State { borderRadius: BorderRadius.all(Radius.circular(8.0)), child: CachedNetworkImage( imageUrl: member.avtar, - placeholder: CustomUI.buildImgLoding, + placeholder: (context, url) => Image.asset( + Constants.DefaultHeadImgUrl, + width: size - 30, + height: size - 30, + ), width: size - 30, height: size - 30, )), SizedBox( height: 5, ), - - SizedBox( - width:size - 30, - child: Text( - refName, - style: TextStyle(fontSize: 11, color: Color(0xff818181)), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), + Container( + width: size - 30, + alignment: Alignment.center, + child: Text( + refName, + style: TextStyle(fontSize: 11, color: Color(0xff818181)), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), ) - ], ), width: size, @@ -569,7 +572,7 @@ class GroupSettingState extends State { onTap: () { if (members[index].memberId != UserData().basicInfo.userId) { AppNavigator.pushProfileInfoPage(context, members[index].memberId, - fromWhere: 2,addMode: 1); + fromWhere: 2, addMode: 1); } }, )); diff --git a/lib/home/homeMain.dart b/lib/home/homeMain.dart index 39fe803..2219c7c 100644 --- a/lib/home/homeMain.dart +++ b/lib/home/homeMain.dart @@ -3,7 +3,6 @@ import 'package:chat/data/UserData.dart'; import 'package:chat/data/constants.dart'; import 'package:chat/generated/i18n.dart'; import 'package:chat/home/find_page.dart'; -import 'package:chat/home/group_chat_page.dart'; import 'package:chat/home/realtimehelper/real_time_helper_page.dart'; import 'package:chat/home/unread_dot_widget.dart'; import 'package:chat/models/UserInfo.dart'; diff --git a/lib/home/realtimehelper/real_time_helper_page.dart b/lib/home/realtimehelper/real_time_helper_page.dart index 0ff6d41..a7ba1ad 100644 --- a/lib/home/realtimehelper/real_time_helper_page.dart +++ b/lib/home/realtimehelper/real_time_helper_page.dart @@ -1,30 +1,12 @@ -import 'package:cached_network_image/cached_network_image.dart'; -import 'package:chat/data/UserData.dart'; -import 'package:chat/data/chat_data_mgr.dart'; -import 'package:chat/data/group_data_mgr.dart'; -import 'package:chat/home/add_friend.dart'; -import 'package:chat/home/group_announcement.dart'; -import 'package:chat/home/group_manage_page.dart'; import 'package:chat/home/realtimehelper/translation_butler_page.dart'; import 'package:chat/home/realtimehelper/travel_butler_page.dart'; import 'package:chat/models/group_info_model.dart'; -import 'package:chat/models/ref_name_provider.dart'; -import 'package:chat/utils/MessageMgr.dart'; -import 'package:chat/utils/group_member_model.dart'; -import 'package:chat/utils/msgHandler.dart'; -import 'package:chat/utils/screen.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:oktoast/oktoast.dart'; -import 'package:provider/provider.dart'; import '../../data/constants.dart'; import '../../generated/i18n.dart'; import '../../r.dart'; -import '../../utils/CustomUI.dart'; -import '../../utils/FullWithButton.dart'; -import '../../utils/app_navigator.dart'; -import '../create_group_view.dart'; class RealTimeHelperPage extends StatefulWidget { final GroupInfoModel groupInfoModel; diff --git a/lib/home/realtimehelper/translation_butler_page.dart b/lib/home/realtimehelper/translation_butler_page.dart index 8a006aa..579e440 100644 --- a/lib/home/realtimehelper/translation_butler_page.dart +++ b/lib/home/realtimehelper/translation_butler_page.dart @@ -1,17 +1,6 @@ -import 'package:cached_network_image/cached_network_image.dart'; import 'package:chat/data/UserData.dart'; -import 'package:chat/data/chat_data_mgr.dart'; -import 'package:chat/data/group_data_mgr.dart'; -import 'package:chat/home/add_friend.dart'; -import 'package:chat/home/group_announcement.dart'; -import 'package:chat/home/group_manage_page.dart'; import 'package:chat/models/group_info_model.dart'; import 'package:chat/models/money_change.dart'; -import 'package:chat/models/ref_name_provider.dart'; -import 'package:chat/utils/MessageMgr.dart'; -import 'package:chat/utils/group_member_model.dart'; -import 'package:chat/utils/msgHandler.dart'; -import 'package:chat/utils/screen.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:oktoast/oktoast.dart'; @@ -21,9 +10,6 @@ import '../../data/constants.dart'; import '../../generated/i18n.dart'; import '../../r.dart'; import '../../utils/CustomUI.dart'; -import '../../utils/FullWithButton.dart'; -import '../../utils/app_navigator.dart'; -import '../create_group_view.dart'; import 'package:chat/utils/PopUpMenu.dart' as myPop; class TranslationButlerPage extends StatefulWidget { diff --git a/lib/home/realtimehelper/travel_butler_page.dart b/lib/home/realtimehelper/travel_butler_page.dart index 5220eed..21245cb 100644 --- a/lib/home/realtimehelper/travel_butler_page.dart +++ b/lib/home/realtimehelper/travel_butler_page.dart @@ -1,35 +1,18 @@ import 'dart:math'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:chat/data/UserData.dart'; -import 'package:chat/data/chat_data_mgr.dart'; -import 'package:chat/data/group_data_mgr.dart'; -import 'package:chat/home/add_friend.dart'; -import 'package:chat/home/group_announcement.dart'; -import 'package:chat/home/group_manage_page.dart'; import 'package:chat/map/google_map_location_picker.dart'; import 'package:chat/map/location_result.dart'; import 'package:chat/models/group_info_model.dart'; -import 'package:chat/models/ref_name_provider.dart'; -import 'package:chat/utils/MessageMgr.dart'; -import 'package:chat/utils/group_member_model.dart'; -import 'package:chat/utils/msgHandler.dart'; -import 'package:chat/utils/screen.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:geolocator/geolocator.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:oktoast/oktoast.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:provider/provider.dart'; import '../../data/constants.dart'; import '../../generated/i18n.dart'; import '../../utils/CustomUI.dart'; -import '../../utils/FullWithButton.dart'; -import '../../utils/app_navigator.dart'; -import '../create_group_view.dart'; class TravelButlerPage extends StatefulWidget { final GroupInfoModel groupInfoModel; diff --git a/lib/utils/blacklist_mgr.dart b/lib/utils/blacklist_mgr.dart index f53dcc6..bbb0a21 100644 --- a/lib/utils/blacklist_mgr.dart +++ b/lib/utils/blacklist_mgr.dart @@ -1,7 +1,6 @@ import 'package:chat/data/constants.dart'; import 'package:chat/generated/i18n.dart'; -import 'package:chat/utils/LoadingDialog.dart'; import 'package:oktoast/oktoast.dart'; diff --git a/lib/utils/msgHandler.dart b/lib/utils/msgHandler.dart index 1064124..622c367 100644 --- a/lib/utils/msgHandler.dart +++ b/lib/utils/msgHandler.dart @@ -34,7 +34,7 @@ class MsgHandler { static bool isAudioConnect = false; - static BuildContext context; + static BuildContext context = Constants.getCurrentContext(); static List sendCache = [];