From f41af00b31190e526c52011d792437c4987ffb14 Mon Sep 17 00:00:00 2001
From: bggRGjQaUbCoE <githubaccount56556@proton.me>
Date: Sun, 13 Jul 2025 11:47:57 +0800
Subject: [PATCH] fix live dm

opt live/article report

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
---
 lib/pages/article/controller.dart    | 5 +++--
 lib/pages/live_room/controller.dart  | 7 ++++---
 lib/plugin/pl_player/controller.dart | 3 +--
 lib/utils/storage_pref.dart          | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/pages/article/controller.dart b/lib/pages/article/controller.dart
index c204e192..ca5064c8 100644
--- a/lib/pages/article/controller.dart
+++ b/lib/pages/article/controller.dart
@@ -5,6 +5,7 @@ import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/http/fav.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/video.dart';
+import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/models/dynamics/article_content_model.dart'
     show ArticleContentModel;
 import 'package:PiliPlus/models/dynamics/result.dart';
@@ -12,7 +13,7 @@ import 'package:PiliPlus/models/model_avatar.dart';
 import 'package:PiliPlus/models_new/article/article_info/data.dart';
 import 'package:PiliPlus/models_new/article/article_view/data.dart';
 import 'package:PiliPlus/pages/common/reply_controller.dart';
-import 'package:PiliPlus/pages/mine/controller.dart';
+import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:PiliPlus/utils/url_utils.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -161,7 +162,7 @@ class ArticleController extends ReplyController<MainListReply> {
     }
     if (isLoaded.value) {
       queryData();
-      if (accountService.isLogin.value && !MineController.anonymity.value) {
+      if (Accounts.get(AccountType.heartbeat).isLogin && !Pref.historyPause) {
         VideoHttp.historyReport(aid: commentId, type: 5);
       }
     }
diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
index 2f413e1c..5ff61147 100644
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -5,12 +5,12 @@ import 'package:PiliPlus/common/widgets/text_field/controller.dart';
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/live.dart';
 import 'package:PiliPlus/http/video.dart';
+import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/models/common/video/live_quality.dart';
 import 'package:PiliPlus/models_new/live/live_dm_info/data.dart';
 import 'package:PiliPlus/models_new/live/live_room_info_h5/data.dart';
 import 'package:PiliPlus/models_new/live/live_room_play_info/codec.dart';
 import 'package:PiliPlus/models_new/live/live_room_play_info/data.dart';
-import 'package:PiliPlus/pages/mine/controller.dart';
 import 'package:PiliPlus/plugin/pl_player/controller.dart';
 import 'package:PiliPlus/plugin/pl_player/models/data_source.dart';
 import 'package:PiliPlus/services/account_service.dart';
@@ -52,6 +52,7 @@ class LiveRoomController extends GetxController {
   List<RichTextItem>? savedDanmaku;
 
   AccountService accountService = Get.find<AccountService>();
+  late final isLogin = accountService.isLogin.value;
 
   LiveDmInfoData? dmInfo;
 
@@ -60,7 +61,7 @@ class LiveRoomController extends GetxController {
     super.onInit();
     roomId = int.parse(Get.parameters['roomid']!);
     queryLiveInfoH5();
-    if (accountService.isLogin.value && !MineController.anonymity.value) {
+    if (Accounts.get(AccountType.heartbeat).isLogin && !Pref.historyPause) {
       VideoHttp.roomEntryAction(roomId: roomId);
     }
   }
@@ -288,7 +289,7 @@ class LiveRoomController extends GetxController {
                 extra['content'],
                 color: DmUtils.decimalToColor(extra['color']),
                 type: DmUtils.getPosition(extra['mode']),
-                selfSend: uid == accountService.mid,
+                selfSend: isLogin && uid == accountService.mid,
               ),
             );
             WidgetsBinding.instance
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 36af96b9..e936c3bb 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -463,8 +463,7 @@ class PlPlayerController {
 
   // 添加一个私有构造函数
   PlPlayerController._() {
-    if (!Accounts.get(AccountType.heartbeat).isLogin ||
-        GStorage.localCache.get(LocalCacheKey.historyPause) == true) {
+    if (!Accounts.get(AccountType.heartbeat).isLogin || Pref.historyPause) {
       enableHeart = false;
     }
 
diff --git a/lib/utils/storage_pref.dart b/lib/utils/storage_pref.dart
index 67a66be7..6867cbd6 100644
--- a/lib/utils/storage_pref.dart
+++ b/lib/utils/storage_pref.dart
@@ -722,4 +722,7 @@ class Pref {
 
   static bool get directExitOnBack =>
       _setting.get(SettingBoxKey.directExitOnBack, defaultValue: false);
+
+  static bool get historyPause =>
+      _localCache.get(LocalCacheKey.historyPause, defaultValue: false);
 }