hy/yumi-flutter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hy:1e7261927e0801792c79874e9601c86600bf579f
Branches Tags
hy:main
hy:codex/perf-revival-start
hy:bug-fix
hy:develop
hy:feature
hy:test
..
compare: hy:44e10028b9b7c105b41cdcad6bd1c67530613ab4
Branches Tags
hy:main
hy:codex/perf-revival-start
hy:bug-fix
hy:develop
hy:feature
hy:test

No commits in common. "1e7261927e0801792c79874e9601c86600bf579f" and "44e10028b9b7c105b41cdcad6bd1c67530613ab4" have entirely different histories.
1e7261927e ... 44e10028b9

5 changed files with 60 additions and 129 deletions
Show Stats Expand all files Collapse all files

4
lib/modules/chat/message_chat_page.dart
View File

@ -20,7 +20,6 @@ import 'package:yumi/app/constants/sc_emoji_datas.dart';
import 'package:yumi/shared/tools/sc_date_utils.dart';
import 'package:yumi/shared/tools/sc_loading_manager.dart';
import 'package:yumi/shared/tools/sc_message_utils.dart';
import 'package:yumi/shared/tools/sc_user_id_utils.dart';
import 'package:yumi/shared/data_sources/sources/repositories/sc_user_repository_impl.dart';
import 'package:yumi/shared/business_logic/models/res/login_res.dart';
import 'package:yumi/shared/business_logic/models/res/sc_vip_res.dart';
@ -364,8 +363,7 @@ class _SCMessageChatPageState extends State<SCMessageChatPage> {
_isSystemConversation ||
SCGlobalConfig.isSystemUserId(userId) ||
userId == null ||
userId.isEmpty ||
!scLooksLikeBackendUserId(userId)) {
userId.isEmpty) {
return;
}
SCLoadingManager.show();

84
lib/services/audio/rtm_manager.dart
View File

