reformat

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

lib/models_new/fav/fav_article/author.dart

@@ -6,8 +6,8 @@ class Author {
   Author({this.name, this.face, this.mid});
 
   factory Author.fromJson(Map<String, dynamic> json) => Author(
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        mid: json['mid'] as String?,
-      );
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+    mid: json['mid'] as String?,
+  );
 }

lib/models_new/fav/fav_article/cover.dart

@@ -6,8 +6,8 @@ class Cover {
   Cover({this.url, this.width, this.height});
 
   factory Cover.fromJson(Map<String, dynamic> json) => Cover(
-        url: json['url'] as String?,
-        width: json['width'] as int?,
-        height: json['height'] as int?,
-      );
+    url: json['url'] as String?,
+    width: json['width'] as int?,
+    height: json['height'] as int?,
+  );
 }

lib/models_new/fav/fav_article/data.dart

@@ -16,13 +16,12 @@ class FavArticleData {
   });
 
   factory FavArticleData.fromJson(Map<String, dynamic> json) => FavArticleData(
-        items: (json['items'] as List<dynamic>?)
-            ?.map(
-                (e) => FavArticleItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-        offset: json['offset'] as String?,
-        updateNum: json['update_num'] as String?,
-        updateBaseline: json['update_baseline'] as String?,
-      );
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => FavArticleItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hasMore: json['has_more'] as bool?,
+    offset: json['offset'] as String?,
+    updateNum: json['update_num'] as String?,
+    updateBaseline: json['update_baseline'] as String?,
+  );
 }

lib/models_new/fav/fav_article/stat.dart

@@ -5,7 +5,7 @@ class Stat {
   Stat({this.view, this.like});
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        view: json['view'] as String?,
-        like: json['like'] as String?,
-      );
+    view: json['view'] as String?,
+    like: json['like'] as String?,
+  );
 }

lib/models_new/fav/fav_detail/cnt_info.dart

@@ -26,16 +26,16 @@ class CntInfo {
   });
 
   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 num?,
-        vt: json['vt'] as int?,
-        playSwitch: json['play_switch'] as int?,
-        viewText1: json['view_text_1'] as String?,
-      );
+    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 num?,
+    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

@@ -10,13 +10,13 @@ class FavDetailData {
   FavDetailData({this.info, this.medias, this.hasMore, this.ttl});
 
   factory FavDetailData.fromJson(Map<String, dynamic> json) => FavDetailData(
-        info: json['info'] == null
-            ? null
-            : FavFolderInfo.fromJson(json['info'] as Map<String, dynamic>),
-        medias: (json['medias'] as List<dynamic>?)
-            ?.map((e) => FavDetailItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-        ttl: json['ttl'] as int?,
-      );
+    info: json['info'] == null
+        ? null
+        : FavFolderInfo.fromJson(json['info'] as Map<String, dynamic>),
+    medias: (json['medias'] as List<dynamic>?)
+        ?.map((e) => FavDetailItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hasMore: json['has_more'] as bool?,
+    ttl: json['ttl'] as int?,
+  );
 }

lib/models_new/fav/fav_detail/info.dart

@@ -43,27 +43,27 @@ class FavDetailInfo {
   });
 
   factory FavDetailInfo.fromJson(Map<String, dynamic> json) => FavDetailInfo(
-        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
-            : Owner.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?,
-      );
+    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
+        : Owner.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_detail/ogv.dart

@@ -10,8 +10,8 @@ class Ogv {
   });
 
   factory Ogv.fromJson(Map<String, dynamic> json) => Ogv(
-        typeName: json['type_name'],
-        typeId: json['type_id'],
-        seasonId: json['season_id'],
-      );
+    typeName: json['type_name'],
+    typeId: json['type_id'],
+    seasonId: json['season_id'],
+  );
 }

lib/models_new/fav/fav_detail/ugc.dart

@@ -4,6 +4,6 @@ class Ugc {
   Ugc({this.firstCid});
 
   factory Ugc.fromJson(Map<String, dynamic> json) => Ugc(
-        firstCid: json['first_cid'] as int?,
-      );
+    firstCid: json['first_cid'] as int?,
+  );
 }

lib/models_new/fav/fav_folder/data.dart

@@ -8,10 +8,10 @@ class FavFolderData {
   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?,
-      );
+    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

