refa: dir

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

lib/http/bangumi.dart

@@ -1,11 +1,11 @@
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/bangumi/list.dart';
+import 'package:PiliPlus/models/bangumi/pgc_index/condition.dart';
 import 'package:PiliPlus/models/bangumi/pgc_timeline/pgc_timeline.dart';
 import 'package:PiliPlus/models/bangumi/pgc_timeline/result.dart';
 
-import '../models/bangumi/list.dart';
-import '../models/bangumi/pgc_index/condition.dart';
-import 'index.dart';
-
 class BangumiHttp {
   static Future<LoadingState> pgcIndexResult({
     required int page,
@@ -46,7 +46,7 @@ class BangumiHttp {
       },
     );
     if (res.data['code'] == 0) {
-      return LoadingState.success(Condition.fromJson(res.data['data']));
+      return LoadingState.success(PgcIndexCondition.fromJson(res.data['data']));
     } else {
       return LoadingState.error(res.data['message']);
     }

lib/http/black.dart

@@ -1,9 +1,9 @@
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/user/black.dart';
 import 'package:PiliPlus/utils/storage.dart';
 
-import '../models/user/black.dart';
-import 'index.dart';
-
 class BlackHttp {
   static Future<LoadingState<BlackListDataModel>> blackList(
       {required int pn, int? ps}) async {

lib/http/common.dart

@@ -1,4 +1,5 @@
-import 'index.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 
 class CommonHttp {
   static Future unReadDynamic() async {

lib/http/danmaku.dart

@@ -1,8 +1,9 @@
 import 'package:PiliPlus/grpc/dm/v1/dm.pb.dart';
 import 'package:PiliPlus/grpc/grpc_repo.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:dio/dio.dart';
-import 'index.dart';
 
 class DanmakuHttp {
   // 获取视频弹幕

lib/http/danmaku_block.dart

@@ -1,6 +1,7 @@
-import '../models/user/danmaku_block.dart';
-import '../utils/storage.dart';
-import 'index.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
+import 'package:PiliPlus/models/user/danmaku_block.dart';
+import 'package:PiliPlus/utils/storage.dart';
 
 class DanmakuFilterHttp {
   static Future danmakuFilter() async {

lib/http/dynamics.dart

@@ -1,15 +1,15 @@
+import 'package:PiliPlus/http/api.dart';
 import 'package:PiliPlus/http/constants.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/dynamics/result.dart';
+import 'package:PiliPlus/models/dynamics/up.dart';
+import 'package:PiliPlus/models/space_article/item.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
 
-import '../models/space_article/item.dart';
-import '../models/dynamics/result.dart';
-import '../models/dynamics/up.dart';
-import 'index.dart';
-
 class DynamicsHttp {
   static Future<LoadingState<DynamicsDataModel>> followDynamic({
     String? type,
@@ -188,7 +188,8 @@ class DynamicsHttp {
     }
   }
 
-  static Future<LoadingState<Item>> articleView({required dynamic cvId}) async {
+  static Future<LoadingState<SpaceArticleItem>> articleView(
+      {required dynamic cvId}) async {
     final res = await Request().get(
       Api.articleView,
       queryParameters: await WbiSign.makSign({
@@ -199,7 +200,7 @@ class DynamicsHttp {
     );
 
     return res.data['code'] == 0
-        ? LoadingState.success(Item.fromJson(res.data['data']))
+        ? LoadingState.success(SpaceArticleItem.fromJson(res.data['data']))
         : LoadingState.error(res.data['message']);
   }
 

lib/http/fan.dart

@@ -1,7 +1,7 @@
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-
-import '../models/fans/result.dart';
-import 'index.dart';
+import 'package:PiliPlus/models/fans/result.dart';
 
 class FanHttp {
   static Future<LoadingState<FansDataModel>> fans(

lib/http/follow.dart

@@ -1,7 +1,7 @@
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-
-import '../models/follow/result.dart';
-import 'index.dart';
+import 'package:PiliPlus/models/follow/result.dart';
 
 class FollowHttp {
   static Future followings({

lib/http/index.dart

@@ -1,2 +0,0 @@
-export 'api.dart';
-export 'init.dart';

lib/http/init.dart

@@ -2,18 +2,18 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:PiliPlus/build_config.dart';
+import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/retry_interceptor.dart';
 import 'package:PiliPlus/http/user.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/accounts/account_manager/account_mgr.dart';
 import 'package:PiliPlus/utils/global_data.dart';
+import 'package:PiliPlus/utils/storage.dart';
 import 'package:archive/archive.dart';
 import 'package:brotli/brotli.dart';
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
 import 'package:dio_http2_adapter/dio_http2_adapter.dart';
-import '../utils/storage.dart';
-import 'constants.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart' as web;
 
 class Request {

lib/http/live.dart

@@ -1,17 +1,17 @@
 import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/live/danmu_info.dart';
 import 'package:PiliPlus/models/live/follow.dart';
+import 'package:PiliPlus/models/live/item.dart';
 import 'package:PiliPlus/models/live/live_emoticons/data.dart';
 import 'package:PiliPlus/models/live/live_emoticons/datum.dart';
+import 'package:PiliPlus/models/live/room_info.dart';
+import 'package:PiliPlus/models/live/room_info_h5.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
-import '../models/live/item.dart';
-import '../models/live/room_info.dart';
-import '../models/live/room_info_h5.dart';
-import 'api.dart';
-import 'init.dart';
 
 class LiveHttp {
   static Future<LoadingState<List<LiveItemModel>?>> liveList({

lib/http/login.dart

@@ -1,13 +1,14 @@
 import 'dart:convert';
+import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
+import 'package:PiliPlus/models/login/model.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
+import 'package:PiliPlus/utils/login_utils.dart';
+import 'package:PiliPlus/utils/utils.dart';
 import 'package:crypto/crypto.dart';
 import 'package:dio/dio.dart';
 import 'package:encrypt/encrypt.dart';
-import '../common/constants.dart';
-import '../models/login/index.dart';
-import '../utils/login_utils.dart';
-import '../utils/utils.dart';
-import 'index.dart';
 
 class LoginHttp {
   static final String deviceId = LoginUtils.genDeviceId();

lib/http/member.dart

@@ -3,32 +3,28 @@ import 'dart:io';
 
 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/grpc/grpc_repo.dart';
+import 'package:PiliPlus/http/api.dart';
 import 'package:PiliPlus/http/constants.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/dynamics/result.dart';
+import 'package:PiliPlus/models/follow/result.dart';
+import 'package:PiliPlus/models/member/archive.dart';
+import 'package:PiliPlus/models/member/coin.dart';
+import 'package:PiliPlus/models/member/info.dart';
+import 'package:PiliPlus/models/member/seasons.dart';
+import 'package:PiliPlus/models/member/tags.dart';
 import 'package:PiliPlus/models/space/data.dart';
-import 'package:PiliPlus/models/space_archive/data.dart' as space_archive;
-import 'package:PiliPlus/models/space_article/data.dart' as space_article;
-import 'package:PiliPlus/models/space/data.dart' as space_;
+import 'package:PiliPlus/models/space_archive/data.dart';
+import 'package:PiliPlus/models/space_article/data.dart';
 import 'package:PiliPlus/models/space_fav/space_fav.dart';
-import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart'
-    show ContributeType;
+import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType;
 import 'package:PiliPlus/utils/storage.dart';
+import 'package:PiliPlus/utils/utils.dart';
+import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 
-import '../models/dynamics/result.dart';
-import '../models/follow/result.dart';
-import '../models/member/archive.dart';
-import '../models/member/coin.dart';
-import '../models/member/info.dart';
-import '../models/member/seasons.dart';
-import '../models/member/tags.dart';
-import '../models/space_archive/data.dart' as archive;
-import '../models/space_article/data.dart' as article;
-import '../utils/utils.dart';
-import '../utils/wbi_sign.dart';
-import 'index.dart';
-
 class MemberHttp {
   static Future reportMember(
     dynamic mid, {
@@ -65,7 +61,7 @@ class MemberHttp {
     }
   }
 
-  static Future<LoadingState<space_article.Data>> spaceArticle({
+  static Future<LoadingState<SpaceArticleData>> spaceArticle({
     required int mid,
     required int page,
   }) async {
@@ -92,7 +88,7 @@ class MemberHttp {
       ),
     );
     if (res.data['code'] == 0) {
-      return LoadingState.success(article.Data.fromJson(res.data['data']));
+      return LoadingState.success(SpaceArticleData.fromJson(res.data['data']));
     } else {
       return LoadingState.error(res.data['message']);
     }
@@ -147,7 +143,7 @@ class MemberHttp {
     }
   }
 
-  static Future<LoadingState<space_archive.Data>> spaceArchive({
+  static Future<LoadingState<SpaceArchiveData>> spaceArchive({
     required ContributeType type,
     required int? mid,
     String? aid,
@@ -196,7 +192,7 @@ class MemberHttp {
       ),
     );
     if (res.data['code'] == 0) {
-      return LoadingState.success(archive.Data.fromJson(res.data['data']));
+      return LoadingState.success(SpaceArchiveData.fromJson(res.data['data']));
     } else {
       return LoadingState.error(res.data['message']);
     }
@@ -244,7 +240,7 @@ class MemberHttp {
     }
   }
 
-  static Future<LoadingState<space_.Data>> space({
+  static Future<LoadingState<SpaceData>> space({
     int? mid,
     dynamic fromViewAid,
   }) async {
@@ -270,7 +266,7 @@ class MemberHttp {
       ),
     );
     if (res.data['code'] == 0) {
-      return LoadingState.success(Data.fromJson(res.data['data']));
+      return LoadingState.success(SpaceData.fromJson(res.data['data']));
     } else {
       return LoadingState.error(res.data['message']);
     }

lib/http/msg.dart

@@ -1,22 +1,21 @@
 import 'dart:math';
+import 'package:PiliPlus/http/api.dart';
 import 'package:PiliPlus/http/constants.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/msg/account.dart';
 import 'package:PiliPlus/models/msg/msgfeed_at_me.dart';
 import 'package:PiliPlus/models/msg/msgfeed_like_me.dart';
 import 'package:PiliPlus/models/msg/msgfeed_reply_me.dart';
 import 'package:PiliPlus/models/msg/msgfeed_sys_msg.dart';
+import 'package:PiliPlus/models/msg/session.dart';
 import 'package:PiliPlus/pages/dynamics/view.dart' show ReplyOption;
 import 'package:PiliPlus/utils/storage.dart';
+import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 
-import '../models/msg/account.dart';
-import '../models/msg/session.dart';
-import '../utils/wbi_sign.dart';
-import 'api.dart';
-import 'init.dart';
-
 class MsgHttp {
   static Future<LoadingState<MsgFeedReplyMe>> msgFeedReplyMe(
       {int cursor = -1, int cursorTime = -1}) async {

lib/http/reply.dart

@@ -1,18 +1,17 @@
 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart';
 import 'package:PiliPlus/grpc/grpc_repo.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/video/reply/data.dart';
+import 'package:PiliPlus/models/video/reply/emote.dart';
 import 'package:PiliPlus/models/video/reply/item.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:dio/dio.dart';
 
-import '../models/video/reply/data.dart';
-import '../models/video/reply/emote.dart';
-import 'api.dart';
-import 'init.dart';
-
 class ReplyHttp {
   static Options get _options =>
       Options(extra: {'account': AnonymousAccount()});

lib/http/retry_interceptor.dart

@@ -1,7 +1,6 @@
+import 'package:PiliPlus/http/init.dart';
 import 'package:dio/dio.dart';
 
-import 'index.dart';
-
 class RetryInterceptor extends Interceptor {
   final int _count;
   final int _delay;

lib/http/search.dart

@@ -1,15 +1,16 @@
 import 'dart:convert';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
+import 'package:PiliPlus/models/bangumi/info.dart';
+import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/models/search/search_trending/trending_data.dart';
+import 'package:PiliPlus/models/search/suggest.dart';
 import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/storage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import '../models/bangumi/info.dart';
-import '../models/common/search_type.dart';
-import '../models/search/result.dart';
-import '../models/search/suggest.dart';
-import '../utils/storage.dart';
-import 'index.dart';
 
 class SearchHttp {
   // 获取搜索建议

lib/http/user.dart

@@ -1,4 +1,15 @@
+import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/model_hot_video_item.dart';
+import 'package:PiliPlus/models/user/fav_detail.dart';
+import 'package:PiliPlus/models/user/fav_folder.dart';
+import 'package:PiliPlus/models/user/history.dart';
+import 'package:PiliPlus/models/user/info.dart';
+import 'package:PiliPlus/models/user/stat.dart';
+import 'package:PiliPlus/models/user/sub_detail.dart';
+import 'package:PiliPlus/models/user/sub_folder.dart';
 import 'package:PiliPlus/models/video/later.dart';
 import 'package:PiliPlus/utils/global_data.dart';
 import 'package:PiliPlus/utils/storage.dart';
@@ -6,17 +17,6 @@ import 'package:PiliPlus/utils/utils.dart';
 import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import '../common/constants.dart';
-import '../models/model_hot_video_item.dart';
-import '../models/user/fav_detail.dart';
-import '../models/user/fav_folder.dart';
-import '../models/user/history.dart';
-import '../models/user/info.dart';
-import '../models/user/stat.dart';
-import '../models/user/sub_detail.dart';
-import '../models/user/sub_folder.dart';
-import 'api.dart';
-import 'init.dart';
 
 class UserHttp {
   static Future<dynamic> userStat({required int mid}) async {

lib/http/video.dart

@@ -1,29 +1,29 @@
 import 'dart:convert';
 import 'dart:developer';
+import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/grpc/app/card/v1/card.pb.dart' as card;
 import 'package:PiliPlus/grpc/grpc_repo.dart';
+import 'package:PiliPlus/http/api.dart';
+import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/http/login.dart';
 import 'package:PiliPlus/models/bangumi/pgc_rank/pgc_rank_item_model.dart';
+import 'package:PiliPlus/models/common/reply_type.dart';
+import 'package:PiliPlus/models/home/rcmd/result.dart';
 import 'package:PiliPlus/models/member/article.dart';
+import 'package:PiliPlus/models/model_hot_video_item.dart';
+import 'package:PiliPlus/models/model_rec_video_item.dart';
+import 'package:PiliPlus/models/user/fav_folder.dart';
+import 'package:PiliPlus/models/video/ai.dart';
+import 'package:PiliPlus/models/video/play/url.dart';
+import 'package:PiliPlus/models/video_detail_res.dart';
 import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/id_utils.dart';
+import 'package:PiliPlus/utils/recommend_filter.dart';
+import 'package:PiliPlus/utils/storage.dart';
+import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
-import '../common/constants.dart';
-import '../models/common/reply_type.dart';
-import '../models/home/rcmd/result.dart';
-import '../models/model_hot_video_item.dart';
-import '../models/model_rec_video_item.dart';
-import '../models/user/fav_folder.dart';
-import '../models/video/ai.dart';
-import '../models/video/play/url.dart';
-import '../models/video_detail_res.dart';
-import '../utils/id_utils.dart';
-import '../utils/recommend_filter.dart';
-import '../utils/storage.dart';
-import '../utils/wbi_sign.dart';
-import 'api.dart';
-import 'init.dart';
-import 'login.dart';
 
 /// view层根据 status 判断渲染逻辑
 class VideoHttp {