together_app
/
together_mobile
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

main
htylight 2024-03-18 00:08:25 +08:00
parent a71c77a04f
commit 9cd0576aa7
8 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/router/contact_route.dart
View File

@ -2,27 +2,17 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:together_mobile/models/route_state_model.dart'; import 'package:together_mobile/models/route_state_model.dart';
import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_avatar_screen.dart';
import 'package:together_mobile/screens/group_chat_profile/group_chat_outline_screen/group_chat_outline_screen.dart';
import 'router_key.dart'; import 'router_key.dart';
import 'package:together_mobile/models/contact_model.dart'; import 'package:together_mobile/models/contact_model.dart';
import 'package:together_mobile/models/init_get_it.dart'; import 'package:together_mobile/models/init_get_it.dart';
import 'package:together_mobile/screens/contact/contact_apply_screen/applicant_profile_screen/applicant_profile_screen.dart'; import 'package:together_mobile/screens/contact/contact_apply_screen/applicant_profile_screen/applicant_profile_screen.dart';
import 'package:together_mobile/screens/contact_add/create_group_chat_screen.dart'; import 'package:together_mobile/screens/contact_add/create_group_chat_screen.dart';
import 'package:together_mobile/screens/contact_add/invite_group_chat_member_screen.dart';
import 'package:together_mobile/screens/friend_profile/friend_setting_screen/friend_setting_screen.dart';
import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_intro_screen.dart';
import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_name_screen.dart';
import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_remark_screen.dart';
import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_my_remark_screen.dart';
import 'package:together_mobile/screens/contact/contact_apply_screen/apply_list_screen.dart'; import 'package:together_mobile/screens/contact/contact_apply_screen/apply_list_screen.dart';
import 'package:together_mobile/screens/contact/contact_screen.dart'; import 'package:together_mobile/screens/contact/contact_screen.dart';
import 'package:together_mobile/screens/contact/manage_group_screen/manage_group_screen.dart'; import 'package:together_mobile/screens/contact/manage_group_screen/manage_group_screen.dart';
import 'package:together_mobile/screens/contact_add/add_friend_screen/add_friend_screen.dart'; import 'package:together_mobile/screens/contact_add/add_friend_screen/add_friend_screen.dart';
import 'package:together_mobile/screens/contact_add/search_new_contact_screen.dart'; import 'package:together_mobile/screens/contact_add/search_new_contact_screen.dart';
import 'package:together_mobile/screens/friend_profile/friend_profile_screen.dart';
import 'package:together_mobile/screens/group_chat_profile/group_chat_profile_screen.dart';
final contactRoute = GoRoute( final contactRoute = GoRoute(
path: '/contact', path: '/contact',

3
lib/router/more_route.dart
View File

@ -3,9 +3,6 @@ import 'package:go_router/go_router.dart';
import 'package:together_mobile/models/init_get_it.dart'; import 'package:together_mobile/models/init_get_it.dart';
import 'package:together_mobile/models/route_state_model.dart'; import 'package:together_mobile/models/route_state_model.dart';
import 'package:together_mobile/screens/more/more_screen.dart'; import 'package:together_mobile/screens/more/more_screen.dart';
import 'package:together_mobile/screens/my_profile/my_profile_screen.dart';
import 'package:together_mobile/screens/my_profile/change_profile_screen/change_account_screen.dart';
import 'package:together_mobile/screens/my_profile/change_profile_screen/change_my_avatar_screen.dart';
import 'package:together_mobile/screens/more/setting_screen/setting_screen.dart'; import 'package:together_mobile/screens/more/setting_screen/setting_screen.dart';
import 'router_key.dart'; import 'router_key.dart';

5
lib/router/router.dart
View File

@ -1,17 +1,12 @@
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:together_mobile/database/hive_database.dart';
import 'package:together_mobile/router/profile_router.dart'; import 'package:together_mobile/router/profile_router.dart';
import 'router_key.dart'; import 'router_key.dart';
import 'chat_route.dart'; import 'chat_route.dart';
import 'contact_route.dart'; import 'contact_route.dart';
import 'more_route.dart'; import 'more_route.dart';
import 'package:together_mobile/models/init_get_it.dart';
import 'package:together_mobile/models/token_model.dart';
import 'package:together_mobile/models/user_model.dart';
import 'package:together_mobile/request/signup_signin.dart';
import 'package:together_mobile/screens/signin_signup/signup_screen.dart'; import 'package:together_mobile/screens/signin_signup/signup_screen.dart';
import 'package:together_mobile/screens/signin_signup/signin_screen.dart'; import 'package:together_mobile/screens/signin_signup/signin_screen.dart';
import 'package:together_mobile/screens/welcome/welcome_screen.dart'; import 'package:together_mobile/screens/welcome/welcome_screen.dart';

14
lib/screens/contact_add/create_group_chat_screen.dart
View File

@ -98,15 +98,11 @@ class _CreateGroupChatScreenState extends State<CreateGroupChatScreen> {
width: 70, width: 70,
child: Column( child: Column(
children: [ children: [
avatar.isEmpty CircleAvatar(
? const CircleAvatar( backgroundImage: CachedNetworkImageProvider(
backgroundImage: '$userAvatarsUrl/$avatar',
AssetImage('assets/images/user_2.png'), ),
) ),
: CircleAvatar(
backgroundImage: CachedNetworkImageProvider(
'$userAvatarsUrl/$avatar'),
),
Text( Text(
name, name,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,

4
lib/screens/contact_add/invite_group_chat_member_screen.dart
View File

@ -18,6 +18,7 @@ class InviteGroupChatMemberScreen extends StatefulWidget {
super.key, super.key,
required this.groupChatId, required this.groupChatId,
}); });
final String groupChatId; final String groupChatId;
@override @override
@ -39,7 +40,8 @@ class _InviteGroupChatMemberScreenState
.members; .members;
var myId = getIt.get<UserAccount>().id; var myId = getIt.get<UserAccount>().id;
_friendIds.removeWhere( _friendIds.removeWhere(
(element) => memberIds.contains(element) || element == myId); (element) => memberIds.contains(element) || element == myId,
);
} }
@override @override

18
lib/screens/friend_profile/friend_profile_screen.dart
View File

@ -9,7 +9,6 @@ import 'package:together_mobile/common/constants.dart';
import 'package:together_mobile/models/contact_model.dart'; import 'package:together_mobile/models/contact_model.dart';
import 'package:together_mobile/models/init_get_it.dart'; import 'package:together_mobile/models/init_get_it.dart';
import 'package:together_mobile/models/route_state_model.dart'; import 'package:together_mobile/models/route_state_model.dart';
import 'package:together_mobile/models/user_model.dart';
import 'package:together_mobile/request/server.dart'; import 'package:together_mobile/request/server.dart';
class FriendProfileScreen extends StatefulWidget { class FriendProfileScreen extends StatefulWidget {
@ -189,7 +188,10 @@ class _FriendProfileScreenState extends State<FriendProfileScreen> {
), ),
OutlinedButton( OutlinedButton(
onPressed: () { onPressed: () {
context.pushNamed('EditProfile'); context.pushNamed(
'FriendSetting',
queryParameters: {'friendId': widget.friendId},
);
}, },
style: OutlinedButton.styleFrom( style: OutlinedButton.styleFrom(
fixedSize: const Size(100, 45), fixedSize: const Size(100, 45),
@ -205,12 +207,12 @@ class _FriendProfileScreenState extends State<FriendProfileScreen> {
), ),
FilledButton( FilledButton(
onPressed: () { onPressed: () {
context.pushNamed( context.pushNamed(
'Message', 'Message',
queryParameters: { queryParameters: {
'type': '0', 'type': '0',
'friendId': getIt.get<UserAccount>().id 'friendId': widget.friendId,
}, },
); );
}, },
style: FilledButton.styleFrom( style: FilledButton.styleFrom(

11
lib/screens/friend_profile/friend_setting_screen/friend_setting_screen.dart
View File

@ -66,7 +66,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
child: ExpansionPanelList( child: ExpansionPanelList(
expansionCallback: (panelIndex, isExpanded) { expansionCallback: (panelIndex, isExpanded) {
setState(() { setState(() {
_expand[panelIndex] = !isExpanded; _expand[panelIndex] = isExpanded;
}); });
}, },
children: [ children: [
@ -86,7 +86,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
getIt getIt
.get<Contact>() .get<Contact>()
.friends[widget.friendId]! .friends[widget.friendId]!
.friendRemark, .friendRemark ?? '',
style: const TextStyle( style: const TextStyle(
fontSize: 16, fontSize: 16,
color: kUnActivatedColor, color: kUnActivatedColor,
@ -157,6 +157,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
} }
}, },
style: FilledButton.styleFrom( style: FilledButton.styleFrom(
padding: EdgeInsets.zero,
maximumSize: const Size(60, 30), maximumSize: const Size(60, 30),
minimumSize: const Size(60, 30), minimumSize: const Size(60, 30),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
@ -180,6 +181,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
), ),
isExpanded: _expand[0], isExpanded: _expand[0],
), ),
// 设置分组 // 设置分组
ExpansionPanel( ExpansionPanel(
headerBuilder: (BuildContext context, bool isExpanded) { headerBuilder: (BuildContext context, bool isExpanded) {
@ -265,14 +267,11 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
_isGroupChanged = false; _isGroupChanged = false;
}); });
// getIt.get<Contact>().changeFriendGroup(
// widget.friendId,
// _group,
// );
getIt.get<Contact>().init(res['data']); getIt.get<Contact>().init(res['data']);
} }
}, },
style: FilledButton.styleFrom( style: FilledButton.styleFrom(
padding: EdgeInsets.zero,
maximumSize: const Size(60, 30), maximumSize: const Size(60, 30),
minimumSize: const Size(60, 30), minimumSize: const Size(60, 30),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(

6
lib/screens/my_profile/my_profile_screen.dart
View File

@ -6,6 +6,7 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:together_mobile/common/constants.dart'; import 'package:together_mobile/common/constants.dart';
import 'package:together_mobile/database/hive_database.dart';
import 'package:together_mobile/models/init_get_it.dart'; import 'package:together_mobile/models/init_get_it.dart';
import 'package:together_mobile/models/route_state_model.dart'; import 'package:together_mobile/models/route_state_model.dart';
import 'package:together_mobile/models/user_model.dart'; import 'package:together_mobile/models/user_model.dart';
@ -174,12 +175,13 @@ class _MyProfileScreenState extends State<MyProfileScreen> {
), ),
), ),
FilledButton( FilledButton(
onPressed: () { onPressed: () async {
await HiveDatabase.openMessageBox(getIt.get<UserAccount>().id);
context.pushNamed( context.pushNamed(
'Message', 'Message',
queryParameters: { queryParameters: {
'type': '0', 'type': '0',
'friendId': getIt.get<UserAccount>().id 'friendId': getIt.get<UserAccount>().id,
}, },
); );
}, },