opt handle res

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

lib/models/dynamics/article_content_model.dart

@@ -311,6 +311,7 @@ class Live {
 class Common {
   Common({
     this.cover,
+    this.desc,
     this.desc1,
     this.desc2,
     this.headText,
@@ -321,6 +322,7 @@ class Common {
     this.title,
   });
   String? cover;
+  String? desc;
   String? desc1;
   String? desc2;
   String? headText;
@@ -332,6 +334,7 @@ class Common {
 
   Common.fromJson(Map<String, dynamic> json) {
     cover = json['cover'];
+    desc = json['desc'];
     desc1 = json['desc1'];
     desc2 = json['desc2'];
     headText = json['head_text'];

lib/models/dynamics/dyn_reserve/data.dart

@@ -0,0 +1,31 @@
+class DynReserveData {
+  int? finalBtnStatus;
+  int? btnMode;
+  int? reserveUpdate;
+  String? descUpdate;
+  String? toast;
+
+  DynReserveData({
+    this.finalBtnStatus,
+    this.btnMode,
+    this.reserveUpdate,
+    this.descUpdate,
+    this.toast,
+  });
+
+  factory DynReserveData.fromJson(Map<String, dynamic> json) => DynReserveData(
+        finalBtnStatus: json['final_btn_status'] as int?,
+        btnMode: json['btn_mode'] as int?,
+        reserveUpdate: json['reserve_update'] as int?,
+        descUpdate: json['desc_update'] as String?,
+        toast: json['toast'] as String?,
+      );
+
+  Map<String, dynamic> toJson() => {
+        'final_btn_status': finalBtnStatus,
+        'btn_mode': btnMode,
+        'reserve_update': reserveUpdate,
+        'desc_update': descUpdate,
+        'toast': toast,
+      };
+}

lib/models/dynamics/result.dart

@@ -297,7 +297,7 @@ class ModuleAuthorModel extends Avatar {
   String? pubTime;
   int? pubTs;
   String? type;
-  Map? decorate;
+  Decorate? decorate;
 
   ModuleAuthorModel.fromJson(Map<String, dynamic> json) : super.fromJson(json) {
     if (json['official'] != null) {
@@ -311,13 +311,65 @@ class ModuleAuthorModel extends Avatar {
     pubTs = json['pub_ts'] == 0 ? null : json['pub_ts'];
     type = json['type'];
     if (PendantAvatar.showDynDecorate) {
-      decorate = json['decorate'];
+      decorate =
+          json['decorate'] == null ? null : Decorate.fromJson(json['decorate']);
     } else {
       pendant = null;
     }
   }
 }
 
+class Decorate {
+  String? cardUrl;
+  Fan? fan;
+  int? id;
+  String? jumpUrl;
+  String? name;
+  int? type;
+
+  Decorate({
+    this.cardUrl,
+    this.fan,
+    this.id,
+    this.jumpUrl,
+    this.name,
+    this.type,
+  });
+
+  factory Decorate.fromJson(Map<String, dynamic> json) => Decorate(
+        cardUrl: json["card_url"],
+        fan: json["fan"] == null ? null : Fan.fromJson(json["fan"]),
+        id: json["id"],
+        jumpUrl: json["jump_url"],
+        name: json["name"],
+        type: json["type"],
+      );
+}
+
+class Fan {
+  String? color;
+  bool? isFan;
+  String? numPrefix;
+  String? numStr;
+  int? number;
+
+  Fan({
+    this.color,
+    this.isFan,
+    this.numPrefix,
+    this.numStr,
+    this.number,
+  });
+
+  factory Fan.fromJson(Map<String, dynamic> json) => Fan(
+        color: json["color"],
+        isFan: json["is_fan"],
+        numPrefix: json["num_prefix"],
+        numStr: json["num_str"],
+        number: json["number"],
+      );
+}
+
 // 单个动态详情 - 动态信息
 class ModuleDynamicModel {
   ModuleDynamicModel({
@@ -843,10 +895,10 @@ class DynamicMajorModel {
   // MAJOR_TYPE_OPUS 图文/文章
   String? type;
   Map? courses;
-  Map? common;
+  Common? common;
   Map? music;
   ModuleBlocked? blocked;
-  Map? medialist;
+  Medialist? medialist;
 
   SubscriptionNew? subscriptionNew;
 
@@ -871,19 +923,39 @@ class DynamicMajorModel {
     none =
         json['none'] != null ? DynamicNoneModel.fromJson(json['none']) : null;
     type = json['type'];
-    courses = json['courses'] ?? {};
-    common = json['common'] ?? {};
-    music = json['music'] ?? {};
+    courses = json['courses'];
+    common = json['common'] == null ? null : Common.fromJson(json['common']);
+    music = json['music'];
     blocked = json['blocked'] == null
         ? null
         : ModuleBlocked.fromJson(json['blocked']);
-    medialist = json['medialist'];
+    medialist = json['medialist'] == null
+        ? null
+        : Medialist.fromJson(json['medialist']);
     subscriptionNew = json['subscription_new'] == null
         ? null
         : SubscriptionNew.fromJson(json['subscription_new']);
   }
 }
 
+class Medialist {
+  dynamic id;
+  String? cover;
+  String? title;
+  String? subTitle;
+  String? jumpUrl;
+  Badge? badge;
+
+  Medialist.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    cover = json['cover'];
+    title = json['title'];
+    subTitle = json['sub_title'];
+    jumpUrl = json['jump_url'];
+    badge = json['badge'] == null ? null : Badge.fromJson(json['badge']);
+  }
+}
+
 class SubscriptionNew {
   LiveRcmd? liveRcmd;
   String? style;
@@ -1004,18 +1076,12 @@ class WatchedShow {
   int? num;
   String? textSmall;
   String? textLarge;
-  String? icon;
-  String? iconLocation;
-  String? iconWeb;
 
   WatchedShow({
     this.watchedShowSwitch,
     this.num,
     this.textSmall,
     this.textLarge,
-    this.icon,
-    this.iconLocation,
-    this.iconWeb,
   });
 
   factory WatchedShow.fromJson(Map<String, dynamic> json) => WatchedShow(
@@ -1023,9 +1089,6 @@ class WatchedShow {
         num: json["num"],
         textSmall: json["text_small"],
         textLarge: json["text_large"],
-        icon: json["icon"],
-        iconLocation: json["icon_location"],
-        iconWeb: json["icon_web"],
       );
 }
 
@@ -1065,7 +1128,7 @@ class DynamicArchiveModel {
   });
 
   int? aid;
-  Map? badge;
+  Badge? badge;
   String? bvid;
   String? cover;
   String? desc;
@@ -1080,7 +1143,7 @@ class DynamicArchiveModel {
 
   DynamicArchiveModel.fromJson(Map<String, dynamic> json) {
     aid = json['aid'] is String ? int.parse(json['aid']) : json['aid'];
-    badge = json['badge'];
+    badge = json['badge'] == null ? null : Badge.fromJson(json['badge']);
     bvid = json['bvid'] ?? json['epid'].toString() ?? ' ';
     cover = json['cover'];
     disablePreview = json['disable_preview'];
@@ -1094,6 +1157,18 @@ class DynamicArchiveModel {
   }
 }
 
+class Badge {
+  Badge({
+    this.text,
+  });
+
+  String? text;
+
+  Badge.fromJson(Map<String, dynamic> json) {
+    text = json['text'];
+  }
+}
+
 class DynamicDrawModel {
   DynamicDrawModel({
     this.id,
@@ -1317,7 +1392,7 @@ class DynamicLive2Model {
     this.title,
   });
 
-  Map? badge;
+  Badge? badge;
   String? cover;
   String? descFirst;
   String? descSecond;
@@ -1328,7 +1403,7 @@ class DynamicLive2Model {
   String? title;
 
   DynamicLive2Model.fromJson(Map<String, dynamic> json) {
-    badge = json['badge'];
+    badge = json['badge'] == null ? null : Badge.fromJson(json['badge']);
     cover = json['cover'];
     descFirst = json['desc_first'];
     descSecond = json['desc_second'];