fix: revert commit 7ee6d1e element.weight (#1879)

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

.github/workflows/mac.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   build-mac-app:
     name: Release Mac
-    runs-on: macos-latest
+    runs-on: macos-26
     steps:
       - name: Checkout code
         uses: actions/checkout@v6

ios/Runner/Info.plist

@@ -131,5 +131,13 @@
 		</array>
 		<key>UIStatusBarHidden</key>
 		<false/>
+		<key>NSLocalNetworkUsageDescription</key>
+		<string>需要访问本地网络以发现和连接 DLNA 投屏设备</string>
+		<key>NSBonjourServices</key>
+		<array>
+			<string>_ssdp._udp</string>
+			<string>_upnp._tcp</string>
+			<string>_http._tcp</string>
+		</array>
 	</dict>
 </plist>

lib/pages/danmaku/controller.dart

@@ -6,6 +6,7 @@ import 'package:PiliPlus/grpc/dm.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/plugin/pl_player/controller.dart';
 import 'package:PiliPlus/plugin/pl_player/models/data_source.dart';
+import 'package:PiliPlus/plugin/pl_player/utils/danmaku_options.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/path_utils.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -68,6 +69,7 @@ class PlDanmakuController {
     final uniques = HashMap<String, DanmakuElem>();
 
     final filters = _plPlayerController.filters;
+    final danmakuWeight = DanmakuOptions.danmakuWeight;
     final shouldFilter = filters.count != 0;
     for (final element in elems) {
       if (_isLogin) {
@@ -85,7 +87,8 @@ class PlDanmakuController {
           }
         }
 
-        if (shouldFilter && filters.remove(element)) {
+        if (element.weight < danmakuWeight ||
+            (shouldFilter && filters.remove(element))) {
           continue;
         }
       }

lib/pages/dynamics/widgets/author_panel.dart

@@ -181,21 +181,23 @@ class AuthorPanel extends StatelessWidget {
           Positioned(
             top: 0,
             right: 0,
-            height: height,
-            child: CachedNetworkImage(
-              height: height,
-              memCacheHeight: height.cacheSize(context),
-              imageUrl: ImageUtils.safeThumbnailUrl(
-                moduleAuthor.decorate!.cardUrl,
+            bottom: 0,
+            child: Center(
+              child: CachedNetworkImage(
+                height: height,
+                memCacheHeight: height.cacheSize(context),
+                imageUrl: ImageUtils.safeThumbnailUrl(
+                  moduleAuthor.decorate!.cardUrl,
+                ),
+                placeholder: (_, _) => const SizedBox.shrink(),
               ),
-              placeholder: (_, _) => const SizedBox.shrink(),
             ),
           ),
           if (moduleAuthor.decorate!.fan?.numStr?.isNotEmpty == true)
             Positioned(
               top: 0,
+              bottom: 0,
               right: height,
-              height: height,
               child: Center(
                 child: Text(
                   moduleAuthor.decorate!.fan!.numStr!.toString(),

lib/scripts/patch.ps1

@@ -73,3 +73,10 @@ foreach ($patch in $patches) {
         Write-Host "$patch applied"
     }
 }
+
+# TODO: remove
+if ($platform.ToLower() -eq "android") {
+    "69e31205362b4e59b7eb89b24797e687b4b67afe" | Set-Content -Path .\bin\internal\engine.version
+    Remove-Item -Path ".\bin\cache" -Recurse -Force
+    flutter --version
+}

macos/Runner/Info.plist

@@ -28,5 +28,13 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>需要访问本地网络以发现和连接 DLNA 投屏设备</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_ssdp._udp</string>
+		<string>_upnp._tcp</string>
+		<string>_http._tcp</string>
+	</array>
 </dict>
 </plist>

pubspec.lock

@@ -320,18 +320,18 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c"
+      sha256: b8fe52979ff12432ecf8f0abf6ff70410b1bb734be1c9e4f2f86807ad7166c79
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.1.0"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
       name: connectivity_plus_platform_interface
-      sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204"
+      sha256: "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   convert:
     dependency: transitive
     description:
@@ -400,10 +400,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c"
+      sha256: b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd
       url: "https://pub.dev"
     source: hosted
-    version: "12.3.0"
+    version: "12.4.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -906,10 +906,10 @@ packages:
     dependency: "direct main"
     description:
       name: image_cropper
-      sha256: "2cd06f097b5bd18ff77d3f80fadef83e270ea23c82906bbf17febc3db8d68ec6"
+      sha256: d2555be1ec4b7b12fc502ede481c846ad44578fbb0748debd4c648b25ca07cad
       url: "https://pub.dev"
     source: hosted
-    version: "12.1.0"
+    version: "12.1.1"
   image_cropper_for_web:
     dependency: transitive
     description:
@@ -1283,10 +1283,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
+      sha256: "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "9.0.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1579,10 +1579,10 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840"
+      sha256: "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa"
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.1"
+    version: "12.0.2"
   share_plus_platform_interface:
     dependency: transitive
     description:
@@ -1905,10 +1905,10 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1"
+      sha256: "81da85e9ca8885ade47f9685b953cb098970d11be4821ac765580a6607ea4373"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.20"
+    version: "1.1.21"
   vector_graphics_codec:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
 # update when release
-version: 2.0.1+1
+version: 2.0.2+1
 
 environment:
   sdk: ">=3.10.0"