@@ -52,30 +52,30 @@ class FavFolderInfo {
   });
 
   factory FavFolderInfo.fromJson(Map<String, dynamic> json) => FavFolderInfo(
-        id: json['id'] as int? ?? 0,
-        fid: json['fid'] 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? ?? '',
-        upper: json['upper'] == null
-            ? null
-            : 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? ?? 0,
-        viewCount: json['view_count'] as int?,
-        vt: json['vt'] as int?,
-        isTop: json['is_top'] as bool?,
-        recentFav: json['recent_fav'] as dynamic,
-        playSwitch: json['play_switch'] as int?,
-        type: json['type'] as int?,
-        link: json['link'] as String?,
-        bvid: json['bvid'] as String?,
-      );
+    id: json['id'] as int? ?? 0,
+    fid: json['fid'] 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? ?? '',
+    upper: json['upper'] == null
+        ? null
+        : 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? ?? 0,
+    viewCount: json['view_count'] as int?,
+    vt: json['vt'] as int?,
+    isTop: json['is_top'] as bool?,
+    recentFav: json['recent_fav'] as dynamic,
+    playSwitch: json['play_switch'] as int?,
+    type: json['type'] as int?,
+    link: json['link'] as String?,
+    bvid: json['bvid'] as String?,
+  );
 }

lib/models_new/fav/fav_note/arc.dart

@@ -18,12 +18,12 @@ class Arc {
   });
 
   factory Arc.fromJson(Map<String, dynamic> json) => Arc(
-        oid: json['oid'] as int?,
-        bvid: json['bvid'] as String?,
-        pic: json['pic'] as String?,
-        desc: json['desc'] as String?,
-        status: json['status'] as int?,
-        oidType: json['oid_type'] as int?,
-        aid: json['aid'] as int?,
-      );
+    oid: json['oid'] as int?,
+    bvid: json['bvid'] as String?,
+    pic: json['pic'] as String?,
+    desc: json['desc'] as String?,
+    status: json['status'] as int?,
+    oidType: json['oid_type'] as int?,
+    aid: json['aid'] as int?,
+  );
 }

lib/models_new/fav/fav_note/data.dart

@@ -8,11 +8,11 @@ class FavNoteData {
   FavNoteData({this.list, this.page});
 
   factory FavNoteData.fromJson(Map<String, dynamic> json) => FavNoteData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FavNoteItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        page: json['page'] == null
-            ? null
-            : Page.fromJson(json['page'] as Map<String, dynamic>),
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => FavNoteItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    page: json['page'] == null
+        ? null
+        : Page.fromJson(json['page'] as Map<String, dynamic>),
+  );
 }

lib/models_new/fav/fav_note/page.dart

@@ -6,8 +6,8 @@ class Page {
   Page({this.total, this.size, this.num});
 
   factory Page.fromJson(Map<String, dynamic> json) => Page(
-        total: json['total'] as int?,
-        size: json['size'] as int?,
-        num: json['num'] as int?,
-      );
+    total: json['total'] as int?,
+    size: json['size'] as int?,
+    num: json['num'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/area.dart

@@ -5,7 +5,7 @@ class Area {
   Area({this.id, this.name});
 
   factory Area.fromJson(Map<String, dynamic> json) => Area(
-        id: json['id'] as int?,
-        name: json['name'] as String?,
-      );
+    id: json['id'] as int?,
+    name: json['name'] as String?,
+  );
 }

lib/models_new/fav/fav_pgc/badge_info.dart

@@ -16,12 +16,12 @@ class BadgeInfo {
   });
 
   factory BadgeInfo.fromJson(Map<String, dynamic> json) => BadgeInfo(
-        text: json['text'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        img: json['img'] as String?,
-        multiImg: json['multi_img'] == null
-            ? null
-            : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
-      );
+    text: json['text'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    img: json['img'] as String?,
+    multiImg: json['multi_img'] == null
+        ? null
+        : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
+  );
 }

lib/models_new/fav/fav_pgc/badge_infos.dart

