tweaks

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/models_new/live/live_area_list/area_item.dart

@@ -1,33 +1,24 @@
 class AreaItem {
   dynamic id;
   String? name;
-  String? link;
   String? pic;
   dynamic parentId;
   String? parentName;
-  int? areaType;
-  int? tagType;
 
   AreaItem({
     this.id,
     this.name,
-    this.link,
     this.pic,
     this.parentId,
     this.parentName,
-    this.areaType,
-    this.tagType,
   });
 
   factory AreaItem.fromJson(Map<String, dynamic> json) => AreaItem(
     id: json['id'],
     name: json['name'] as String?,
-    link: json['link'] as String?,
     pic: json['pic'] as String?,
     parentId: json['parent_id'],
     parentName: json['parent_name'] as String?,
-    areaType: json['area_type'] as int?,
-    tagType: json['tag_type'] as int?,
   );
 
   @override

lib/models_new/live/live_dm_block/shield_info.dart

@@ -1,20 +1,16 @@
 import 'package:PiliPlus/models_new/live/live_dm_block/shield_rules.dart';
 import 'package:PiliPlus/models_new/live/live_dm_block/shield_user_list.dart';
-import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/extension/iterable_ext.dart';
 
 class ShieldInfo {
   List<ShieldUserList>? shieldUserList;
   List<String>? keywordList;
   ShieldRules? shieldRules;
-  bool? isBlock;
-  int? blockExpired;
 
   ShieldInfo({
     this.shieldUserList,
     this.keywordList,
     this.shieldRules,
-    this.isBlock,
-    this.blockExpired,
   });
 
   factory ShieldInfo.fromJson(Map<String, dynamic> json) => ShieldInfo(
@@ -25,7 +21,5 @@ class ShieldInfo {
     shieldRules: json['shield_rules'] == null
         ? null
         : ShieldRules.fromJson(json['shield_rules'] as Map<String, dynamic>),
-    isBlock: json['is_block'] as bool?,
-    blockExpired: json['block_expired'] as int?,
   );
 }

lib/models_new/live/live_dm_info/data.dart

@@ -1,30 +1,15 @@
 import 'package:PiliPlus/models_new/live/live_dm_info/host_list.dart';
 
 class LiveDmInfoData {
-  String? group;
-  int? businessId;
-  double? refreshRowFactor;
-  int? refreshRate;
-  int? maxDelay;
   String? token;
   List<HostList>? hostList;
 
   LiveDmInfoData({
-    this.group,
-    this.businessId,
-    this.refreshRowFactor,
-    this.refreshRate,
-    this.maxDelay,
     this.token,
     this.hostList,
   });
 
   factory LiveDmInfoData.fromJson(Map<String, dynamic> json) => LiveDmInfoData(
-    group: json['group'] as String?,
-    businessId: json['business_id'] as int?,
-    refreshRowFactor: (json['refresh_row_factor'] as num?)?.toDouble(),
-    refreshRate: json['refresh_rate'] as int?,
-    maxDelay: json['max_delay'] as int?,
     token: json['token'] as String?,
     hostList: (json['host_list'] as List<dynamic>?)
         ?.map((e) => HostList.fromJson(e as Map<String, dynamic>))

lib/models_new/live/live_feed_index/card_data_item.dart

@@ -1,23 +1,17 @@
 import 'package:PiliPlus/models_new/live/live_feed_index/card_data_list_item.dart';
-import 'package:PiliPlus/models_new/live/live_feed_index/module_info.dart';
 
 class CardDataItem {
-  ModuleInfo? moduleInfo;
   List<CardLiveItem>? list;
   dynamic topView;
   ExtraInfo? extraInfo;
 
   CardDataItem({
-    this.moduleInfo,
     this.list,
     this.topView,
     this.extraInfo,
   });
 
   factory CardDataItem.fromJson(Map<String, dynamic> json) => CardDataItem(
-    moduleInfo: json['module_info'] == null
-        ? null
-        : ModuleInfo.fromJson(json['module_info'] as Map<String, dynamic>),
     list: (json['list'] as List<dynamic>?)
         ?.map((e) => CardLiveItem.fromJson(e as Map<String, dynamic>))
         .toList(),

lib/models_new/live/live_feed_index/card_data_list_item.dart

@@ -7,21 +7,13 @@ class CardLiveItem {
   String? face;
   String? cover;
   String? title;
-  int? area;
   int? liveTime;
   String? areaName;
   int? areaV2Id;
   String? areaV2Name;
   String? areaV2ParentName;
   int? areaV2ParentId;
-  String? liveTagName;
-  int? online;
-  String? link;
-  int? officialVerify;
-  int? currentQn;
   WatchedShow? watchedShow;
-  String? statusText;
-  int? tagType;
 
   CardLiveItem({
     this.roomid,
@@ -30,21 +22,13 @@ class CardLiveItem {
     this.face,
     this.cover,
     this.title,
-    this.area,
     this.liveTime,
     this.areaName,
     this.areaV2Id,
     this.areaV2Name,
     this.areaV2ParentName,
     this.areaV2ParentId,
-    this.liveTagName,
-    this.online,
-    this.link,
-    this.officialVerify,
-    this.currentQn,
     this.watchedShow,
-    this.statusText,
-    this.tagType,
   });
 
   factory CardLiveItem.fromJson(Map<String, dynamic> json) => CardLiveItem(
@@ -54,22 +38,14 @@ class CardLiveItem {
     face: json['face'] as String?,
     cover: json['cover'] as String?,
     title: json['title'] as String?,
-    area: json['area'] as int?,
     liveTime: json['live_time'] as int?,
     areaName: json['area_name'] as String?,
     areaV2Id: json['area_v2_id'] as int?,
     areaV2Name: json['area_v2_name'] as String?,
     areaV2ParentName: json['area_v2_parent_name'] as String?,
     areaV2ParentId: json['area_v2_parent_id'] as int?,
-    liveTagName: json['live_tag_name'] as String?,
-    online: json['online'] as int?,
-    link: json['link'] as String?,
-    officialVerify: json['official_verify'] as int?,
-    currentQn: json['current_qn'] as int?,
     watchedShow: json['watched_show'] == null
         ? null
         : WatchedShow.fromJson(json['watched_show'] as Map<String, dynamic>),
-    statusText: json['status_text'] as String?,
-    tagType: json['tag_type'],
   );
 }

lib/models_new/live/live_feed_index/data.dart

@@ -2,19 +2,13 @@ import 'package:PiliPlus/models_new/live/live_feed_index/card_list.dart';
 
 class LiveIndexData {
   List<LiveCardList>? cardList;
-  int? isRollback;
   int? hasMore;
-  int? triggerTime;
-  int? isNeedRefresh;
   LiveCardList? followItem;
   LiveCardList? areaItem;
 
   LiveIndexData({
     this.cardList,
-    this.isRollback,
     this.hasMore,
-    this.triggerTime,
-    this.isNeedRefresh,
   });
 
   LiveIndexData.fromJson(Map<String, dynamic> json) {
@@ -38,9 +32,6 @@ class LiveIndexData {
         }
       }
     }
-    isRollback = json['is_rollback'] as int?;
     hasMore = json['has_more'] as int?;
-    triggerTime = json['trigger_time'] as int?;
-    isNeedRefresh = json['is_need_refresh'] as int?;
   }
 }

lib/models_new/live/live_feed_index/live_feed_index.dart

@@ -1,19 +0,0 @@
-import 'package:PiliPlus/models_new/live/live_feed_index/data.dart';
-
-class LiveFeedIndex {
-  int? code;
-  String? message;
-  int? ttl;
-  LiveIndexData? data;
-
-  LiveFeedIndex({this.code, this.message, this.ttl, this.data});
-
-  factory LiveFeedIndex.fromJson(Map<String, dynamic> json) => LiveFeedIndex(
-    code: json['code'] as int?,
-    message: json['message'] as String?,
-    ttl: json['ttl'] as int?,
-    data: json['data'] == null
-        ? null
-        : LiveIndexData.fromJson(json['data'] as Map<String, dynamic>),
-  );
-}

lib/models_new/live/live_feed_index/module_info.dart

@@ -1,29 +0,0 @@
-class ModuleInfo {
-  int? id;
-  String? link;
-  String? pic;
-  String? title;
-  int? type;
-  int? sort;
-  int? count;
-
-  ModuleInfo({
-    this.id,
-    this.link,
-    this.pic,
-    this.title,
-    this.type,
-    this.sort,
-    this.count,
-  });
-
-  factory ModuleInfo.fromJson(Map<String, dynamic> json) => ModuleInfo(
-    id: json['id'] as int?,
-    link: json['link'] as String?,
-    pic: json['pic'] as String?,
-    title: json['title'] as String?,
-    type: json['type'] as int?,
-    sort: json['sort'] as int?,
-    count: json['count'] as int?,
-  );
-}

lib/models_new/live/live_follow/data.dart

@@ -6,9 +6,7 @@ class LiveFollowData {
   int? totalPage;
   List<LiveFollowItem>? list;
   int? count;
-  int? neverLivedCount;
   int? liveCount;
-  List<dynamic>? neverLivedFaces;
 
   LiveFollowData({
     this.title,
@@ -16,9 +14,7 @@ class LiveFollowData {
     this.totalPage,
     this.list,
     this.count,
-    this.neverLivedCount,
     this.liveCount,
-    this.neverLivedFaces,
   });
 
   LiveFollowData.fromJson(Map<String, dynamic> json) {
@@ -34,8 +30,6 @@ class LiveFollowData {
       }
     }
     count = json['count'] as int?;
-    neverLivedCount = json['never_lived_count'] as int?;
     liveCount = json['live_count'] as int?;
-    neverLivedFaces = json['never_lived_faces'] as List<dynamic>?;
   }
 }

lib/models_new/live/live_follow/item.dart

@@ -5,25 +5,10 @@ class LiveFollowItem {
   String? title;
   String? face;
   int? liveStatus;
-  int? recordNum;
-  String? recentRecordId;
-  int? isAttention;
-  int? clipnum;
-  int? fansNum;
   String? areaName;
-  String? areaValue;
-  String? tags;
-  String? recentRecordIdV2;
-  int? recordNumV2;
-  int? recordLiveTime;
   String? areaNameV2;
-  String? roomNews;
-  bool? sw1tch;
-  String? watchIcon;
   String? textSmall;
   String? roomCover;
-  int? parentAreaId;
-  int? areaId;
 
   LiveFollowItem({
     this.roomid,
@@ -32,25 +17,10 @@ class LiveFollowItem {
     this.title,
     this.face,
     this.liveStatus,
-    this.recordNum,
-    this.recentRecordId,
-    this.isAttention,
-    this.clipnum,
-    this.fansNum,
     this.areaName,
-    this.areaValue,
-    this.tags,
-    this.recentRecordIdV2,
-    this.recordNumV2,
-    this.recordLiveTime,
     this.areaNameV2,
-    this.roomNews,
-    this.sw1tch,
-    this.watchIcon,
     this.textSmall,
     this.roomCover,
-    this.parentAreaId,
-    this.areaId,
   });
 
   factory LiveFollowItem.fromJson(Map<String, dynamic> json) => LiveFollowItem(
@@ -60,24 +30,9 @@ class LiveFollowItem {
     title: json['title'] as String?,
     face: json['face'] as String?,
     liveStatus: json['live_status'] as int?,
-    recordNum: json['record_num'] as int?,
-    recentRecordId: json['recent_record_id'] as String?,
-    isAttention: json['is_attention'] as int?,
-    clipnum: json['clipnum'] as int?,
-    fansNum: json['fans_num'] as int?,
     areaName: json['area_name'] as String?,
-    areaValue: json['area_value'] as String?,
-    tags: json['tags'] as String?,
-    recentRecordIdV2: json['recent_record_id_v2'] as String?,
-    recordNumV2: json['record_num_v2'] as int?,
-    recordLiveTime: json['record_live_time'] as int?,
     areaNameV2: json['area_name_v2'] as String?,
-    roomNews: json['room_news'] as String?,
-    sw1tch: json['switch'] as bool?,
-    watchIcon: json['watch_icon'] as String?,
     textSmall: json['text_small'] as String?,
     roomCover: json['room_cover'] as String?,
-    parentAreaId: json['parent_area_id'] as int?,
-    areaId: json['area_id'] as int?,
   );
 }

lib/models_new/live/live_room_info_h5/anchor_info.dart

@@ -1,18 +1,13 @@
 import 'package:PiliPlus/models_new/live/live_room_info_h5/base_info.dart';
-import 'package:PiliPlus/models_new/live/live_room_info_h5/relation_info.dart';
 
 class AnchorInfo {
   BaseInfo? baseInfo;
-  RelationInfo? relationInfo;
 
-  AnchorInfo({this.baseInfo, this.relationInfo});
+  AnchorInfo({this.baseInfo});
 
   factory AnchorInfo.fromJson(Map<String, dynamic> json) => AnchorInfo(
     baseInfo: json['base_info'] == null
         ? null
         : BaseInfo.fromJson(json['base_info'] as Map<String, dynamic>),
-    relationInfo: json['relation_info'] == null
-        ? null
-        : RelationInfo.fromJson(json['relation_info'] as Map<String, dynamic>),
   );
 }

lib/models_new/live/live_room_info_h5/area_mask_info.dart

@@ -1,13 +0,0 @@
-import 'package:PiliPlus/models_new/live/live_room_info_h5/area_masks.dart';
-
-class AreaMaskInfo {
-  AreaMasks? areaMasks;
-
-  AreaMaskInfo({this.areaMasks});
-
-  factory AreaMaskInfo.fromJson(Map<String, dynamic> json) => AreaMaskInfo(
-    areaMasks: json['area_masks'] == null
-        ? null
-        : AreaMasks.fromJson(json['area_masks'] as Map<String, dynamic>),
-  );
-}

lib/models_new/live/live_room_info_h5/area_masks.dart

@@ -1,13 +0,0 @@
-class AreaMasks {
-  dynamic horizontalMasks;
-  dynamic verticalMasks;
-  dynamic fullMask;
-
-  AreaMasks({this.horizontalMasks, this.verticalMasks, this.fullMask});
-
-  factory AreaMasks.fromJson(Map<String, dynamic> json) => AreaMasks(
-    horizontalMasks: json['horizontal_masks'] as dynamic,
-    verticalMasks: json['vertical_masks'] as dynamic,
-    fullMask: json['full_mask'] as dynamic,
-  );
-}

lib/models_new/live/live_room_info_h5/base_info.dart

@@ -1,17 +1,11 @@
-import 'package:PiliPlus/models_new/live/live_room_info_h5/official_info.dart';
-
 class BaseInfo {
   String? uname;
   String? face;
-  OfficialInfo? officialInfo;
 
-  BaseInfo({this.uname, this.face, this.officialInfo});
+  BaseInfo({this.uname, this.face});
 
   factory BaseInfo.fromJson(Map<String, dynamic> json) => BaseInfo(
     uname: json['uname'] as String?,
     face: json['face'] as String?,
-    officialInfo: json['official_info'] == null
-        ? null
-        : OfficialInfo.fromJson(json['official_info'] as Map<String, dynamic>),
   );
 }

lib/models_new/live/live_room_info_h5/block_info.dart

@@ -1,13 +0,0 @@
-class BlockInfo {
-  bool? block;
-  String? desc;
-  int? business;
-
-  BlockInfo({this.block, this.desc, this.business});
-
-  factory BlockInfo.fromJson(Map<String, dynamic> json) => BlockInfo(
-    block: json['block'] as bool?,
-    desc: json['desc'] as String?,
-    business: json['business'] as int?,
-  );
-}

lib/models_new/live/live_room_info_h5/data.dart

@@ -1,38 +1,16 @@
 import 'package:PiliPlus/models_new/live/live_feed_index/watched_show.dart';
-
 import 'package:PiliPlus/models_new/live/live_room_info_h5/anchor_info.dart';
-import 'package:PiliPlus/models_new/live/live_room_info_h5/area_mask_info.dart';
-import 'package:PiliPlus/models_new/live/live_room_info_h5/block_info.dart';
-import 'package:PiliPlus/models_new/live/live_room_info_h5/like_info_v3.dart';
-import 'package:PiliPlus/models_new/live/live_room_info_h5/new_switch_info.dart';
-import 'package:PiliPlus/models_new/live/live_room_info_h5/news_info.dart';
 import 'package:PiliPlus/models_new/live/live_room_info_h5/room_info.dart';
 
 class RoomInfoH5Data {
   RoomInfo? roomInfo;
   AnchorInfo? anchorInfo;
-  NewSwitchInfo? newSwitchInfo;
-  List<dynamic>? bannerInfo;
-  int? isRoomFeed;
-  List<dynamic>? tabInfo;
-  NewsInfo? newsInfo;
   WatchedShow? watchedShow;
-  LikeInfoV3? likeInfoV3;
-  BlockInfo? blockInfo;
-  AreaMaskInfo? areaMaskInfo;
 
   RoomInfoH5Data({
     this.roomInfo,
     this.anchorInfo,
-    this.newSwitchInfo,
-    this.bannerInfo,
-    this.isRoomFeed,
-    this.tabInfo,
-    this.newsInfo,
     this.watchedShow,
-    this.likeInfoV3,
-    this.blockInfo,
-    this.areaMaskInfo,
   });
 
   factory RoomInfoH5Data.fromJson(Map<String, dynamic> json) => RoomInfoH5Data(
@@ -42,28 +20,8 @@ class RoomInfoH5Data {
     anchorInfo: json['anchor_info'] == null
         ? null
         : AnchorInfo.fromJson(json['anchor_info'] as Map<String, dynamic>),
-    newSwitchInfo: json['new_switch_info'] == null
-        ? null
-        : NewSwitchInfo.fromJson(
-            json['new_switch_info'] as Map<String, dynamic>,
-          ),
-    bannerInfo: json['banner_info'] as List<dynamic>?,
-    isRoomFeed: json['is_room_feed'] as int?,
-    tabInfo: json['tab_info'] as List<dynamic>?,
-    newsInfo: json['news_info'] == null
-        ? null
-        : NewsInfo.fromJson(json['news_info'] as Map<String, dynamic>),
     watchedShow: json['watched_show'] == null
         ? null
         : WatchedShow.fromJson(json['watched_show'] as Map<String, dynamic>),
-    likeInfoV3: json['like_info_v3'] == null
-        ? null
-        : LikeInfoV3.fromJson(json['like_info_v3'] as Map<String, dynamic>),
-    blockInfo: json['block_info'] == null
-        ? null
-        : BlockInfo.fromJson(json['block_info'] as Map<String, dynamic>),
-    areaMaskInfo: json['area_mask_info'] == null
-        ? null
-        : AreaMaskInfo.fromJson(json['area_mask_info'] as Map<String, dynamic>),
   );
 }

lib/models_new/live/live_room_info_h5/frame.dart

@@ -1,13 +0,0 @@
-class Frame {
-  String? name;
-  String? value;
-  String? desc;
-
-  Frame({this.name, this.value, this.desc});
-
-  factory Frame.fromJson(Map<String, dynamic> json) => Frame(
-    name: json['name'] as String?,
-    value: json['value'] as String?,
-    desc: json['desc'] as String?,
-  );
-}

lib/models_new/live/live_room_info_h5/like_info_v3.dart

@@ -1,70 +0,0 @@
-import 'package:PiliPlus/utils/extension.dart';
-
-class LikeInfoV3 {
-  int? totalLikes;
-  bool? clickBlock;
-  bool? countBlock;
-  String? guildEmoText;
-  String? guildDmText;
-  String? likeDmText;
-  List<String>? handIcons;
-  List<String>? dmIcons;
-  String? eggshellsIcon;
-  int? countShowTime;
-  String? processIcon;
-  String? processColor;
-  int? reportClickLimit;
-  int? reportTimeMin;
-  int? reportTimeMax;
-  String? icon;
-  double? cooldown;
-  bool? handUseFace;
-  List<String>? guideIconUrls;
-  double? guideIconRatio;
-
-  LikeInfoV3({
-    this.totalLikes,
-    this.clickBlock,
-    this.countBlock,
-    this.guildEmoText,
-    this.guildDmText,
-    this.likeDmText,
-    this.handIcons,
-    this.dmIcons,
-    this.eggshellsIcon,
-    this.countShowTime,
-    this.processIcon,
-    this.processColor,
-    this.reportClickLimit,
-    this.reportTimeMin,
-    this.reportTimeMax,
-    this.icon,
-    this.cooldown,
-    this.handUseFace,
-    this.guideIconUrls,
-    this.guideIconRatio,
-  });
-
-  factory LikeInfoV3.fromJson(Map<String, dynamic> json) => LikeInfoV3(
-    totalLikes: json['total_likes'] as int?,
-    clickBlock: json['click_block'] as bool?,
-    countBlock: json['count_block'] as bool?,
-    guildEmoText: json['guild_emo_text'] as String?,
-    guildDmText: json['guild_dm_text'] as String?,
-    likeDmText: json['like_dm_text'] as String?,
-    handIcons: (json['hand_icons'] as List?)?.fromCast(),
-    dmIcons: (json['dm_icons'] as List?)?.fromCast(),
-    eggshellsIcon: json['eggshells_icon'] as String?,
-    countShowTime: json['count_show_time'] as int?,
-    processIcon: json['process_icon'] as String?,
-    processColor: json['process_color'] as String?,
-    reportClickLimit: json['report_click_limit'] as int?,
-    reportTimeMin: json['report_time_min'] as int?,
-    reportTimeMax: json['report_time_max'] as int?,
-    icon: json['icon'] as String?,
-    cooldown: (json['cooldown'] as num?)?.toDouble(),
-    handUseFace: json['hand_use_face'] as bool?,
-    guideIconUrls: (json['guide_icon_urls'] as List?)?.fromCast(),
-    guideIconRatio: (json['guide_icon_ratio'] as num?)?.toDouble(),
-  );
-}

lib/models_new/live/live_room_info_h5/new_switch_info.dart

@@ -1,26 +0,0 @@
-class NewSwitchInfo {
-  int? roomInfoPopularity;
-  int? roomTab;
-  int? roomPlayerWatermark;
-  int? roomRecommendLiveOff;
-  int? brandUserCardSwitch;
-  int? brandFollowSwitch;
-
-  NewSwitchInfo({
-    this.roomInfoPopularity,
-    this.roomTab,
-    this.roomPlayerWatermark,
-    this.roomRecommendLiveOff,
-    this.brandUserCardSwitch,
-    this.brandFollowSwitch,
-  });
-
-  factory NewSwitchInfo.fromJson(Map<String, dynamic> json) => NewSwitchInfo(
-    roomInfoPopularity: json['room-info-popularity'] as int?,
-    roomTab: json['room-tab'] as int?,
-    roomPlayerWatermark: json['room-player-watermark'] as int?,
-    roomRecommendLiveOff: json['room-recommend-live_off'] as int?,
-    brandUserCardSwitch: json['brand-user-card-switch'] as int?,
-    brandFollowSwitch: json['brand-follow-switch'] as int?,
-  );
-}

lib/models_new/live/live_room_info_h5/news_info.dart

@@ -1,13 +0,0 @@
-class NewsInfo {
-  int? uid;
-  String? ctime;
-  String? content;
-
-  NewsInfo({this.uid, this.ctime, this.content});
-
-  factory NewsInfo.fromJson(Map<String, dynamic> json) => NewsInfo(
-    uid: json['uid'] as int?,
-    ctime: json['ctime'] as String?,
-    content: json['content'] as String?,
-  );
-}

lib/models_new/live/live_room_info_h5/official_info.dart

@@ -1,23 +0,0 @@
-class OfficialInfo {
-  int? role;
-  String? title;
-  String? desc;
-  int? isNft;
-  String? nftDmark;
-
-  OfficialInfo({
-    this.role,
-    this.title,
-    this.desc,
-    this.isNft,
-    this.nftDmark,
-  });
-
-  factory OfficialInfo.fromJson(Map<String, dynamic> json) => OfficialInfo(
-    role: json['role'] as int?,
-    title: json['title'] as String?,
-    desc: json['desc'] as String?,
-    isNft: json['is_nft'] as int?,
-    nftDmark: json['nft_dmark'] as String?,
-  );
-}

lib/models_new/live/live_room_info_h5/pendants.dart

@@ -1,13 +0,0 @@
-import 'package:PiliPlus/models_new/live/live_room_info_h5/frame.dart';
-
-class Pendants {
-  Frame? frame;
-
-  Pendants({this.frame});
-
-  factory Pendants.fromJson(Map<String, dynamic> json) => Pendants(
-    frame: json['frame'] == null
-        ? null
-        : Frame.fromJson(json['frame'] as Map<String, dynamic>),
-  );
-}

lib/models_new/live/live_room_info_h5/relation_info.dart

@@ -1,9 +0,0 @@
-class RelationInfo {
-  int? attention;
-
-  RelationInfo({this.attention});
-
-  factory RelationInfo.fromJson(Map<String, dynamic> json) => RelationInfo(
-    attention: json['attention'] as int?,
-  );
-}

lib/models_new/live/live_room_info_h5/room_info.dart

@@ -1,44 +1,24 @@
-import 'package:PiliPlus/models_new/live/live_room_info_h5/pendants.dart';
-
 class RoomInfo {
   int? uid;
   int? roomId;
   String? title;
   String? cover;
-  String? description;
   int? liveStatus;
   int? liveStartTime;
-  int? areaId;
-  String? areaName;
-  int? parentAreaId;
-  String? parentAreaName;
   int? online;
-  String? keyframe;
-  String? background;
   String? appBackground;
-  Pendants? pendants;
   String? subSessionKey;
-  String? liveId;
 
   RoomInfo({
     this.uid,
     this.roomId,
     this.title,
     this.cover,
-    this.description,
     this.liveStatus,
     this.liveStartTime,
-    this.areaId,
-    this.areaName,
-    this.parentAreaId,
-    this.parentAreaName,
     this.online,
-    this.keyframe,
-    this.background,
     this.appBackground,
-    this.pendants,
     this.subSessionKey,
-    this.liveId,
   });
 
   factory RoomInfo.fromJson(Map<String, dynamic> json) => RoomInfo(
@@ -46,21 +26,10 @@ class RoomInfo {
     roomId: json['room_id'] as int?,
     title: json['title'] as String?,
     cover: json['cover'] as String?,
-    description: json['description'] as String?,
     liveStatus: json['live_status'] as int?,
     liveStartTime: json['live_start_time'] as int?,
-    areaId: json['area_id'] as int?,
-    areaName: json['area_name'] as String?,
-    parentAreaId: json['parent_area_id'] as int?,
-    parentAreaName: json['parent_area_name'] as String?,
     online: json['online'] as int?,
-    keyframe: json['keyframe'] as String?,
-    background: json['background'] as String?,
     appBackground: json['app_background'] as String?,
-    pendants: json['pendants'] == null
-        ? null
-        : Pendants.fromJson(json['pendants'] as Map<String, dynamic>),
     subSessionKey: json['sub_session_key'] as String?,
-    liveId: json['live_id'] as String?,
   );
 }

lib/models_new/live/live_room_play_info/codec.dart

@@ -1,5 +1,5 @@
 import 'package:PiliPlus/models_new/live/live_room_play_info/url_info.dart';
-import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/extension/iterable_ext.dart';
 
 class CodecItem {
   String? codecName;

lib/models_new/live/live_room_play_info/data.dart

@@ -4,47 +4,19 @@ class RoomPlayInfoData {
   int? roomId;
   int? shortId;
   int? uid;
-  bool? isHidden;
-  bool? isLocked;
   bool? isPortrait;
   int? liveStatus;
-  int? hiddenTill;
-  int? lockTill;
-  bool? encrypted;
-  bool? pwdVerified;
   int? liveTime;
-  int? roomShield;
-  List<dynamic>? allSpecialTypes;
   PlayurlInfo? playurlInfo;
-  int? officialType;
-  int? officialRoomId;
-  int? riskWithDelay;
-  String? multiScreenInfo;
-  dynamic pureControlFunction;
-  dynamic degradedPlayurl;
 
   RoomPlayInfoData({
     this.roomId,
     this.shortId,
     this.uid,
-    this.isHidden,
-    this.isLocked,
     this.isPortrait,
     this.liveStatus,
-    this.hiddenTill,
-    this.lockTill,
-    this.encrypted,
-    this.pwdVerified,
     this.liveTime,
-    this.roomShield,
-    this.allSpecialTypes,
     this.playurlInfo,
-    this.officialType,
-    this.officialRoomId,
-    this.riskWithDelay,
-    this.multiScreenInfo,
-    this.pureControlFunction,
-    this.degradedPlayurl,
   });
 
   factory RoomPlayInfoData.fromJson(Map<String, dynamic> json) =>
@@ -52,27 +24,13 @@ class RoomPlayInfoData {
         roomId: json['room_id'] as int?,
         shortId: json['short_id'] as int?,
         uid: json['uid'] as int?,
-        isHidden: json['is_hidden'] as bool?,
-        isLocked: json['is_locked'] as bool?,
         isPortrait: json['is_portrait'] as bool?,
         liveStatus: json['live_status'] as int?,
-        hiddenTill: json['hidden_till'] as int?,
-        lockTill: json['lock_till'] as int?,
-        encrypted: json['encrypted'] as bool?,
-        pwdVerified: json['pwd_verified'] as bool?,
         liveTime: json['live_time'] as int?,
-        roomShield: json['room_shield'] as int?,
-        allSpecialTypes: json['all_special_types'] as List<dynamic>?,
         playurlInfo: json['playurl_info'] == null
             ? null
             : PlayurlInfo.fromJson(
                 json['playurl_info'] as Map<String, dynamic>,
               ),
-        officialType: json['official_type'] as int?,
-        officialRoomId: json['official_room_id'] as int?,
-        riskWithDelay: json['risk_with_delay'] as int?,
-        multiScreenInfo: json['multi_screen_info'] as String?,
-        pureControlFunction: json['pure_control_function'] as dynamic,
-        degradedPlayurl: json['degraded_playurl'] as dynamic,
       );
 }

lib/models_new/live/live_room_play_info/expected_quality.dart

@@ -1,13 +0,0 @@
-class ExpectedQuality {
-  int? qn;
-  int? hdrType;
-
-  ExpectedQuality({this.qn, this.hdrType});
-
-  factory ExpectedQuality.fromJson(Map<String, dynamic> json) {
-    return ExpectedQuality(
-      qn: json['qn'] as int?,
-      hdrType: json['hdr_type'] as int?,
-    );
-  }
-}

lib/models_new/live/live_room_play_info/g_qn_desc.dart

@@ -1,26 +0,0 @@
-class GQnDesc {
-  int? qn;
-  String? desc;
-  String? hdrDesc;
-  dynamic attrDesc;
-  int? hdrType;
-  dynamic mediaBaseDesc;
-
-  GQnDesc({
-    this.qn,
-    this.desc,
-    this.hdrDesc,
-    this.attrDesc,
-    this.hdrType,
-    this.mediaBaseDesc,
-  });
-
-  factory GQnDesc.fromJson(Map<String, dynamic> json) => GQnDesc(
-    qn: json['qn'] as int?,
-    desc: json['desc'] as String?,
-    hdrDesc: json['hdr_desc'] as String?,
-    attrDesc: json['attr_desc'] as dynamic,
-    hdrType: json['hdr_type'] as int?,
-    mediaBaseDesc: json['media_base_desc'] as dynamic,
-  );
-}

lib/models_new/live/live_room_play_info/p2p_data.dart

@@ -1,15 +0,0 @@
-class P2pData {
-  bool? p2p;
-  int? p2pType;
-  bool? mP2p;
-  dynamic mServers;
-
-  P2pData({this.p2p, this.p2pType, this.mP2p, this.mServers});
-
-  factory P2pData.fromJson(Map<String, dynamic> json) => P2pData(
-    p2p: json['p2p'] as bool?,
-    p2pType: json['p2p_type'] as int?,
-    mP2p: json['m_p2p'] as bool?,
-    mServers: json['m_servers'] as dynamic,
-  );
-}

lib/models_new/live/live_room_play_info/playurl.dart

@@ -1,33 +1,18 @@
-import 'package:PiliPlus/models_new/live/live_room_play_info/g_qn_desc.dart';
-import 'package:PiliPlus/models_new/live/live_room_play_info/p2p_data.dart';
 import 'package:PiliPlus/models_new/live/live_room_play_info/stream.dart';
 
 class Playurl {
   int? cid;
-  List<GQnDesc>? gQnDesc;
   List<Stream>? stream;
-  P2pData? p2pData;
-  dynamic dolbyQn;
 
   Playurl({
     this.cid,
-    this.gQnDesc,
     this.stream,
-    this.p2pData,
-    this.dolbyQn,
   });
 
   factory Playurl.fromJson(Map<String, dynamic> json) => Playurl(
     cid: json['cid'] as int?,
-    gQnDesc: (json['g_qn_desc'] as List<dynamic>?)
-        ?.map((e) => GQnDesc.fromJson(e as Map<String, dynamic>))
-        .toList(),
     stream: (json['stream'] as List<dynamic>?)
         ?.map((e) => Stream.fromJson(e as Map<String, dynamic>))
         .toList(),
-    p2pData: json['p2p_data'] == null
-        ? null
-        : P2pData.fromJson(json['p2p_data'] as Map<String, dynamic>),
-    dolbyQn: json['dolby_qn'] as dynamic,
   );
 }

lib/models_new/live/live_room_play_info/playurl_info.dart

@@ -1,29 +1,15 @@
-import 'package:PiliPlus/models_new/live/live_room_play_info/expected_quality.dart';
 import 'package:PiliPlus/models_new/live/live_room_play_info/playurl.dart';
 
 class PlayurlInfo {
-  String? confJson;
   Playurl? playurl;
-  ExpectedQuality? expectedQuality;
-  int? qnDescMoreAb;
 
   PlayurlInfo({
-    this.confJson,
     this.playurl,
-    this.expectedQuality,
-    this.qnDescMoreAb,
   });
 
   factory PlayurlInfo.fromJson(Map<String, dynamic> json) => PlayurlInfo(
-    confJson: json['conf_json'] as String?,
     playurl: json['playurl'] == null
         ? null
         : Playurl.fromJson(json['playurl'] as Map<String, dynamic>),
-    expectedQuality: json['expected_quality'] == null
-        ? null
-        : ExpectedQuality.fromJson(
-            json['expected_quality'] as Map<String, dynamic>,
-          ),
-    qnDescMoreAb: json['qn_desc_more_ab'] as int?,
   );
 }

lib/models_new/live/live_search/data.dart

@@ -7,9 +7,6 @@ class LiveSearchData {
   int? pagesize;
   Room? room;
   User? user;
-  String? trackId;
-  String? abtestId;
-  String? query;
 
   LiveSearchData({
     this.type,
@@ -17,9 +14,6 @@ class LiveSearchData {
     this.pagesize,
     this.room,
     this.user,
-    this.trackId,
-    this.abtestId,
-    this.query,
   });
 
   factory LiveSearchData.fromJson(Map<String, dynamic> json) => LiveSearchData(
@@ -32,8 +26,5 @@ class LiveSearchData {
     user: json['user'] == null
         ? null
         : User.fromJson(json['user'] as Map<String, dynamic>),
-    trackId: json['track_id'] as String?,
-    abtestId: json['abtest_id'] as String?,
-    query: json['query'] as String?,
   );
 }

lib/models_new/live/live_search/room_item.dart

@@ -6,8 +6,6 @@ class LiveSearchRoomItemModel {
   String? title;
   String? name;
   String? face;
-  int? online;
-  String? link;
   WatchedShow? watchedShow;
 
   LiveSearchRoomItemModel({
@@ -16,8 +14,6 @@ class LiveSearchRoomItemModel {
     this.title,
     this.name,
     this.face,
-    this.online,
-    this.link,
     this.watchedShow,
   });
 
@@ -28,8 +24,6 @@ class LiveSearchRoomItemModel {
         title: json['title'] as String?,
         name: json['name'] as String?,
         face: json['face'] as String?,
-        online: json['online'] as int?,
-        link: json['link'] as String?,
         watchedShow: json['watched_show'] == null
             ? null
             : WatchedShow.fromJson(

lib/models_new/live/live_search/user_item.dart

@@ -5,7 +5,6 @@ class LiveSearchUserItemModel {
   String? areaName;
   int? fansNum;
   int? roomid;
-  String? link;
 
   LiveSearchUserItemModel({
     this.face,
@@ -14,7 +13,6 @@ class LiveSearchUserItemModel {
     this.areaName,
     this.fansNum,
     this.roomid,
-    this.link,
   });
 
   factory LiveSearchUserItemModel.fromJson(Map<String, dynamic> json) =>
@@ -25,6 +23,5 @@ class LiveSearchUserItemModel {
         areaName: json['areaName'] as String?,
         fansNum: json['fansNum'] as int?,
         roomid: json['roomid'] as int?,
-        link: json['link'] as String?,
       );
 }