opt model

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

lib/models_new/fav/fav_detail/cnt_info.dart

@@ -2,22 +2,40 @@ class CntInfo {
   int? collect;
   int? play;
   int? thumbUp;
+  int? thumbDown;
   int? share;
+  int? reply;
   int? danmaku;
+  int? coin;
+  int? vt;
+  int? playSwitch;
+  String? viewText1;
 
   CntInfo({
     this.collect,
     this.play,
     this.thumbUp,
+    this.thumbDown,
     this.share,
+    this.reply,
     this.danmaku,
+    this.coin,
+    this.vt,
+    this.playSwitch,
+    this.viewText1,
   });
 
   factory CntInfo.fromJson(Map<String, dynamic> json) => CntInfo(
         collect: json['collect'] as int?,
         play: json['play'] as int?,
         thumbUp: json['thumb_up'] as int?,
+        thumbDown: json['thumb_down'] as int?,
         share: json['share'] as int?,
+        reply: json['reply'] as int?,
         danmaku: json['danmaku'] as int?,
+        coin: json['coin'] as int?,
+        vt: json['vt'] as int?,
+        playSwitch: json['play_switch'] as int?,
+        viewText1: json['view_text_1'] as String?,
       );
 }

lib/models_new/fav/fav_detail/data.dart

@@ -1,8 +1,8 @@
 import 'package:PiliPlus/models_new/fav/fav_detail/media.dart';
