Merge branch 'pr/SlotSun/793' into dev

Author: xiaoyaocz

assets/tv_app_version.json

@@ -0,0 +1,7 @@
+{
+    "version": "1.3.5",
+    "version_num": 10305,
+    "version_desc": "- 修复虎牙播放中断 #723 @SlotSun\n- 修复哔哩哔哩加载失败",
+    "prerelease":true,
+    "download_url": "https://github.com/xiaoyaocz/dart_simple_live/releases"
+}

simple_live_app/lib/main.dart

@@ -18,6 +18,7 @@ import 'package:simple_live_app/app/log.dart';
 import 'package:simple_live_app/app/utils.dart';
 import 'package:simple_live_app/app/utils/listen_fourth_button.dart';
 import 'package:simple_live_app/models/db/follow_user.dart';
+import 'package:simple_live_app/models/db/follow_user_tag.dart';
 import 'package:simple_live_app/models/db/history.dart';
 import 'package:simple_live_app/modules/other/debug_log_page.dart';
 import 'package:simple_live_app/routes/app_pages.dart';
@@ -66,6 +67,7 @@ Future migrateData() async {
     "followuser",
     //旧版本写错成hostiry了
     "hostiry",
+    "followusertag",
     "localstorage",
     "danmushield",
   ];
@@ -116,6 +118,7 @@ Future initWindow() async {
 Future initServices() async {
   Hive.registerAdapter(FollowUserAdapter());
   Hive.registerAdapter(HistoryAdapter());
+  Hive.registerAdapter(FollowUserTagAdapter());
 
   //包信息
   Utils.packageInfo = await PackageInfo.fromPlatform();

simple_live_app/lib/models/db/follow_user.dart

@@ -12,6 +12,7 @@ class FollowUser {
     required this.userName,
     required this.face,
     required this.addTime,
+    this.tag = "全部"
   });
 
   ///id=siteId_roomId
@@ -33,6 +34,9 @@ class FollowUser {
   @HiveField(5)
   DateTime addTime;
 
+  @HiveField(6)
+  String tag;
+
   /// 直播状态
   /// 0=未知(加载中) 1=未开播 2=直播中
   Rx<int> liveStatus = 0.obs;
@@ -47,6 +51,7 @@ class FollowUser {
         userName: json['userName'],
         face: json['face'],
         addTime: DateTime.parse(json['addTime']),
+        tag: json["tag"]??"全部",
       );
 
   Map<String, dynamic> toJson() => {
@@ -56,5 +61,6 @@ class FollowUser {
         'userName': userName,
         'face': face,
         'addTime': addTime.toString(),
+        'tag':tag,
       };
 }

simple_live_app/lib/models/db/follow_user.g.dart

@@ -0,0 +1,51 @@
+import 'package:hive/hive.dart';
+
+part 'follow_user_tag.g.dart';
+
+@HiveType(typeId: 3)
+class FollowUserTag {
+  @HiveField(1)
+  String id;
+
+  // 用户自定义tag
+  @HiveField(2)
+  String tag;
+
+  // followUserId
+  @HiveField(3)
+  List<String> userId;
+
+  FollowUserTag({
+    required this.id,
+    required this.tag,
+    required this.userId,
+  });
+
+  factory FollowUserTag.fromJson(Map<String, dynamic> json) {
+    return FollowUserTag(
+      id: json['id'],
+      tag: json['tag'],
+      userId: List<String>.from(json['userId']),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'tag': tag,
+      'userId': userId,
+    };
+  }
+
+  FollowUserTag copyWith({
+    String? id,
+    String? tag,
+    List<String>? userId,
+  }) {
+    return FollowUserTag(
+      id: id ?? this.id,
+      tag: tag ?? this.tag,
+      userId: userId ?? this.userId,
+    );
+  }
+}

simple_live_app/lib/models/db/follow_user_tag.dart

@@ -1,11 +1,14 @@
 // ignore_for_file: invalid_use_of_protected_member
 
 import 'dart:async';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:simple_live_app/app/controller/base_controller.dart';
 import 'package:simple_live_app/app/event_bus.dart';
+import 'package:simple_live_app/app/log.dart';
 import 'package:simple_live_app/app/utils.dart';
 import 'package:simple_live_app/models/db/follow_user.dart';
+import 'package:simple_live_app/models/db/follow_user_tag.dart';
 import 'package:simple_live_app/services/db_service.dart';
 import 'package:simple_live_app/services/follow_service.dart';
 
@@ -14,13 +17,21 @@ class FollowUserController extends BasePageController<FollowUser> {
   StreamSubscription<dynamic>? onUpdatedListStream;
 
   /// 0:全部 1:直播中 2:未直播
-  var filterMode = 0.obs;
+  var filterMode = FollowUserTag(id: "0", tag: "全部", userId: []).obs;
+  RxList<FollowUserTag> tagList = [
+    FollowUserTag(id: "0", tag: "全部", userId: []),
+    FollowUserTag(id: "1", tag: "直播中", userId: []),
+    FollowUserTag(id: "2", tag: "未开播", userId: []),
+  ].obs;
+
+  // 用户自定义标签
+  RxList<FollowUserTag> userTagList = <FollowUserTag>[].obs;
 
   @override
   void onInit() {
     onUpdatedIndexedStream = EventBus.instance.listen(
       EventBus.kBottomNavigationBarClicked,
-      (index) {
+          (index) {
         if (index == 1) {
           scrollToTopOrRefresh();
         }
@@ -36,6 +47,7 @@ class FollowUserController extends BasePageController<FollowUser> {
   @override
   Future refreshData() async {
     await FollowService.instance.loadData();
+    updateTagList();
     super.refreshData();
   }
 
@@ -44,40 +56,134 @@ class FollowUserController extends BasePageController<FollowUser> {
     if (page > 1) {
       return Future.value([]);
     }
-    if (filterMode.value == 0) {
+    if (filterMode.value.tag == "全部") {
       return FollowService.instance.followList.value;
-    } else if (filterMode.value == 1) {
+    } else if (filterMode.value.tag == "直播中") {
       return FollowService.instance.liveList.value;
-    } else {
+    } else if (filterMode.value.tag == "未开播") {
       return FollowService.instance.notLiveList.value;
+    } else {
+      FollowService.instance.filterDataByTag(filterMode.value);
+      return FollowService.instance.curTagFollowList.value;
+    }
+  }
+
+  void updateTagList() {
+    userTagList.assignAll(FollowService.instance.followTagList);
+    tagList.value = tagList.take(3).toList();
+    for (var i in userTagList) {
+      if (!tagList.contains(i)) {
+        tagList.add(i);
+      }
     }
   }
 
   void filterData() {
-    if (filterMode.value == 0) {
+    if (filterMode.value.tag == "全部") {
       list.assignAll(FollowService.instance.followList.value);
-    } else if (filterMode.value == 1) {
+    } else if (filterMode.value.tag == "直播中") {
       list.assignAll(FollowService.instance.liveList.value);
-    } else if (filterMode.value == 2) {
+    } else if (filterMode.value.tag == "未开播") {
       list.assignAll(FollowService.instance.notLiveList.value);
+    } else {
+      FollowService.instance.filterDataByTag(filterMode.value);
+      list.assignAll(FollowService.instance.curTagFollowList);
     }
   }
 
-  void setFilterMode(int mode) {
-    filterMode.value = mode;
+  void setFilterMode(FollowUserTag tag) {
+    filterMode.value = tag;
     filterData();
   }
 
   void removeItem(FollowUser item) async {
     var result =
-        await Utils.showAlertDialog("确定要取消关注${item.userName}吗?", title: "取消关注");
+    await Utils.showAlertDialog("确定要取消关注${item.userName}吗?", title: "取消关注");
     if (!result) {
       return;
     }
+    // 取消关注同时删除标签内的 userId
+    if(item.tag != "全部"){
+      var tag = tagList.firstWhere((tag) => tag.tag == item.tag);
+      tag.userId.remove(item.id);
+      updateTag(tag);
+    }
     await DBService.instance.followBox.delete(item.id);
     refreshData();
   }
 
+  void updateItem(FollowUser item){
+    FollowService.instance.addFollow(item);
+  }
+  // 修改item的标签
+  void setItemTag(FollowUser item, FollowUserTag targetTag) {
+    FollowUserTag tarTag = targetTag;
+    FollowUserTag curTag =
+    tagList.firstWhere((tag) => tag.tag == item.tag);
+    // 从当前标签（非全部）删除item 向目标标签(全部包含所有item == 非全部)添加item
+    curTag.userId.remove(item.id);
+    tarTag.userId.addIf(!tarTag.userId.contains(item.id), item.id);
+    // 数据库更新
+    item.tag = tarTag.tag;
+    updateTag(curTag);
+    updateTag(tarTag);
+    updateItem(item);
+    filterData();
+  }
+
+  void removeTag(FollowUserTag tag) {
+    // 将tag下的所有follow设置为全部
+    for(var i in tag.userId){
+      var follow = DBService.instance.followBox.get(i);
+      if(follow != null){
+        follow.tag = "全部";
+        updateItem(follow);
+      }
+    }
+    FollowService.instance.delFollowUserTag(tag);
+    updateTagList();
+    Log.i('删除tag${tag.tag}');
+  }
+
+  void addTag(String tag) async {
+    FollowService.instance
+        .addFollowUserTag(tag)
+        .then((value) => updateTagList());
+  }
+
+  void updateTag(FollowUserTag followUserTag) {
+    if(followUserTag.tag == '全部'){
+      return;
+    }
+    FollowService.instance.updateFollowUserTag(followUserTag);
+  }
+
+  void updateTagName(FollowUserTag followUserTag, String tag) {
+    // 未操作
+    if (followUserTag.tag == tag) {
+      return;
+    }
+    // 避免重名
+    if (tagList.any((item) => item.tag == tag)) {
+      SmartDialog.showToast("标签名重复，修改失败");
+      return;
+    }
+    final FollowUserTag item = followUserTag.copyWith(tag: tag);
+    updateTag(item);
+    SmartDialog.showToast("修改成功");
+    updateTagList();
+  }
+
+  // 调整标签顺序
+  void updateTagOrder(int oldIndex, int newIndex) {
+    if (newIndex > oldIndex) newIndex -= 1; // 处理索引调整
+    final item = userTagList.removeAt(oldIndex);
+    userTagList.insert(newIndex, item);
+    tagList.value = tagList.take(3).toList();
+    tagList.addAll(userTagList);
+    DBService.instance.updateFollowTagOrder(userTagList);
+  }
+
   @override
   void onClose() {
     onUpdatedIndexedStream?.cancel();