@@ -8,12 +8,11 @@ class BadgeInfos {
   BadgeInfos({this.contentAttr, this.vipOrPay});
 
   factory BadgeInfos.fromJson(Map<String, dynamic> json) => BadgeInfos(
-        contentAttr: json['content_attr'] == null
-            ? null
-            : ContentAttr.fromJson(
-                json['content_attr'] as Map<String, dynamic>),
-        vipOrPay: json['vip_or_pay'] == null
-            ? null
-            : VipOrPay.fromJson(json['vip_or_pay'] as Map<String, dynamic>),
-      );
+    contentAttr: json['content_attr'] == null
+        ? null
+        : ContentAttr.fromJson(json['content_attr'] as Map<String, dynamic>),
+    vipOrPay: json['vip_or_pay'] == null
+        ? null
+        : VipOrPay.fromJson(json['vip_or_pay'] as Map<String, dynamic>),
+  );
 }

lib/models_new/fav/fav_pgc/cc_on_lock.dart

@@ -4,6 +4,6 @@ class CcOnLock {
   CcOnLock({this.typeUrl});
 
   factory CcOnLock.fromJson(Map<String, dynamic> json) => CcOnLock(
-        typeUrl: json['type_url'] as String?,
-      );
+    typeUrl: json['type_url'] as String?,
+  );
 }

lib/models_new/fav/fav_pgc/config_attrs.dart

@@ -17,20 +17,23 @@ class ConfigAttrs {
   });
 
   factory ConfigAttrs.fromJson(Map<String, dynamic> json) => ConfigAttrs(
-        ccOnLock: json['cc_on_lock'] == null
-            ? null
-            : CcOnLock.fromJson(json['cc_on_lock'] as Map<String, dynamic>),
-        highlightIneffectiveHd: json['highlight_ineffective_hd'] == null
-            ? null
-            : HighlightIneffectiveHd.fromJson(
-                json['highlight_ineffective_hd'] as Map<String, dynamic>),
-        highlightIneffectiveOtt: json['highlight_ineffective_ott'] == null
-            ? null
-            : HighlightIneffectiveOtt.fromJson(
-                json['highlight_ineffective_ott'] as Map<String, dynamic>),
-        highlightIneffectivePink: json['highlight_ineffective_pink'] == null
-            ? null
-            : HighlightIneffectivePink.fromJson(
-                json['highlight_ineffective_pink'] as Map<String, dynamic>),
-      );
+    ccOnLock: json['cc_on_lock'] == null
+        ? null
+        : CcOnLock.fromJson(json['cc_on_lock'] as Map<String, dynamic>),
+    highlightIneffectiveHd: json['highlight_ineffective_hd'] == null
+        ? null
+        : HighlightIneffectiveHd.fromJson(
+            json['highlight_ineffective_hd'] as Map<String, dynamic>,
+          ),
+    highlightIneffectiveOtt: json['highlight_ineffective_ott'] == null
+        ? null
+        : HighlightIneffectiveOtt.fromJson(
+            json['highlight_ineffective_ott'] as Map<String, dynamic>,
+          ),
+    highlightIneffectivePink: json['highlight_ineffective_pink'] == null
+        ? null
+        : HighlightIneffectivePink.fromJson(
+            json['highlight_ineffective_pink'] as Map<String, dynamic>,
+          ),
+  );
 }

lib/models_new/fav/fav_pgc/content_attr.dart

@@ -16,12 +16,12 @@ class ContentAttr {
   });
 
   factory ContentAttr.fromJson(Map<String, dynamic> json) => ContentAttr(
-        text: json['text'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        img: json['img'] as String?,
-        multiImg: json['multi_img'] == null
-            ? null
-            : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
-      );
+    text: json['text'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    img: json['img'] as String?,
+    multiImg: json['multi_img'] == null
+        ? null
+        : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
+  );
 }

lib/models_new/fav/fav_pgc/data.dart