-import 'package:PiliPlus/models_new/fav/fav_video/list.dart';
+import 'package:PiliPlus/models_new/fav/fav_folder/list.dart';
 
 class FavDetailData {
-  FavVideoItemModel? info;
+  FavFolderInfo? info;
   List<FavDetailItemModel>? medias;
   bool? hasMore;
   int? ttl;
@@ -12,7 +12,7 @@ class FavDetailData {
   factory FavDetailData.fromJson(Map<String, dynamic> json) => FavDetailData(
         info: json['info'] == null
             ? null
-            : FavVideoItemModel.fromJson(json['info'] as Map<String, dynamic>),
+            : FavFolderInfo.fromJson(json['info'] as Map<String, dynamic>),
         medias: (json['medias'] as List<dynamic>?)
             ?.map((e) => FavDetailItemModel.fromJson(e as Map<String, dynamic>))
             .toList(),

lib/models_new/fav/fav_detail/info.dart

@@ -1,5 +1,5 @@
+import 'package:PiliPlus/models/model_owner.dart';
 import 'package:PiliPlus/models_new/fav/fav_detail/cnt_info.dart';
-import 'package:PiliPlus/models_new/fav/fav_detail/upper.dart';
 
 class FavDetailInfo {
   int? id;
@@ -8,7 +8,7 @@ class FavDetailInfo {
   int? attr;
   String? title;
   String? cover;
-  Upper? upper;
+  Owner? upper;
   int? coverType;
   CntInfo? cntInfo;
   int? type;
@@ -51,7 +51,7 @@ class FavDetailInfo {
         cover: json['cover'] as String?,
         upper: json['upper'] == null
             ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
         coverType: json['cover_type'] as int?,
         cntInfo: json['cnt_info'] == null
             ? null

lib/models_new/fav/fav_detail/media.dart

@@ -1,7 +1,7 @@
+import 'package:PiliPlus/models/model_owner.dart';
 import 'package:PiliPlus/models_new/fav/fav_detail/cnt_info.dart';
 import 'package:PiliPlus/models_new/fav/fav_detail/ogv.dart';
 import 'package:PiliPlus/models_new/fav/fav_detail/ugc.dart';
-import 'package:PiliPlus/models_new/fav/fav_detail/upper.dart';
 import 'package:PiliPlus/pages/common/multi_select_controller.dart';
 
 class FavDetailItemModel with MultiSelectData {
@@ -12,7 +12,7 @@ class FavDetailItemModel with MultiSelectData {
   String? intro;
   int? page;
   int? duration;
-  Upper? upper;
+  Owner? upper;
   int? attr;
   CntInfo? cntInfo;
   String? link;
@@ -56,7 +56,7 @@ class FavDetailItemModel with MultiSelectData {
         duration: json['duration'] as int?,
         upper: json['upper'] == null
             ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
         attr: json['attr'] as int?,
         cntInfo: json['cnt_info'] == null
             ? null

lib/models_new/fav/fav_detail/upper.dart

@@ -1,26 +0,0 @@
-class Upper {
-  int? mid;
-  String? name;
-  String? face;
-  bool? followed;
-  int? vipType;
-  int? vipStatue;
-
-  Upper({
-    this.mid,
-    this.name,
-    this.face,
-    this.followed,
-    this.vipType,
-    this.vipStatue,
-  });
-
-  factory Upper.fromJson(Map<String, dynamic> json) => Upper(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        followed: json['followed'] as bool?,
-        vipType: json['vip_type'] as int?,
-        vipStatue: json['vip_statue'] as int?,
-      );
-}

lib/models_new/fav/fav_folder/data.dart

@@ -0,0 +1,17 @@
+import 'package:PiliPlus/models_new/fav/fav_folder/list.dart';
+
+class FavFolderData {
+  int? count;
+  List<FavFolderInfo>? list;
+  bool? hasMore;
+
+  FavFolderData({this.count, this.list, this.hasMore});
+
+  factory FavFolderData.fromJson(Map<String, dynamic> json) => FavFolderData(
+        count: json['count'] as int?,
+        list: (json['list'] as List<dynamic>?)
+            ?.map((e) => FavFolderInfo.fromJson(e as Map<String, dynamic>))
+            .toList(),
+        hasMore: json['has_more'] as bool?,
+      );
+}

lib/models_new/fav/fav_folder/list.dart

@@ -1,21 +1,21 @@
-import 'package:PiliPlus/models_new/fav/fav_video/upper.dart';
+import 'package:PiliPlus/models/model_owner.dart';
 
-class FavVideoItemModel {
-  int? id;
+class FavFolderInfo {
+  int id;
   int? fid;
-  int? mid;
-  int? attr;
+  int mid;
+  int attr;
   String? attrDesc;
-  String? title;
-  String? cover;
-  Upper? upper;
+  String title;
+  String cover;
+  Owner? upper;
   int? coverType;
   String? intro;
   int? ctime;
   int? mtime;
   int? state;
   int? favState;
-  int? mediaCount;
+  int mediaCount;
   int? viewCount;
   int? vt;
   bool? isTop;
@@ -25,14 +25,14 @@ class FavVideoItemModel {
   String? link;
   String? bvid;
 
-  FavVideoItemModel({
-    this.id,
+  FavFolderInfo({
+    this.id = 0,
     this.fid,
-    this.mid,
-    this.attr,
+    this.mid = 0,
+    this.attr = -1,
     this.attrDesc,
-    this.title,
-    this.cover,
+    this.title = '',
+    this.cover = '',
     this.upper,
     this.coverType,
     this.intro,
@@ -40,7 +40,7 @@ class FavVideoItemModel {
     this.mtime,
     this.state,
     this.favState,
-    this.mediaCount,
+    this.mediaCount = 0,
     this.viewCount,
     this.vt,
     this.isTop,
@@ -51,25 +51,24 @@ class FavVideoItemModel {
     this.bvid,
   });
 
-  factory FavVideoItemModel.fromJson(Map<String, dynamic> json) =>
-      FavVideoItemModel(
-        id: json['id'] as int?,
+  factory FavFolderInfo.fromJson(Map<String, dynamic> json) => FavFolderInfo(
+        id: json['id'] as int? ?? 0,
         fid: json['fid'] as int?,
-        mid: json['mid'] as int?,
-        attr: json['attr'] as int?,
+        mid: json['mid'] as int? ?? 0,
+        attr: json['attr'] as int? ?? 0,
         attrDesc: json['attr_desc'] as String?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
+        title: json['title'] as String? ?? '',
+        cover: json['cover'] as String? ?? '',
         upper: json['upper'] == null
             ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
         coverType: json['cover_type'] as int?,
         intro: json['intro'] as String?,
         ctime: json['ctime'] as int?,
         mtime: json['mtime'] as int?,
         state: json['state'] as int?,
         favState: json['fav_state'] as int?,
-        mediaCount: json['media_count'] as int?,
+        mediaCount: json['media_count'] as int? ?? 0,
         viewCount: json['view_count'] as int?,
         vt: json['vt'] as int?,
         isTop: json['is_top'] as bool?,

lib/models_new/fav/fav_folder_info/cnt_info.dart

@@ -1,15 +0,0 @@
-class CntInfo {
-  int? collect;
-  int? play;
-  int? thumbUp;
-  int? share;
-
-  CntInfo({this.collect, this.play, this.thumbUp, this.share});
-
-  factory CntInfo.fromJson(Map<String, dynamic> json) => CntInfo(
-        collect: json['collect'] as int?,
-        play: json['play'] as int?,
-        thumbUp: json['thumb_up'] as int?,
-        share: json['share'] as int?,
-      );
-}

lib/models_new/fav/fav_folder_info/data.dart

@@ -1,69 +0,0 @@
-import 'package:PiliPlus/models_new/fav/fav_folder_info/cnt_info.dart';
-import 'package:PiliPlus/models_new/fav/fav_folder_info/upper.dart';
-
-class FolderInfo {
-  int? id;
-  int? fid;
-  int? mid;
-  int? attr;
-  String? title;
-  String? cover;
-  Upper? upper;
-  int? coverType;
-  CntInfo? cntInfo;
-  int? type;
-  String? intro;
-  int? ctime;
-  int? mtime;
-  int? state;
-  int? favState;
-  int? likeState;
-  int? mediaCount;
-  bool? isTop;
-
-  FolderInfo({
-    this.id,
-    this.fid,
-    this.mid,
-    this.attr,
-    this.title,
-    this.cover,
-    this.upper,
-    this.coverType,
-    this.cntInfo,
-    this.type,
-    this.intro,
-    this.ctime,
-    this.mtime,
-    this.state,
-    this.favState,
-    this.likeState,
-    this.mediaCount,
-    this.isTop,
-  });
-
-  factory FolderInfo.fromJson(Map<String, dynamic> json) => FolderInfo(
-        id: json['id'] as int?,
-        fid: json['fid'] as int?,
-        mid: json['mid'] as int?,
-        attr: json['attr'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        upper: json['upper'] == null
-            ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
-        coverType: json['cover_type'] as int?,
-        cntInfo: json['cnt_info'] == null
-            ? null
-            : CntInfo.fromJson(json['cnt_info'] as Map<String, dynamic>),
-        type: json['type'] as int?,
-        intro: json['intro'] as String?,
-        ctime: json['ctime'] as int?,
-        mtime: json['mtime'] as int?,
-        state: json['state'] as int?,
-        favState: json['fav_state'] as int?,
-        likeState: json['like_state'] as int?,
-        mediaCount: json['media_count'] as int?,
-        isTop: json['is_top'] as bool?,
-      );
-}

lib/models_new/fav/fav_folder_info/upper.dart

@@ -1,26 +0,0 @@
-class Upper {
-  int? mid;
-  String? name;
-  String? face;
-  bool? followed;
-  int? vipType;
-  int? vipStatue;
-
-  Upper({
-    this.mid,
-    this.name,
-    this.face,
-    this.followed,
-    this.vipType,
-    this.vipStatue,
-  });
-
-  factory Upper.fromJson(Map<String, dynamic> json) => Upper(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        followed: json['followed'] as bool?,
-        vipType: json['vip_type'] as int?,
-        vipStatue: json['vip_statue'] as int?,
-      );
-}

lib/models_new/fav/fav_video/data.dart

@@ -1,17 +0,0 @@
-import 'package:PiliPlus/models_new/fav/fav_video/list.dart';
-
-class FavVideoData {
-  int? count;
-  List<FavVideoItemModel>? list;
-  bool? hasMore;
-
-  FavVideoData({this.count, this.list, this.hasMore});
-
-  factory FavVideoData.fromJson(Map<String, dynamic> json) => FavVideoData(
-        count: json['count'] as int?,
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FavVideoItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-      );
-}

lib/models_new/fav/fav_video/upper.dart

@@ -1,15 +0,0 @@
-class Upper {
-  int? mid;
-  String? name;
-  String? face;
-  String? jumpLink;
-
-  Upper({this.mid, this.name, this.face, this.jumpLink});
-
-  factory Upper.fromJson(Map<String, dynamic> json) => Upper(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        jumpLink: json['jump_link'] as String?,
-      );
-}

lib/models_new/media_list/cnt_info.dart

@@ -1,41 +0,0 @@
-class CntInfo {
-  int? collect;
-  int? play;
-  int? thumbUp;
-  int? thumbDown;
-  int? share;
-  int? reply;
-  int? danmaku;
-  int? coin;
-  int? vt;
-  int? playSwitch;
-  String? viewText1;
-
-  CntInfo({
-    this.collect,
-    this.play,
-    this.thumbUp,
-    this.thumbDown,
-    this.share,
-    this.reply,
-    this.danmaku,
-    this.coin,
-    this.vt,
-    this.playSwitch,
-    this.viewText1,
-  });
-
-  factory CntInfo.fromJson(Map<String, dynamic> json) => CntInfo(
-        collect: json['collect'] as int?,
-        play: json['play'] as int?,
-        thumbUp: json['thumb_up'] as int?,
-        thumbDown: json['thumb_down'] as int?,
-        share: json['share'] as int?,
-        reply: json['reply'] as int?,
-        danmaku: json['danmaku'] as int?,
-        coin: json['coin'] as int?,
-        vt: json['vt'] as int?,
-        playSwitch: json['play_switch'] as int?,
-        viewText1: json['view_text_1'] as String?,
-      );
-}

lib/models_new/media_list/media_list.dart

@@ -1,10 +1,10 @@
+import 'package:PiliPlus/models/model_owner.dart';
+import 'package:PiliPlus/models_new/fav/fav_detail/cnt_info.dart';
 import 'package:PiliPlus/models_new/media_list/badge.dart';
-import 'package:PiliPlus/models_new/media_list/cnt_info.dart';
 import 'package:PiliPlus/models_new/media_list/coin.dart';
 import 'package:PiliPlus/models_new/media_list/ogv_info.dart';
 import 'package:PiliPlus/models_new/media_list/page.dart';
 import 'package:PiliPlus/models_new/media_list/rights.dart';
-import 'package:PiliPlus/models_new/media_list/upper.dart';
 import 'package:PiliPlus/utils/extension.dart';
 
 class MediaListItemModel {
@@ -26,7 +26,7 @@ class MediaListItemModel {
   List<Page>? pages;
   String? title;
   int? type;
-  Upper? upper;
+  Owner? upper;
   String? link;
   String? bvid;
   String? shortLink;
@@ -94,7 +94,7 @@ class MediaListItemModel {
     pages = (json['pages'] as List?)?.map((e) => Page.fromJson(e)).toList();
     title = json['title'] as String?;
     type = json['type'] as int?;
-    upper = json['upper'] == null ? null : Upper.fromJson(json['upper']);
+    upper = json['upper'] == null ? null : Owner.fromJson(json['upper']);
     link = json['link'] as String?;
     bvid = json['bv_id'] as String?;
     shortLink = json['short_link'] as String?;

lib/models_new/media_list/upper.dart

@@ -1,47 +0,0 @@
-class Upper {
-  int? mid;
-  String? name;
-  String? face;
-  int? followed;
-  int? fans;
-  int? vipType;
-  int? vipStatue;
-  int? vipDueDate;
-  int? vipPayType;
-  int? officialRole;
-  String? officialTitle;
-  String? officialDesc;
-  String? displayName;
-
-  Upper({
-    this.mid,
-    this.name,
-    this.face,
-    this.followed,
-    this.fans,
-    this.vipType,
-    this.vipStatue,
-    this.vipDueDate,
-    this.vipPayType,
-    this.officialRole,
-    this.officialTitle,
-    this.officialDesc,
-    this.displayName,
-  });
-
-  factory Upper.fromJson(Map<String, dynamic> json) => Upper(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        followed: json['followed'] as int?,
-        fans: json['fans'] as int?,
-        vipType: json['vip_type'] as int?,
-        vipStatue: json['vip_statue'] as int?,
-        vipDueDate: json['vip_due_date'] as int?,
-        vipPayType: json['vip_pay_type'] as int?,
-        officialRole: json['official_role'] as int?,
-        officialTitle: json['official_title'] as String?,
-        officialDesc: json['official_desc'] as String?,
-        displayName: json['display_name'] as String?,
-      );
-}

lib/models_new/space/space_fav/list.dart

@@ -1,4 +1,4 @@
-import 'package:PiliPlus/models_new/space/space_fav/upper.dart';
+import 'package:PiliPlus/models/model_owner.dart';
 
 class SpaceFavItemModel {
   int? id;
@@ -11,7 +11,7 @@ class SpaceFavItemModel {
   String? attrDesc;
   String? title;
   String? cover;
-  Upper? upper;
+  Owner? upper;
   int? coverType;
   String? intro;
   int? ctime;
@@ -71,7 +71,7 @@ class SpaceFavItemModel {
         cover: json['cover'] as String?,
         upper: json['upper'] == null
             ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
         coverType: json['cover_type'] as int?,
         intro: json['intro'] as String?,
         ctime: json['ctime'] as int?,

lib/models_new/space/space_fav/upper.dart

@@ -1,15 +0,0 @@
-class Upper {
-  int? mid;
-  String? name;
-  String? face;
-  String? jumpLink;
-
-  Upper({this.mid, this.name, this.face, this.jumpLink});
-
-  factory Upper.fromJson(Map<String, dynamic> json) => Upper(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        jumpLink: json['jump_link'] as String?,
-      );
-}

lib/models_new/sub/sub/list.dart

@@ -1,4 +1,4 @@
-import 'package:PiliPlus/models_new/sub/sub/upper.dart';
+import 'package:PiliPlus/models/model_owner.dart';
 
 class SubItemModel {
   int? id;
@@ -8,7 +8,7 @@ class SubItemModel {
   String? attrDesc;
   String? title;
   String? cover;
-  Upper? upper;
+  Owner? upper;
   int? coverType;
   String? intro;
   int? ctime;
@@ -61,7 +61,7 @@ class SubItemModel {
         cover: json['cover'] as String?,
         upper: json['upper'] == null
             ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
         coverType: json['cover_type'] as int?,
         intro: json['intro'] as String?,
         ctime: json['ctime'] as int?,

lib/models_new/sub/sub/upper.dart

@@ -1,15 +0,0 @@
-class Upper {
-  int? mid;
-  String? name;
-  String? face;
-  String? jumpLink;
-
-  Upper({this.mid, this.name, this.face, this.jumpLink});
-
-  factory Upper.fromJson(Map<String, dynamic> json) => Upper(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        jumpLink: json['jump_link'] as String?,
-      );
-}

lib/models_new/sub/sub_detail/cnt_info.dart

@@ -1,15 +0,0 @@
-class CntInfo {
-  int? collect;
-  int? play;
-  int? danmaku;
-  int? vt;
-
-  CntInfo({this.collect, this.play, this.danmaku, this.vt});
-
-  factory CntInfo.fromJson(Map<String, dynamic> json) => CntInfo(
-        collect: json['collect'] as int?,
-        play: json['play'] as int?,
-        danmaku: json['danmaku'] as int?,
-        vt: json['vt'] as int?,
-      );
-}

lib/models_new/sub/sub_detail/info.dart

@@ -1,12 +1,12 @@
-import 'package:PiliPlus/models_new/sub/sub_detail/cnt_info.dart';
-import 'package:PiliPlus/models_new/sub/sub_detail/upper.dart';
+import 'package:PiliPlus/models/model_owner.dart';
+import 'package:PiliPlus/models_new/fav/fav_detail/cnt_info.dart';
 
 class Info {
   int? id;
   int? seasonType;
   String? title;
   String? cover;
-  Upper? upper;
+  Owner? upper;
   CntInfo? cntInfo;
   int? mediaCount;
   String? intro;
@@ -31,7 +31,7 @@ class Info {
         cover: json['cover'] as String?,
         upper: json['upper'] == null
             ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
         cntInfo: json['cnt_info'] == null
             ? null
             : CntInfo.fromJson(json['cnt_info'] as Map<String, dynamic>),

lib/models_new/sub/sub_detail/media.dart

@@ -1,5 +1,5 @@
-import 'package:PiliPlus/models_new/sub/sub_detail/cnt_info.dart';
-import 'package:PiliPlus/models_new/sub/sub_detail/upper.dart';
+import 'package:PiliPlus/models/model_owner.dart';
+import 'package:PiliPlus/models_new/fav/fav_detail/cnt_info.dart';
 
 class SubDetailItemModel {
   int? id;
@@ -8,7 +8,7 @@ class SubDetailItemModel {
   int? duration;
   int? pubtime;
   String? bvid;
-  Upper? upper;
+  Owner? upper;
   CntInfo? cntInfo;
   int? enableVt;
   String? vtDisplay;
@@ -38,7 +38,7 @@ class SubDetailItemModel {
         bvid: json['bvid'] as String?,
         upper: json['upper'] == null
             ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
         cntInfo: json['cnt_info'] == null
             ? null
             : CntInfo.fromJson(json['cnt_info'] as Map<String, dynamic>),

lib/models_new/sub/sub_detail/upper.dart

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