fix: show long badges on room user card

This commit is contained in:
zhx 2026-05-18 11:13:36 +08:00
parent 9f012fdb27
commit d009f9cc01
4 changed files with 54 additions and 3 deletions

View File

@ -40,10 +40,19 @@ class SCUserBadgeRes {
} }
List<WearBadge> get displayBadges { List<WearBadge> get displayBadges {
return shortDisplayBadges;
}
List<WearBadge> get shortDisplayBadges {
final source = shortBadges.isNotEmpty ? shortBadges : badges; final source = shortBadges.isNotEmpty ? shortBadges : badges;
return source.where(isShortDisplayBadge).toList(); return source.where(isShortDisplayBadge).toList();
} }
List<WearBadge> get longDisplayBadges {
final source = longBadges.isNotEmpty ? longBadges : badges;
return source.where(isLongDisplayBadge).toList();
}
List<WearBadge> get honorWallBadges { List<WearBadge> get honorWallBadges {
final source = final source =
shortBadges.isNotEmpty shortBadges.isNotEmpty
@ -130,6 +139,12 @@ class SCUserBadgeRes {
return true; return true;
} }
static bool isLongDisplayBadge(WearBadge badge) {
final sourceType = badge.sourceType?.trim().toUpperCase() ?? "";
final type = badge.type?.trim().toUpperCase() ?? "";
return type == "LONG" || type == "VIP" || sourceType == "VIP";
}
static bool _isHonorWallBadge(WearBadge badge) { static bool _isHonorWallBadge(WearBadge badge) {
return isShortDisplayBadge(badge); return isShortDisplayBadge(badge);
} }

View File

@ -6,11 +6,14 @@ import 'package:yumi/shared/data_sources/sources/local/user_manager.dart';
import 'package:yumi/shared/data_sources/sources/repositories/sc_user_repository_impl.dart'; import 'package:yumi/shared/data_sources/sources/repositories/sc_user_repository_impl.dart';
import 'package:yumi/ui_kit/components/sc_compontent.dart'; import 'package:yumi/ui_kit/components/sc_compontent.dart';
enum SCUserBadgeDisplayScope { short, long, all }
class SCUserBadgeStrip extends StatefulWidget { class SCUserBadgeStrip extends StatefulWidget {
const SCUserBadgeStrip({ const SCUserBadgeStrip({
super.key, super.key,
this.userId, this.userId,
this.fallbackBadges = const <WearBadge>[], this.fallbackBadges = const <WearBadge>[],
this.displayScope = SCUserBadgeDisplayScope.short,
this.height, this.height,
this.badgeHeight, this.badgeHeight,
this.longBadgeWidth, this.longBadgeWidth,
@ -23,6 +26,7 @@ class SCUserBadgeStrip extends StatefulWidget {
final String? userId; final String? userId;
final List<WearBadge> fallbackBadges; final List<WearBadge> fallbackBadges;
final SCUserBadgeDisplayScope displayScope;
final double? height; final double? height;
final double? badgeHeight; final double? badgeHeight;
final double? longBadgeWidth; final double? longBadgeWidth;
@ -100,8 +104,7 @@ class _SCUserBadgeStripState extends State<SCUserBadgeStrip> {
return FutureBuilder<SCUserBadgeRes>( return FutureBuilder<SCUserBadgeRes>(
future: future, future: future,
builder: (context, snapshot) { builder: (context, snapshot) {
final remoteBadges = final remoteBadges = _remoteBadges(snapshot.data);
snapshot.data?.displayBadges ?? const <WearBadge>[];
final badges = remoteBadges.isNotEmpty ? remoteBadges : _fallbackBadges; final badges = remoteBadges.isNotEmpty ? remoteBadges : _fallbackBadges;
return _buildBadges(badges, stripHeight); return _buildBadges(badges, stripHeight);
}, },
@ -110,11 +113,38 @@ class _SCUserBadgeStripState extends State<SCUserBadgeStrip> {
List<WearBadge> get _fallbackBadges { List<WearBadge> get _fallbackBadges {
return widget.fallbackBadges return widget.fallbackBadges
.where(SCUserBadgeRes.isShortDisplayBadge) .where(_matchesDisplayScope)
.where((badge) => _badgeUrl(badge).isNotEmpty) .where((badge) => _badgeUrl(badge).isNotEmpty)
.toList(); .toList();
} }
List<WearBadge> _remoteBadges(SCUserBadgeRes? data) {
if (data == null) {
return const <WearBadge>[];
}
switch (widget.displayScope) {
case SCUserBadgeDisplayScope.long:
return data.longDisplayBadges;
case SCUserBadgeDisplayScope.all:
return data.allBadges
.where((badge) => _badgeUrl(badge).isNotEmpty)
.toList();
case SCUserBadgeDisplayScope.short:
return data.shortDisplayBadges;
}
}
bool _matchesDisplayScope(WearBadge badge) {
switch (widget.displayScope) {
case SCUserBadgeDisplayScope.long:
return SCUserBadgeRes.isLongDisplayBadge(badge);
case SCUserBadgeDisplayScope.all:
return true;
case SCUserBadgeDisplayScope.short:
return SCUserBadgeRes.isShortDisplayBadge(badge);
}
}
Widget _buildBadges(List<WearBadge> rawBadges, double stripHeight) { Widget _buildBadges(List<WearBadge> rawBadges, double stripHeight) {
final badges = final badges =
widget.maxBadges == null widget.maxBadges == null

View File

@ -498,6 +498,7 @@ class _RoomUserInfoCardState extends State<RoomUserInfoCard> {
return SCUserBadgeStrip( return SCUserBadgeStrip(
userId: userId, userId: userId,
fallbackBadges: _roomCardFallbackBadges(ref, profile), fallbackBadges: _roomCardFallbackBadges(ref, profile),
displayScope: SCUserBadgeDisplayScope.long,
height: 82.w, height: 82.w,
badgeHeight: 34.5.w, badgeHeight: 34.5.w,
longBadgeWidth: 87.w, longBadgeWidth: 87.w,

View File

@ -33,6 +33,7 @@ void main() {
}); });
expect(result.allBadges.map((badge) => badge.id), ['vip', 'old', 'new']); expect(result.allBadges.map((badge) => badge.id), ['vip', 'old', 'new']);
expect(result.longDisplayBadges.map((badge) => badge.id), ['vip']);
expect(result.displayBadges.map((badge) => badge.id), ['old', 'new']); expect(result.displayBadges.map((badge) => badge.id), ['old', 'new']);
expect(result.honorWallBadges.map((badge) => badge.id), ['new', 'old']); expect(result.honorWallBadges.map((badge) => badge.id), ['new', 'old']);
}); });
@ -70,6 +71,10 @@ void main() {
], ],
}); });
expect(result.longDisplayBadges.map((badge) => badge.id), [
'long',
'vip',
]);
expect(result.displayBadges.map((badge) => badge.id), [ expect(result.displayBadges.map((badge) => badge.id), [
'activity', 'activity',
'achievement', 'achievement',