@@ -9,11 +9,11 @@ class FavPgcData {
   FavPgcData({this.list, this.pn, this.ps, this.total});
 
   factory FavPgcData.fromJson(Map<String, dynamic> json) => FavPgcData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FavPgcItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        pn: json['pn'] as int?,
-        ps: json['ps'] as int?,
-        total: json['total'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => FavPgcItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    pn: json['pn'] as int?,
+    ps: json['ps'] as int?,
+    total: json['total'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/first_ep_info.dart

@@ -16,11 +16,11 @@ class FirstEpInfo {
   });
 
   factory FirstEpInfo.fromJson(Map<String, dynamic> json) => FirstEpInfo(
-        id: json['id'] as int?,
-        cover: json['cover'] as String?,
-        title: json['title'] as String?,
-        longTitle: json['long_title'] as String?,
-        pubTime: json['pub_time'] as String?,
-        duration: json['duration'] as int?,
-      );
+    id: json['id'] as int?,
+    cover: json['cover'] as String?,
+    title: json['title'] as String?,
+    longTitle: json['long_title'] as String?,
+    pubTime: json['pub_time'] as String?,
+    duration: json['duration'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/list.dart

@@ -123,87 +123,86 @@ class FavPgcItemModel with MultiSelectData {
     this.subtitle25,
   });
 
-  factory FavPgcItemModel.fromJson(Map<String, dynamic> json) =>
-      FavPgcItemModel(
-        seasonId: json['season_id'] as int?,
-        mediaId: json['media_id'] as int?,
-        seasonType: json['season_type'] as int?,
-        seasonTypeName: json['season_type_name'] as String?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        totalCount: json['total_count'] as int?,
-        isFinish: json['is_finish'] as int?,
-        isStarted: json['is_started'] as int?,
-        isPlay: json['is_play'] as int?,
-        badge: json['badge'] as String?,
-        badgeType: json['badge_type'] as int?,
-        rights: json['rights'] == null
-            ? null
-            : Rights.fromJson(json['rights'] as Map<String, dynamic>),
-        stat: json['stat'] == null
-            ? null
-            : Stat.fromJson(json['stat'] as Map<String, dynamic>),
-        newEp: json['new_ep'] == null
-            ? null
-            : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
-        rating: json['rating'] == null
-            ? null
-            : Rating.fromJson(json['rating'] as Map<String, dynamic>),
-        squareCover: json['square_cover'] as String?,
-        seasonStatus: json['season_status'] as int?,
-        seasonTitle: json['season_title'] as String?,
-        badgeEp: json['badge_ep'] as String?,
-        mediaAttr: json['media_attr'] as int?,
-        seasonAttr: json['season_attr'] as int?,
-        evaluate: json['evaluate'] as String?,
-        areas: (json['areas'] as List<dynamic>?)
-            ?.map((e) => Area.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        subtitle: json['subtitle'] as String?,
-        firstEp: json['first_ep'] as int?,
-        canWatch: json['can_watch'] as int?,
-        series: json['series'] == null
-            ? null
-            : Series.fromJson(json['series'] as Map<String, dynamic>),
-        publish: json['publish'] == null
-            ? null
-            : Publish.fromJson(json['publish'] as Map<String, dynamic>),
-        mode: json['mode'] as int?,
-        section: (json['section'] as List<dynamic>?)
-            ?.map((e) => Section.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        url: json['url'] as String?,
-        badgeInfo: json['badge_info'] == null
-            ? null
-            : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
-        renewalTime: json['renewal_time'] as String?,
-        firstEpInfo: json['first_ep_info'] == null
-            ? null
-            : FirstEpInfo.fromJson(
-                json['first_ep_info'] as Map<String, dynamic>),
-        formalEpCount: json['formal_ep_count'] as int?,
-        shortUrl: json['short_url'] as String?,
-        badgeInfos: json['badge_infos'] == null
-            ? null
-            : BadgeInfos.fromJson(json['badge_infos'] as Map<String, dynamic>),
-        seasonVersion: json['season_version'] as String?,
-        horizontalCover169: json['horizontal_cover_16_9'] as String?,
-        horizontalCover1610: json['horizontal_cover_16_10'] as String?,
-        subtitle14: json['subtitle_14'] as String?,
-        viewableCrowdType: json['viewable_crowd_type'] as int?,
-        producers: (json['producers'] as List<dynamic>?)
-            ?.map((e) => Producer.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        summary: json['summary'] as String?,
-        styles: (json['styles'] as List?)?.cast(),
-        configAttrs: json['config_attrs'] == null
-            ? null
-            : ConfigAttrs.fromJson(
-                json['config_attrs'] as Map<String, dynamic>),
-        followStatus: json['follow_status'] as int?,
-        isNew: json['is_new'] as int?,
-        progress: json['progress'] == '' ? null : json['progress'],
-        bothFollow: json['both_follow'] as bool?,
-        subtitle25: json['subtitle_25'] as String?,
-      );
+  factory FavPgcItemModel.fromJson(
+    Map<String, dynamic> json,
+  ) => FavPgcItemModel(
+    seasonId: json['season_id'] as int?,
+    mediaId: json['media_id'] as int?,
+    seasonType: json['season_type'] as int?,
+    seasonTypeName: json['season_type_name'] as String?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    totalCount: json['total_count'] as int?,
+    isFinish: json['is_finish'] as int?,
+    isStarted: json['is_started'] as int?,
+    isPlay: json['is_play'] as int?,
+    badge: json['badge'] as String?,
+    badgeType: json['badge_type'] as int?,
+    rights: json['rights'] == null
+        ? null
+        : Rights.fromJson(json['rights'] as Map<String, dynamic>),
+    stat: json['stat'] == null
+        ? null
+        : Stat.fromJson(json['stat'] as Map<String, dynamic>),
+    newEp: json['new_ep'] == null
+        ? null
+        : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
+    rating: json['rating'] == null
+        ? null
+        : Rating.fromJson(json['rating'] as Map<String, dynamic>),
+    squareCover: json['square_cover'] as String?,
+    seasonStatus: json['season_status'] as int?,
+    seasonTitle: json['season_title'] as String?,
+    badgeEp: json['badge_ep'] as String?,
+    mediaAttr: json['media_attr'] as int?,
+    seasonAttr: json['season_attr'] as int?,
+    evaluate: json['evaluate'] as String?,
+    areas: (json['areas'] as List<dynamic>?)
+        ?.map((e) => Area.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    subtitle: json['subtitle'] as String?,
+    firstEp: json['first_ep'] as int?,
+    canWatch: json['can_watch'] as int?,
+    series: json['series'] == null
+        ? null
+        : Series.fromJson(json['series'] as Map<String, dynamic>),
+    publish: json['publish'] == null
+        ? null
+        : Publish.fromJson(json['publish'] as Map<String, dynamic>),
+    mode: json['mode'] as int?,
+    section: (json['section'] as List<dynamic>?)
+        ?.map((e) => Section.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    url: json['url'] as String?,
+    badgeInfo: json['badge_info'] == null
+        ? null
+        : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
+    renewalTime: json['renewal_time'] as String?,
+    firstEpInfo: json['first_ep_info'] == null
+        ? null
+        : FirstEpInfo.fromJson(json['first_ep_info'] as Map<String, dynamic>),
+    formalEpCount: json['formal_ep_count'] as int?,
+    shortUrl: json['short_url'] as String?,
+    badgeInfos: json['badge_infos'] == null
+        ? null
+        : BadgeInfos.fromJson(json['badge_infos'] as Map<String, dynamic>),
+    seasonVersion: json['season_version'] as String?,
+    horizontalCover169: json['horizontal_cover_16_9'] as String?,
+    horizontalCover1610: json['horizontal_cover_16_10'] as String?,
+    subtitle14: json['subtitle_14'] as String?,
+    viewableCrowdType: json['viewable_crowd_type'] as int?,
+    producers: (json['producers'] as List<dynamic>?)
+        ?.map((e) => Producer.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    summary: json['summary'] as String?,
+    styles: (json['styles'] as List?)?.cast(),
+    configAttrs: json['config_attrs'] == null
+        ? null
+        : ConfigAttrs.fromJson(json['config_attrs'] as Map<String, dynamic>),
+    followStatus: json['follow_status'] as int?,
+    isNew: json['is_new'] as int?,
+    progress: json['progress'] == '' ? null : json['progress'],
+    bothFollow: json['both_follow'] as bool?,
+    subtitle25: json['subtitle_25'] as String?,
+  );
 }

lib/models_new/fav/fav_pgc/multi_img.dart

@@ -5,7 +5,7 @@ class MultiImg {
   MultiImg({this.color, this.mediumRemind});
 
   factory MultiImg.fromJson(Map<String, dynamic> json) => MultiImg(
-        color: json['color'] as String?,
-        mediumRemind: json['medium_remind'] as String?,
-      );
+    color: json['color'] as String?,
+    mediumRemind: json['medium_remind'] as String?,
+  );
 }

lib/models_new/fav/fav_pgc/new_ep.dart

@@ -18,12 +18,12 @@ class NewEp {
   });
 
   factory NewEp.fromJson(Map<String, dynamic> json) => NewEp(
-        id: json['id'] as int?,
-        indexShow: json['index_show'] as String?,
-        cover: json['cover'] as String?,
-        title: json['title'] as String?,
-        longTitle: json['long_title'] as String?,
-        pubTime: json['pub_time'] as String?,
-        duration: json['duration'] as int?,
-      );
+    id: json['id'] as int?,
+    indexShow: json['index_show'] as String?,
+    cover: json['cover'] as String?,
+    title: json['title'] as String?,
+    longTitle: json['long_title'] as String?,
+    pubTime: json['pub_time'] as String?,
+    duration: json['duration'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/producer.dart

@@ -7,9 +7,9 @@ class Producer {
   Producer({this.mid, this.type, this.isContribute, this.title});
 
   factory Producer.fromJson(Map<String, dynamic> json) => Producer(
-        mid: json['mid'] as int?,
-        type: json['type'] as int?,
-        isContribute: json['is_contribute'] as int?,
-        title: json['title'] as String?,
-      );
+    mid: json['mid'] as int?,
+    type: json['type'] as int?,
+    isContribute: json['is_contribute'] as int?,
+    title: json['title'] as String?,
+  );
 }

lib/models_new/fav/fav_pgc/publish.dart

@@ -12,9 +12,9 @@ class Publish {
   });
 
   factory Publish.fromJson(Map<String, dynamic> json) => Publish(
-        pubTime: json['pub_time'] as String?,
-        pubTimeShow: json['pub_time_show'] as String?,
-        releaseDate: json['release_date'] as String?,
-        releaseDateShow: json['release_date_show'] as String?,
-      );
+    pubTime: json['pub_time'] as String?,
+    pubTimeShow: json['pub_time_show'] as String?,
+    releaseDate: json['release_date'] as String?,
+    releaseDateShow: json['release_date_show'] as String?,
+  );
 }

lib/models_new/fav/fav_pgc/rating.dart

@@ -5,7 +5,7 @@ class Rating {
   Rating({this.score, this.count});
 
   factory Rating.fromJson(Map<String, dynamic> json) => Rating(
-        score: (json['score'] as num?)?.toDouble(),
-        count: json['count'] as int?,
-      );
+    score: (json['score'] as num?)?.toDouble(),
+    count: json['count'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/rights.dart

@@ -14,10 +14,10 @@ class Rights {
   });
 
   factory Rights.fromJson(Map<String, dynamic> json) => Rights(
-        allowReview: json['allow_review'] as int?,
-        allowPreview: json['allow_preview'] as int?,
-        isSelection: json['is_selection'] as int?,
-        selectionStyle: json['selection_style'] as int?,
-        isRcmd: json['is_rcmd'] as int?,
-      );
+    allowReview: json['allow_review'] as int?,
+    allowPreview: json['allow_preview'] as int?,
+    isSelection: json['is_selection'] as int?,
+    selectionStyle: json['selection_style'] as int?,
+    isRcmd: json['is_rcmd'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/section.dart

@@ -18,12 +18,12 @@ class Section {
   });
 
   factory Section.fromJson(Map<String, dynamic> json) => Section(
-        sectionId: json['section_id'] as int?,
-        seasonId: json['season_id'] as int?,
-        limitGroup: json['limit_group'] as int?,
-        watchPlatform: json['watch_platform'] as int?,
-        copyright: json['copyright'] as String?,
-        banAreaShow: json['ban_area_show'] as int?,
-        episodeIds: (json['episode_ids'] as List?)?.cast(),
-      );
+    sectionId: json['section_id'] as int?,
+    seasonId: json['season_id'] as int?,
+    limitGroup: json['limit_group'] as int?,
+    watchPlatform: json['watch_platform'] as int?,
+    copyright: json['copyright'] as String?,
+    banAreaShow: json['ban_area_show'] as int?,
+    episodeIds: (json['episode_ids'] as List?)?.cast(),
+  );
 }

lib/models_new/fav/fav_pgc/series.dart

@@ -14,10 +14,10 @@ class Series {
   });
 
   factory Series.fromJson(Map<String, dynamic> json) => Series(
-        seriesId: json['series_id'] as int?,
-        title: json['title'] as String?,
-        seasonCount: json['season_count'] as int?,
-        newSeasonId: json['new_season_id'] as int?,
-        seriesOrd: json['series_ord'] as int?,
-      );
+    seriesId: json['series_id'] as int?,
+    title: json['title'] as String?,
+    seasonCount: json['season_count'] as int?,
+    newSeasonId: json['new_season_id'] as int?,
+    seriesOrd: json['series_ord'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/stat.dart

@@ -22,14 +22,14 @@ class Stat {
   });
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        follow: json['follow'] as int?,
-        view: json['view'] as int?,
-        danmaku: json['danmaku'] as int?,
-        reply: json['reply'] as int?,
-        coin: json['coin'] as num?,
-        seriesFollow: json['series_follow'] as int?,
-        seriesView: json['series_view'] as int?,
-        likes: json['likes'] as int?,
-        favorite: json['favorite'] as int?,
-      );
+    follow: json['follow'] as int?,
+    view: json['view'] as int?,
+    danmaku: json['danmaku'] as int?,
+    reply: json['reply'] as int?,
+    coin: json['coin'] as num?,
+    seriesFollow: json['series_follow'] as int?,
+    seriesView: json['series_view'] as int?,
+    likes: json['likes'] as int?,
+    favorite: json['favorite'] as int?,
+  );
 }

