mod: findClosestNumber

guozhigq · Apr 4, 2024 · ec77626 · ec77626
1 parent 5500a58
commit ec77626
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart
@@ -91,7 +91,7 @@ class VideoDetailController extends GetxController
   late bool enableCDN;
   late int? cacheVideoQa;
   late String cacheDecode;
-  late int cacheAudioQa;
+  late int defaultAudioQa;
 
   PersistentBottomSheetController? replyReplyBottomSheetCtr;
   RxList<SubTitileContentModel> subtitleContents =
@@ -146,7 +146,7 @@ class VideoDetailController extends GetxController
     // 预设的解码格式
     cacheDecode = setting.get(SettingBoxKey.defaultDecode,
         defaultValue: VideoDecodeFormats.values.last.code);
-    cacheAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
+    defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
         defaultValue: AudioQuality.hiRes.code);
     oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
     getSubtitle();
@@ -353,9 +353,9 @@ class VideoDetailController extends GetxController
 
         if (audiosList.isNotEmpty) {
           final List<int> numbers = audiosList.map((map) => map.id!).toList();
-          int closestNumber = Utils.findClosestNumber(cacheAudioQa, numbers);
-          if (!numbers.contains(cacheAudioQa) &&
-              numbers.any((e) => e > cacheAudioQa)) {
+          int closestNumber = Utils.findClosestNumber(defaultAudioQa, numbers);
+          if (!numbers.contains(defaultAudioQa) &&
+              numbers.any((e) => e > defaultAudioQa)) {
             closestNumber = 30280;
           }
           firstAudio = audiosList.firstWhere((e) => e.id == closestNumber);

diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
@@ -209,6 +209,8 @@ class Utils {
   static int findClosestNumber(int target, List<int> numbers) {
     int minDiff = 127;
     int closestNumber = 0; // 初始化为0，表示没有找到比目标值小的整数
+
+    // 向下查找
     try {
       for (int number in numbers) {
         if (number < target) {
@@ -221,6 +223,20 @@ class Utils {
         }
       }
     } catch (_) {}
+
+    // 向上查找
+    if (closestNumber == 0) {
+      try {
+        for (int number in numbers) {
+          int diff = (number - target).abs();
+
+          if (diff < minDiff) {
+            minDiff = diff;
+            closestNumber = number;
+          }
+        }
+      } catch (_) {}
+    }
     return closestNumber;
   }