feat: 首页推荐视频缓存

lib/http/video.dart

@@ -19,6 +19,7 @@ class VideoHttp {
       var res = await Request().get(
         Api.recommendList,
         data: {
+          'user-agent': Request().headerUa('mob'),
           'feed_version': 'V4',
           'ps': ps,
           'fresh_idx': freshIdx,

lib/models/model_owner.dart

@@ -1,12 +1,19 @@
+import 'package:hive/hive.dart';
+
+part 'model_owner.g.dart';
+
+@HiveType(typeId: 3)
 class Owner {
   Owner({
     this.mid,
     this.name,
     this.face,
   });
-
+  @HiveField(0)
   int? mid;
+  @HiveField(1)
   String? name;
+  @HiveField(2)
   String? face;
 
   Owner.fromJson(Map<String, dynamic> json) {

lib/models/model_owner.g.dart

@@ -0,0 +1,47 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'model_owner.dart';
+
+// **************************************************************************
+// TypeAdapterGenerator
+// **************************************************************************
+
+class OwnerAdapter extends TypeAdapter<Owner> {
+  @override
+  final int typeId = 3;
+
+  @override
+  Owner read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+    return Owner(
+      mid: fields[0] as int?,
+      name: fields[1] as String?,
+      face: fields[2] as String?,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, Owner obj) {
+    writer
+      ..writeByte(3)
+      ..writeByte(0)
+      ..write(obj.mid)
+      ..writeByte(1)
+      ..write(obj.name)
+      ..writeByte(2)
+      ..write(obj.face);
+  }
+
+  @override
+  int get hashCode => typeId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is OwnerAdapter &&
+          runtimeType == other.runtimeType &&
+          typeId == other.typeId;
+}

lib/models/model_rec_video_item.dart

@@ -1,5 +1,9 @@
 import './model_owner.dart';
+import 'package:hive/hive.dart';
 
+part 'model_rec_video_item.g.dart';
+
+@HiveType(typeId: 0)
 class RecVideoItemModel {
   RecVideoItemModel({
     this.id,
@@ -17,18 +21,31 @@ class RecVideoItemModel {
     this.rcmdReason,
   });
 
+  @HiveField(0)
   int? id = -1;
+  @HiveField(1)
   String? bvid = '';
+  @HiveField(2)
   int? cid = -1;
+  @HiveField(3)
   String? goto = '';
+  @HiveField(4)
   String? uri = '';
+  @HiveField(5)
   String? pic = '';
+  @HiveField(6)
   String? title = '';
+  @HiveField(7)
   int? duration = -1;
+  @HiveField(8)
   int? pubdate = -1;
+  @HiveField(9)
   Owner? owner;
+  @HiveField(10)
   Stat? stat;
+  @HiveField(11)
   int? isFollowed;
+  @HiveField(12)
   RcmdReason? rcmdReason;
 
   RecVideoItemModel.fromJson(Map<String, dynamic> json) {
@@ -50,15 +67,18 @@ class RecVideoItemModel {
   }
 }
 
+@HiveType(typeId: 1)
 class Stat {
   Stat({
     this.view,
     this.like,
     this.danmaku,
   });
-
+  @HiveField(0)
   int? view;
+  @HiveField(1)
   int? like;
+  @HiveField(2)
   int? danmaku;
 
   Stat.fromJson(Map<String, dynamic> json) {
@@ -68,13 +88,15 @@ class Stat {
   }
 }
 
+@HiveType(typeId: 2)
 class RcmdReason {
   RcmdReason({
     this.reasonType,
     this.content,
   });
-
+  @HiveField(0)
   int? reasonType;
+  @HiveField(1)
   String? content = '';
 
   RcmdReason.fromJson(Map<String, dynamic> json) {

lib/models/model_rec_video_item.g.dart

@@ -0,0 +1,154 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'model_rec_video_item.dart';
+
+// **************************************************************************
+// TypeAdapterGenerator
+// **************************************************************************
+
+class RecVideoItemModelAdapter extends TypeAdapter<RecVideoItemModel> {
+  @override
+  final int typeId = 0;
+
+  @override
+  RecVideoItemModel read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+    return RecVideoItemModel(
+      id: fields[0] as int?,
+      bvid: fields[1] as String?,
+      cid: fields[2] as int?,
+      goto: fields[3] as String?,
+      uri: fields[4] as String?,
+      pic: fields[5] as String?,
+      title: fields[6] as String?,
+      duration: fields[7] as int?,
+      pubdate: fields[8] as int?,
+      owner: fields[9] as Owner?,
+      stat: fields[10] as Stat?,
+      isFollowed: fields[11] as int?,
+      rcmdReason: fields[12] as RcmdReason?,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, RecVideoItemModel obj) {
+    writer
+      ..writeByte(13)
+      ..writeByte(0)
+      ..write(obj.id)
+      ..writeByte(1)
+      ..write(obj.bvid)
+      ..writeByte(2)
+      ..write(obj.cid)
+      ..writeByte(3)
+      ..write(obj.goto)
+      ..writeByte(4)
+      ..write(obj.uri)
+      ..writeByte(5)
+      ..write(obj.pic)
+      ..writeByte(6)
+      ..write(obj.title)
+      ..writeByte(7)
+      ..write(obj.duration)
+      ..writeByte(8)
+      ..write(obj.pubdate)
+      ..writeByte(9)
+      ..write(obj.owner)
+      ..writeByte(10)
+      ..write(obj.stat)
+      ..writeByte(11)
+      ..write(obj.isFollowed)
+      ..writeByte(12)
+      ..write(obj.rcmdReason);
+  }
+
+  @override
+  int get hashCode => typeId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is RecVideoItemModelAdapter &&
+          runtimeType == other.runtimeType &&
+          typeId == other.typeId;
+}
+
+class StatAdapter extends TypeAdapter<Stat> {
+  @override
+  final int typeId = 1;
+
+  @override
+  Stat read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+    return Stat(
+      view: fields[0] as int?,
+      like: fields[1] as int?,
+      danmaku: fields[2] as int?,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, Stat obj) {
+    writer
+      ..writeByte(3)
+      ..writeByte(0)
+      ..write(obj.view)
+      ..writeByte(1)
+      ..write(obj.like)
+      ..writeByte(2)
+      ..write(obj.danmaku);
+  }
+
+  @override
+  int get hashCode => typeId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is StatAdapter &&
+          runtimeType == other.runtimeType &&
+          typeId == other.typeId;
+}
+
+class RcmdReasonAdapter extends TypeAdapter<RcmdReason> {
+  @override
+  final int typeId = 2;
+
+  @override
+  RcmdReason read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+    return RcmdReason(
+      reasonType: fields[0] as int?,
+      content: fields[1] as String?,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, RcmdReason obj) {
+    writer
+      ..writeByte(2)
+      ..writeByte(0)
+      ..write(obj.reasonType)
+      ..writeByte(1)
+      ..write(obj.content);
+  }
+
+  @override
+  int get hashCode => typeId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is RcmdReasonAdapter &&
+          runtimeType == other.runtimeType &&
+          typeId == other.typeId;
+}

lib/models/user/stat.dart

@@ -1,3 +1,8 @@
+import 'package:hive/hive.dart';
+
+part 'stat.g.dart';
+
+@HiveType(typeId: 1)
 class UserStat {
   UserStat({
     this.following,
@@ -5,8 +10,11 @@ class UserStat {
     this.dynamicCount,
   });
 
+  @HiveField(0)
   int? following;
+  @HiveField(1)
   int? follower;
+  @HiveField(2)
   int? dynamicCount;
 
   UserStat.fromJson(Map<String, dynamic> json) {

lib/models/user/stat.g.dart

@@ -0,0 +1,47 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'stat.dart';
+
+// **************************************************************************
+// TypeAdapterGenerator
+// **************************************************************************
+
+class UserStatAdapter extends TypeAdapter<UserStat> {
+  @override
+  final int typeId = 1;
+
+  @override
+  UserStat read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+    return UserStat(
+      following: fields[0] as int?,
+      follower: fields[1] as int?,
+      dynamicCount: fields[2] as int?,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, UserStat obj) {
+    writer
+      ..writeByte(3)
+      ..writeByte(0)
+      ..write(obj.following)
+      ..writeByte(1)
+      ..write(obj.follower)
+      ..writeByte(2)
+      ..write(obj.dynamicCount);
+  }
+
+  @override
+  int get hashCode => typeId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is UserStatAdapter &&
+          runtimeType == other.runtimeType &&
+          typeId == other.typeId;
+}

lib/pages/home/controller.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/model_rec_video_item.dart';
+import 'package:pilipala/utils/storage.dart';
 
 class HomeController extends GetxController {
   final ScrollController scrollController = ScrollController();
@@ -12,11 +14,18 @@ class HomeController extends GetxController {
   bool isLoadingMore = false;
   bool flag = false;
   OverlayEntry? popupDialog;
+  Box recVideo = GStrorage.recVideo;
 
   @override
   void onInit() {
     super.onInit();
-    // queryRcmdFeed('init');
+    if(recVideo.get('cacheList') != null && recVideo.get('cacheList').isNotEmpty){
+      List<RecVideoItemModel> list = [];
+      for(var i in recVideo.get('cacheList')){
+        list.add(i);
+      }
+      videoList.value = list;
+    }
   }
 
   // 获取推荐
@@ -33,6 +42,7 @@ class HomeController extends GetxController {
       } else if (type == 'onLoad') {
         videoList.addAll(res['data']);
       }
+      recVideo.put('cacheList', res['data']);
       _currentPage += 1;
     }
     isLoadingMore = false;

lib/pages/home/view.dart

@@ -89,8 +89,15 @@ class _HomePageState extends State<HomePage>
                       );
                     }
                   } else {
+                    // 缓存数据
+                    if(_homeController.videoList.isNotEmpty) {
+                      return contentGrid(
+                          _homeController, _homeController.videoList);
+                    }
                     // 骨架屏
-                    return contentGrid(_homeController, []);
+                    else{
+                      return contentGrid(_homeController, []);
+                    }
                   }
                 },
               ),

lib/pages/home/widgets/app_bar.dart

@@ -46,7 +46,13 @@ class HomeAppBar extends StatelessWidget {
                     // ),
                     IconButton(
                       onPressed: () {
-                        Get.bottomSheet(const MinePage());
+                        Get.bottomSheet(
+                            const SizedBox(
+                              height: 450,
+                              child: MinePage(),
+                            ),
+                            clipBehavior: Clip.hardEdge,
+                            isScrollControlled: true);
                       },
                       icon: const Icon(CupertinoIcons.person, size: 22),
                     ),

lib/pages/main/controller.dart

@@ -6,6 +6,7 @@ import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/pages/home/view.dart';
 import 'package:pilipala/pages/hot/view.dart';
 import 'package:pilipala/pages/media/index.dart';
+import 'package:pilipala/pages/mine/index.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class MainController extends GetxController {

lib/pages/media/controller.dart

@@ -1,11 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class MediaController extends GetxController {
   Rx<FavFolderData> favFolderData = FavFolderData().obs;
+  Box user = GStrorage.user;
+  RxBool userLogin = false.obs;
   List list = [
     {
       'icon': Icons.file_download_outlined,
@@ -29,7 +32,16 @@ class MediaController extends GetxController {
     },
   ];
 
+  @override
+  void onInit() {
+    super.onInit();
+    userLogin.value = user.get(UserBoxKey.userLogin) ?? false;
+  }
+
   Future<dynamic> queryFavFolder() async {
+    if (!userLogin.value) {
+      return {'status': false, 'data': [], 'msg': '未登录'};
+    }
     var res = await await UserHttp.userfavFolder(
       pn: 1,
       ps: 5,

lib/pages/media/view.dart

@@ -17,7 +17,7 @@ class _MediaPageState extends State<MediaPage>
   Future? _futureBuilderFuture;
 
   @override
-  bool get wantKeepAlive => true;
+  bool get wantKeepAlive => false;
 
   @override
   void initState() {
@@ -65,7 +65,9 @@ class _MediaPageState extends State<MediaPage>
               ),
             ),
           ],
-          favFolder()
+          Obx(() => _mediaController.userLogin.value == true
+              ? favFolder()
+              : const SizedBox())
         ],
       ),
     );

lib/pages/mine/view.dart

@@ -64,7 +64,6 @@ class _MinePageState extends State<MinePage> {
                       future: _mineController.queryUserInfo(),
                       builder: (context, snapshot) {
                         if (snapshot.connectionState == ConnectionState.done) {
-                          print(snapshot.data);
                           if (snapshot.data['status']) {
                             return Obx(() => userInfoBuild());
                           } else {
@@ -75,7 +74,6 @@ class _MinePageState extends State<MinePage> {
                         }
                       },
                     ),
-                    const SizedBox(height: 20),
                   ],
                 ),
               ),

lib/utils/storage.dart

@@ -1,14 +1,27 @@
-import 'package:hive/hive.dart';
+// import 'package:hive/hive.dart';
+import 'package:hive_flutter/hive_flutter.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:pilipala/models/model_owner.dart';
+import 'package:pilipala/models/model_rec_video_item.dart';
 
 class GStrorage {
   static late final Box user;
+  static late final Box recVideo;
 
   static Future<void> init() async {
     final dir = await getApplicationDocumentsDirectory();
     final path = dir.path;
-    Hive.init('$path/hive');
+    await Hive.initFlutter('$path/hive');
+    // 首页推荐视频
+    Hive.registerAdapter(RecVideoItemModelAdapter());
+    Hive.registerAdapter(RcmdReasonAdapter());
+    Hive.registerAdapter(StatAdapter());
+    Hive.registerAdapter(OwnerAdapter());
+
+    // 用户信息
     user = await Hive.openBox('user');
+    // 首页推荐视频
+    recVideo = await Hive.openBox('recVideo');
   }
 }