diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart index bed4efdad..0faaaf1f2 100644 --- a/lib/models/search/result.dart +++ b/lib/models/search/result.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/models/model_avatar.dart'; import 'package:PiliPlus/models/model_owner.dart'; import 'package:PiliPlus/models/model_video.dart'; import 'package:PiliPlus/utils/duration_util.dart'; @@ -164,7 +165,7 @@ class SearchUserItemModel { int? isUpUser; int? isLive; int? roomId; - Map? officialVerify; + BaseOfficialVerify? officialVerify; int? isSeniorMember; SearchUserItemModel.fromJson(Map json) { @@ -183,7 +184,9 @@ class SearchUserItemModel { isUpUser = json['is_upuser']; isLive = json['is_live']; roomId = json['room_id']; - officialVerify = json['official_verify']; + officialVerify = json['official_verify'] == null + ? null + : BaseOfficialVerify.fromJson(json['official_verify']); isSeniorMember = json['is_senior_member']; } } diff --git a/lib/models_new/member_card_info/card.dart b/lib/models_new/member_card_info/card.dart index a14d56cd1..ec8640362 100644 --- a/lib/models_new/member_card_info/card.dart +++ b/lib/models_new/member_card_info/card.dart @@ -6,7 +6,7 @@ class Card { String? face; int? fans; int? attention; - BaseOfficialVerify? officialVerify; + BaseOfficialVerify? official; Vip? vip; Card({ @@ -15,7 +15,7 @@ class Card { this.face, this.fans, this.attention, - this.officialVerify, + this.official, this.vip, }); @@ -25,10 +25,10 @@ class Card { face: json['face'] as String?, fans: json['fans'] as int?, attention: json['attention'] as int?, - officialVerify: json['official_verify'] == null + official: json['Official'] == null ? null : BaseOfficialVerify.fromJson( - json['official_verify'] as Map, + json['Official'] as Map, ), vip: json['vip'] == null ? null diff --git a/lib/pages/search_panel/user/widgets/item.dart b/lib/pages/search_panel/user/widgets/item.dart index c9071601e..68df91cd4 100644 --- a/lib/pages/search_panel/user/widgets/item.dart +++ b/lib/pages/search_panel/user/widgets/item.dart @@ -30,7 +30,7 @@ class SearchUserItem extends StatelessWidget { avatar: item.upic, size: 42, isVip: false, - officialType: item.officialVerify?['type'], + officialType: item.officialVerify?.type, roomId: item.isLive == 1 ? item.roomId : null, ), const SizedBox(width: 10), @@ -59,10 +59,9 @@ class SearchUserItem extends StatelessWidget { '粉丝:${NumUtil.numFormat(item.fans)} 视频:${NumUtil.numFormat(item.videos)}', style: style, ), - if (item.officialVerify?['desc'] != null && - item.officialVerify?['desc'] != '') + if (item.officialVerify?.desc?.isNotEmpty == true) Text( - item.officialVerify?['desc'], + item.officialVerify!.desc!, style: style, ), ], diff --git a/lib/pages/video/introduction/ugc/view.dart b/lib/pages/video/introduction/ugc/view.dart index c4ea61222..2ed74967a 100644 --- a/lib/pages/video/introduction/ugc/view.dart +++ b/lib/pages/video/introduction/ugc/view.dart @@ -815,7 +815,7 @@ class _UgcIntroPanelState extends TripleState size: 35, badgeSize: 14, isVip: isVip, - officialType: userStat.card?.officialVerify?.type, + officialType: userStat.card?.official?.type, ), const SizedBox(width: 10), Column(