lib/models_new/fav/fav_pgc/vip_or_pay.dart

@@ -16,12 +16,12 @@ class VipOrPay {
   });
 
   factory VipOrPay.fromJson(Map<String, dynamic> json) => VipOrPay(
-        text: json['text'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        img: json['img'] as String?,
-        multiImg: json['multi_img'] == null
-            ? null
-            : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
-      );
+    text: json['text'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    img: json['img'] as String?,
+    multiImg: json['multi_img'] == null
+        ? null
+        : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
+  );
 }

lib/models_new/fav/fav_topic/data.dart

@@ -6,8 +6,8 @@ class FavTopicData {
   FavTopicData({this.topicList});
 
   factory FavTopicData.fromJson(Map<String, dynamic> json) => FavTopicData(
-        topicList: json['topic_list'] == null
-            ? null
-            : TopicList.fromJson(json['topic_list'] as Map<String, dynamic>),
-      );
+    topicList: json['topic_list'] == null
+        ? null
+        : TopicList.fromJson(json['topic_list'] as Map<String, dynamic>),
+  );
 }

lib/models_new/fav/fav_topic/page_info.dart

@@ -5,7 +5,7 @@ class PageInfo {
   PageInfo({this.curPageNum, this.total});
 
   factory PageInfo.fromJson(Map<String, dynamic> json) => PageInfo(
-        curPageNum: json['cur_page_num'] as int?,
-        total: json['total'] as int?,
-      );
+    curPageNum: json['cur_page_num'] as int?,
+    total: json['total'] as int?,
+  );
 }