@ -17,7 +17,6 @@ import 'package:yumi/shared/tools/sc_room_utils.dart';
import 'package:yumi/shared/tools/sc_cp_relation_broadcast_assets.dart';
import 'package:yumi/shared/tools/sc_cp_relation_notice_utils.dart';
import 'package:yumi/shared/tools/sc_room_rocket_reward_popup_ack.dart';
import 'package:yumi/shared/tools/sc_user_id_utils.dart';
import 'package:yumi/shared/data_sources/sources/local/floating_screen_manager.dart';
import 'package:yumi/shared/data_sources/sources/local/data_persistence.dart';
import 'package:yumi/shared/data_sources/sources/local/user_manager.dart';
@ -568,18 +567,6 @@ class RealTimeMessagingManager extends ChangeNotifier {
Future<bool> startConversation(V2TimConversation conversation) async {
assert(conversation != null);
final userId = conversation.userID?.trim() ?? "";
if (conversation.type == ConversationType.V2TIM_C2C &&
!_isSystemConversation(conversation) &&
conversation.conversationID != "customer" &&
conversation.conversationID != "article" &&
!scLooksLikeBackendUserId(userId)) {
_cpInviteLog(
'skip startConversation reason=invalid_user_id '
'userId=$userId conversationID=${conversation.conversationID}',
);
return false;
}
int eTime = DateTime.now().millisecondsSinceEpoch;
if (eTime - sTime > 5000) {
sTime = eTime;
@ -745,15 +732,6 @@ class RealTimeMessagingManager extends ChangeNotifier {
}
return false;
}
final cpData = _decodeCpSystemMessageData(message);
if (_isCpRelationInviteNoticeData(cpData) &&
!scLooksLikeBackendUserId(peerId)) {
_cpInviteLog(
'skip C2C conversation sync reason=invalid_peer '
'peerId=$peerId msgId=${message.msgID} sender=${message.sender}',
);
return false;
}
if ((message.userID?.trim() ?? "").isEmpty) {
message.userID = peerId;
}
@ -792,6 +770,7 @@ class RealTimeMessagingManager extends ChangeNotifier {
(conversation.unreadCount ?? 0) + (shouldIncrementUnread ? 1 : 0);
conversationMap[conversationId] = conversation;
final cpData = _decodeCpSystemMessageData(message);
if (cpData != null) {
_cpInviteLog(
'sync C2C conversation conversationId=$conversationId '
@ -871,15 +850,15 @@ class RealTimeMessagingManager extends ChangeNotifier {
data: data,
);
if (isSender) {
if (scLooksLikeBackendUserId(userId) && !currentIds.contains(userId)) {
if (userId.isNotEmpty && !currentIds.contains(userId)) {
return userId;
}
return _cpInviteReceiverIdFromMessageData(data);
}
if (scLooksLikeBackendUserId(sender) && !currentIds.contains(sender)) {
if (sender.isNotEmpty && !currentIds.contains(sender)) {
return sender;
}
return _cpInviteInviterIdFromMessageData(data);
return _cpInviteInviterIdFromMessageData(data, invite);
}
String _c2cConversationDisplayName(
@ -1636,8 +1615,7 @@ class RealTimeMessagingManager extends ChangeNotifier {
SCSystemInvitMessageRes invite,
) {
final userId =
_firstCpInviteBackendUserId([invite.actualAccount, invite.account]) ??
"";
_firstCpInviteValue([invite.actualAccount, invite.account]) ?? "";
return SocialChatUserProfile(
id: userId,
account:
@ -1680,7 +1658,7 @@ class RealTimeMessagingManager extends ChangeNotifier {
for (final profile in profiles) {
for (final value in [profile?.id, profile?.account]) {
final text = value?.trim() ?? "";
if (scLooksLikeBackendUserId(text) && !result.contains(text)) {
if (text.isNotEmpty && !result.contains(text)) {
result.add(text);
}
}
@ -1699,9 +1677,12 @@ class RealTimeMessagingManager extends ChangeNotifier {
);
}
String _cpInviteInviterIdFromMessageData(Map<String, dynamic> data) {
String _cpInviteInviterIdFromMessageData(
Map<String, dynamic> data,
SCSystemInvitMessageRes invite,
) {
final content = _cpInviteContentMap(data);
return _firstCpInviteBackendUserId([
return _firstCpInviteValue([
data["userId"]?.toString(),
data["inviterUserId"]?.toString(),
data["inviterId"]?.toString(),
@ -1716,13 +1697,26 @@ class RealTimeMessagingManager extends ChangeNotifier {
content["senderId"]?.toString(),
content["fromUserId"]?.toString(),
content["applyUserId"]?.toString(),
data["actualAccount"]?.toString(),
data["applyActualAccount"]?.toString(),
data["applyUserActualAccount"]?.toString(),
data["inviterActualAccount"]?.toString(),
data["account"]?.toString(),
content["applyActualAccount"]?.toString(),
content["applyUserActualAccount"]?.toString(),
content["inviterActualAccount"]?.toString(),
content["applyUserAccount"]?.toString(),
invite.actualAccount,
invite.account,
content["actualAccount"]?.toString(),
content["account"]?.toString(),
]) ??
"";
}
String _cpInviteReceiverIdFromMessageData(Map<String, dynamic> data) {
final content = _cpInviteContentMap(data);
return _firstCpInviteBackendUserId([
return _firstCpInviteValue([
data["acceptUserId"]?.toString(),
data["receiverId"]?.toString(),
data["receiverUserId"]?.toString(),
@ -1733,6 +1727,10 @@ class RealTimeMessagingManager extends ChangeNotifier {
content["receiverUserId"]?.toString(),
content["targetUserId"]?.toString(),
content["toUserId"]?.toString(),
data["acceptActualAccount"]?.toString(),
data["receiverActualAccount"]?.toString(),
content["acceptActualAccount"]?.toString(),
content["receiverActualAccount"]?.toString(),
]) ??
"";
}
@ -2022,30 +2020,6 @@ class RealTimeMessagingManager extends ChangeNotifier {
return null;
}
String? _firstCpInviteBackendUserId(Iterable<String?> values) {
return scFirstBackendUserId(values);
}
bool _isCpRelationInviteNoticeData(Map<String, dynamic>? data) {
if (data == null) {
return false;
}
final content = _cpInviteContentMap(data);
final noticeType =
_firstCpInviteValue([
data["noticeType"]?.toString(),
data["type"]?.toString(),
content["noticeType"]?.toString(),
content["type"]?.toString(),
])?.toUpperCase() ??
"";
if (noticeType == SCSysytemMessageType.CP_BUILD.name) {
return true;
}
return _cpInviteApplyIdFromData(data).isNotEmpty &&
_cpInviteResultFromMessageData(data) != null;
}
void _cpInviteLog(String message) {
debugPrint('[CP][Invite] $message');
}

17
lib/shared/tools/sc_user_id_utils.dart
View File

@ -1,17 +0,0 @@
bool scLooksLikeBackendUserId(String? value) {
final text = value?.trim() ?? "";
if (text.isEmpty) {
return false;
}
return RegExp(r'^\d{15,}$').hasMatch(text);
}
String? scFirstBackendUserId(Iterable<String?> values) {
for (final value in values) {
final text = value?.trim() ?? "";
if (scLooksLikeBackendUserId(text)) {
return text;
}
}
return null;
}

64
lib/ui_kit/widgets/msg/message_conversation_list_page.dart
View File

@ -22,7 +22,6 @@ import 'package:yumi/shared/data_sources/models/enum/sc_sysytem_message_type.dar
import 'package:yumi/shared/tools/sc_date_utils.dart';
import 'package:yumi/shared/data_sources/sources/repositories/sc_user_repository_impl.dart';
import 'package:yumi/shared/business_logic/models/res/login_res.dart';
import 'package:yumi/shared/tools/sc_user_id_utils.dart';
import 'package:yumi/services/audio/rtm_manager.dart';
import '../../../modules/chat/chat_route.dart';
@ -341,9 +340,6 @@ class _MessageConversationListPageState
continue;
}
final userId = conversation.userID!.trim();
if (!scLooksLikeBackendUserId(userId)) {
continue;
}
if (_conversationUserCache.containsKey(userId) ||
_loadingConversationUserIds.contains(userId)) {
continue;
@ -371,7 +367,6 @@ class _MessageConversationListPageState
final userId = conversation.userID?.trim() ?? "";
return conversation.type == ConversationType.V2TIM_C2C &&
userId.isNotEmpty &&
scLooksLikeBackendUserId(userId) &&
!SCGlobalConfig.isSystemConversationId(conversation.conversationID) &&
!SCGlobalConfig.isSystemUserId(userId) &&
conversation.conversationID != "customer" &&
@ -416,11 +411,18 @@ class _ConversationItemState extends State<ConversationItem> {
_effectiveUserId.isNotEmpty;
String get _effectiveUserId {
return scFirstBackendUserId([
conversation.userID,
final cpInviteProfile = _cpInvitePeerProfileFromLastMessage();
final cpInvitePeerId =
_firstCpInviteValue([
_cpInvitePeerUserIdFromLastMessage(),
cpInviteProfile?.id,
cpInviteProfile?.account,
]) ??
"";
if (cpInvitePeerId.isNotEmpty) {
return cpInvitePeerId;
}
return conversation.userID?.trim() ?? "";
}
String get _displayAvatar {
@ -526,9 +528,6 @@ class _ConversationItemState extends State<ConversationItem> {
}*/
return GestureDetector(
onTap: () async {
if (_isC2CConversation && _effectiveUserId.isEmpty) {
return;
}
final routeConversation = _routeConversation();
if (_isC2CConversation && (routeConversation.userID?.isEmpty ?? true)) {
return;
@ -769,17 +768,19 @@ class _ConversationItemState extends State<ConversationItem> {
final messageUserId =
_firstCpInviteValue([message?.userID, conversation.userID]) ?? "";
if (isCurrentInviter) {
return _firstCpInviteBackendUserId([
return _firstCpInviteValue([
peerProfile?.id,
currentIds.contains(messageUserId) ? null : messageUserId,
_cpInviteReceiverIdFromData(data),
peerProfile?.account,
]) ??
"";
}
return _firstCpInviteBackendUserId([
return _firstCpInviteValue([
currentIds.contains(sender) ? null : sender,
peerProfile?.id,
_cpInviteInviterIdFromData(data),
peerProfile?.account,
]) ??
"";
}
@ -868,7 +869,7 @@ class _ConversationItemState extends State<ConversationItem> {
"profile",
]);
return _cpInviteProfileOrNull(
id: _firstCpInviteBackendUserId([
id: _firstCpInviteValue([
nested["id"]?.toString(),
nested["userId"]?.toString(),
data["userId"]?.toString(),
@ -885,21 +886,20 @@ class _ConversationItemState extends State<ConversationItem> {
content["senderId"]?.toString(),
content["fromUserId"]?.toString(),
content["applyUserId"]?.toString(),
nested["actualAccount"]?.toString(),
data["actualAccount"]?.toString(),
data["applyActualAccount"]?.toString(),
data["applyUserActualAccount"]?.toString(),
data["inviterActualAccount"]?.toString(),
content["applyActualAccount"]?.toString(),
content["applyUserActualAccount"]?.toString(),
content["inviterActualAccount"]?.toString(),
]),
account: _firstCpInviteValue([
nested["account"]?.toString(),
data["account"]?.toString(),
data["applyUserAccount"]?.toString(),
content["applyUserAccount"]?.toString(),
nested["actualAccount"]?.toString(),
data["actualAccount"]?.toString(),
data["applyActualAccount"]?.toString(),
data["applyUserActualAccount"]?.toString(),
data["inviterActualAccount"]?.toString(),
content["actualAccount"]?.toString(),
content["applyActualAccount"]?.toString(),
content["applyUserActualAccount"]?.toString(),
content["inviterActualAccount"]?.toString(),
]),
nickname: _firstCpInviteValue([
nested["userNickname"]?.toString(),
@ -943,7 +943,7 @@ class _ConversationItemState extends State<ConversationItem> {
"targetUserProfile",
]);
return _cpInviteProfileOrNull(
id: _firstCpInviteBackendUserId([
id: _firstCpInviteValue([
nested["id"]?.toString(),
nested["userId"]?.toString(),
data["acceptUserId"]?.toString(),
@ -956,6 +956,11 @@ class _ConversationItemState extends State<ConversationItem> {
content["receiverUserId"]?.toString(),
content["targetUserId"]?.toString(),
content["toUserId"]?.toString(),
nested["actualAccount"]?.toString(),
data["acceptActualAccount"]?.toString(),
data["receiverActualAccount"]?.toString(),
content["acceptActualAccount"]?.toString(),
content["receiverActualAccount"]?.toString(),
]),
account: _firstCpInviteValue([
nested["account"]?.toString(),
@ -963,11 +968,6 @@ class _ConversationItemState extends State<ConversationItem> {
data["receiverAccount"]?.toString(),
content["acceptAccount"]?.toString(),
content["receiverAccount"]?.toString(),
nested["actualAccount"]?.toString(),
data["acceptActualAccount"]?.toString(),
data["receiverActualAccount"]?.toString(),
content["acceptActualAccount"]?.toString(),
content["receiverActualAccount"]?.toString(),
]),
nickname: _firstCpInviteValue([
nested["userNickname"]?.toString(),
@ -1016,12 +1016,12 @@ class _ConversationItemState extends State<ConversationItem> {
String _cpInviteInviterIdFromData(Map<String, dynamic> data) {
final profile = _cpInviteInviterProfileFromData(data);
return _firstCpInviteBackendUserId([profile?.id]) ?? "";
return _firstCpInviteValue([profile?.id, profile?.account]) ?? "";
}
String _cpInviteReceiverIdFromData(Map<String, dynamic> data) {
final profile = _cpInviteReceiverProfileFromData(data);
return _firstCpInviteBackendUserId([profile?.id]) ?? "";
return _firstCpInviteValue([profile?.id, profile?.account]) ?? "";
}
Set<String> _cpInviteInviterIdentityValues(Map<String, dynamic> data) {
@ -1161,8 +1161,4 @@ class _ConversationItemState extends State<ConversationItem> {
}
return null;
}
String? _firstCpInviteBackendUserId(Iterable<String?> values) {
return scFirstBackendUserId(values);
}
}

20
test/sc_user_id_utils_test.dart
View File

@ -1,20 +0,0 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:yumi/shared/tools/sc_user_id_utils.dart';
void main() {
test('backend user id detector rejects display accounts', () {
expect(scLooksLikeBackendUserId('323456'), isFalse);
expect(scLooksLikeBackendUserId('223456'), isFalse);
expect(scLooksLikeBackendUserId('4569421795454615555'), isTrue);
});
test('first backend user id skips CP invite display accounts', () {
final userId = scFirstBackendUserId([
'323456',
'223456',
'4569421795454615555',
]);
expect(userId, '4569421795454615555');
});
}