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?,
-      );
-}