lib/models_new/fav/fav_topic/topic_item.dart

@@ -18,12 +18,12 @@ class FavTopicItem {
   });
 
   factory FavTopicItem.fromJson(Map<String, dynamic> json) => FavTopicItem(
-        id: json['id'] as int?,
-        name: json['name'] as String?,
-        view: json['view'] as int?,
-        discuss: json['discuss'] as int?,
-        jumpUrl: json['jump_url'] as String?,
-        statDesc: json['stat_desc'] as String?,
-        showInteractData: json['show_interact_data'] as bool?,
-      );
+    id: json['id'] as int?,
+    name: json['name'] as String?,
+    view: json['view'] as int?,
+    discuss: json['discuss'] as int?,
+    jumpUrl: json['jump_url'] as String?,
+    statDesc: json['stat_desc'] as String?,
+    showInteractData: json['show_interact_data'] as bool?,
+  );
 }

lib/models_new/fav/fav_topic/topic_list.dart

@@ -8,11 +8,11 @@ class TopicList {
   TopicList({this.topicItems, this.pageInfo});
 
   factory TopicList.fromJson(Map<String, dynamic> json) => TopicList(
-        topicItems: (json['topic_items'] as List<dynamic>?)
-            ?.map((e) => FavTopicItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        pageInfo: json['page_info'] == null
-            ? null
-            : PageInfo.fromJson(json['page_info'] as Map<String, dynamic>),
-      );
+    topicItems: (json['topic_items'] as List<dynamic>?)
+        ?.map((e) => FavTopicItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    pageInfo: json['page_info'] == null
+        ? null
+        : PageInfo.fromJson(json['page_info'] as Map<String, dynamic>),
+  );
 }