Skip to content

Commit 960977f

Browse files
xiaoyaoczxiaoyaocz
committed
回滚部分包版本
1 parent e54b4cd commit 960977f

13 files changed

Lines changed: 86 additions & 43 deletions

File tree

‎simple_live_app/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

‎simple_live_app/lib/modules/live_room/player/player_controller.dart‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
88
import 'package:flutter/services.dart';
99
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
1010
import 'package:get/get.dart';
11-
import 'package:flutter_image_gallery_saver/flutter_image_gallery_saver.dart';
11+
import 'package:image_gallery_saver/image_gallery_saver.dart';
1212
import 'package:media_kit/media_kit.dart';
1313
import 'package:media_kit_video/media_kit_video.dart';
1414
import 'package:ns_danmaku/ns_danmaku.dart';
@@ -211,10 +211,12 @@ mixin PlayerSystemMixin on PlayerMixin, PlayerStateMixin, PlayerDanmakuMixin {
211211
final pip = Floating();
212212
StreamSubscription<PiPStatus>? _pipSubscription;
213213

214+
final VolumeController volumeController = VolumeController();
215+
214216
/// 初始化一些系统状态
215217
void initSystem() async {
216218
if (Platform.isAndroid || Platform.isIOS) {
217-
VolumeController.instance.showSystemUI = false;
219+
volumeController.showSystemUI = false;
218220
}
219221

220222
// 屏幕常亮
@@ -377,7 +379,7 @@ mixin PlayerSystemMixin on PlayerMixin, PlayerStateMixin, PlayerDanmakuMixin {
377379
}
378380

379381
if (Platform.isIOS || Platform.isAndroid) {
380-
await FlutterImageGallerySaver.saveImage(
382+
await ImageGallerySaver.saveImage(
381383
imageData,
382384
);
383385
SmartDialog.showToast("已保存截图至相册");
@@ -525,7 +527,7 @@ mixin PlayerGestureControlMixin
525527
verticalDragging = true;
526528
showGestureTip.value = true;
527529
if (Platform.isAndroid || Platform.isIOS) {
528-
_currentVolume = await VolumeController.instance.getVolume();
530+
_currentVolume = await volumeController.getVolume();
529531
}
530532
if (Platform.isAndroid || Platform.isIOS || Platform.isMacOS) {
531533
_currentBrightness = await ScreenBrightness.instance.application;
@@ -589,7 +591,7 @@ mixin PlayerGestureControlMixin
589591

590592
Future _realSetVolume(int volume) async {
591593
Log.logPrint(volume);
592-
VolumeController.instance.setVolume(volume / 100);
594+
volumeController.setVolume(volume / 100);
593595
}
594596

595597
void setGestureBrightness(double dy) {

‎simple_live_app/lib/modules/sync/local_sync/scan_qr/sync_scan_qr_controller.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:async';
33
import 'package:flutter/material.dart';
44
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
55
import 'package:get/get.dart';
6-
import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
6+
import 'package:qr_code_scanner/qr_code_scanner.dart';
77
import 'package:simple_live_app/app/controller/base_controller.dart';
88
import 'package:simple_live_app/app/log.dart';
99
import 'package:simple_live_app/app/utils.dart';

‎simple_live_app/lib/modules/sync/local_sync/scan_qr/sync_scan_qr_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:get/get.dart';
3-
import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
3+
import 'package:qr_code_scanner/qr_code_scanner.dart';
44
import 'package:simple_live_app/modules/sync/local_sync/scan_qr/sync_scan_qr_controller.dart';
55

66
class SyncScanQRPage extends GetView<SyncScanQRControlelr> {

‎simple_live_app/linux/flutter/generated_plugins.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
1212
)
1313

1414
list(APPEND FLUTTER_FFI_PLUGIN_LIST
15+
media_kit_native_event_loop
1516
)
1617

1718
set(PLUGIN_BUNDLED_LIBRARIES)

‎simple_live_app/macos/Flutter/GeneratedPluginRegistrant.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import screen_brightness_macos
1818
import screen_retriever_macos
1919
import share_plus
2020
import url_launcher_macos
21-
import volume_controller
2221
import wakelock_plus
2322
import window_manager
2423

@@ -36,7 +35,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
3635
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
3736
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
3837
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
39-
VolumeControllerPlugin.register(with: registry.registrar(forPlugin: "VolumeControllerPlugin"))
4038
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
4139
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
4240
}

‎simple_live_app/pubspec.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: simple_live_app
2-
version: 1.7.9+10709
2+
version: 1.8.0+10800
33
publish_to: none
44
description: "Simple Live APP"
55
environment:
@@ -48,7 +48,7 @@ dependencies:
4848
path_provider: ^2.1.5 #常用路径
4949
cross_file: ^0.3.4+2 #跨平台文件
5050
permission_handler: ^11.3.1 #权限处理
51-
flutter_image_gallery_saver: ^0.0.2 #图片保存到相册
51+
image_gallery_saver: ^2.0.3 #图片保存到相册
5252
screen_brightness: ^2.1.2 #亮度控制
5353
auto_orientation_v2: ^2.3.6 #屏幕方向
5454
wakelock_plus: ^1.2.11 #屏幕常亮
@@ -57,8 +57,8 @@ dependencies:
5757
floating: ^6.0.0 #PIP画中画
5858
flutter_inappwebview: ^5.8.0 #WebView
5959
connectivity_plus: ^6.1.3 #网络状态
60-
qr_code_scanner_plus: ^2.0.10+1 #二维码扫描
61-
volume_controller: ^3.3.3 #音量控制
60+
qr_code_scanner: ^1.0.1 #二维码扫描
61+
volume_controller: ^2.0.7 #音量控制
6262

6363
# 网络相关
6464
shelf: ^1.4.1
@@ -67,15 +67,18 @@ dependencies:
6767
signalr_netcore: ^1.3.9 #SignalR
6868

6969
# 视频播放
70-
media_kit: ^1.1.11
71-
media_kit_video: ^1.2.5
72-
media_kit_libs_video: ^1.0.5
70+
media_kit: 1.1.11
71+
media_kit_video: 1.2.5
72+
media_kit_libs_video: 1.0.5
7373

7474
flutter:
7575
sdk: flutter
7676
flutter_localizations:
7777
sdk: flutter
7878

79+
dependency_overrides:
80+
screen_brightness: ^2.1.2
81+
7982
dev_dependencies:
8083
flutter_lints: ^2.0.0
8184
build_runner: ^2.3.3

‎simple_live_app/windows/flutter/generated_plugin_registrant.cc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
1616
#include <share_plus/share_plus_windows_plugin_c_api.h>
1717
#include <url_launcher_windows/url_launcher_windows.h>
18-
#include <volume_controller/volume_controller_plugin_c_api.h>
1918
#include <window_manager/window_manager_plugin.h>
2019

2120
void RegisterPlugins(flutter::PluginRegistry* registry) {
@@ -37,8 +36,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
3736
registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
3837
UrlLauncherWindowsRegisterWithRegistrar(
3938
registry->GetRegistrarForPlugin("UrlLauncherWindows"));
40-
VolumeControllerPluginCApiRegisterWithRegistrar(
41-
registry->GetRegistrarForPlugin("VolumeControllerPluginCApi"));
4239
WindowManagerPluginRegisterWithRegistrar(
4340
registry->GetRegistrarForPlugin("WindowManagerPlugin"));
4441
}

‎simple_live_app/windows/flutter/generated_plugins.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ list(APPEND FLUTTER_PLUGIN_LIST
1212
screen_retriever_windows
1313
share_plus
1414
url_launcher_windows
15-
volume_controller
1615
window_manager
1716
)
1817

1918
list(APPEND FLUTTER_FFI_PLUGIN_LIST
19+
media_kit_native_event_loop
2020
)
2121

2222
set(PLUGIN_BUNDLED_LIBRARIES)

‎simple_live_tv_app/pubspec.lock‎

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,10 @@ packages:
316316
dependency: transitive
317317
description:
318318
name: js
319-
sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
319+
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
320320
url: "https://pub.flutter-io.cn"
321321
source: hosted
322-
version: "0.7.1"
322+
version: "0.6.7"
323323
leak_tracker:
324324
dependency: transitive
325325
description:
@@ -404,10 +404,10 @@ packages:
404404
dependency: "direct main"
405405
description:
406406
name: media_kit
407-
sha256: "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776"
407+
sha256: "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62"
408408
url: "https://pub.flutter-io.cn"
409409
source: hosted
410-
version: "1.2.0"
410+
version: "1.1.11"
411411
media_kit_libs_android_video:
412412
dependency: transitive
413413
description:
@@ -444,10 +444,10 @@ packages:
444444
dependency: "direct main"
445445
description:
446446
name: media_kit_libs_video
447-
sha256: "958cc55e7065d9d01f52a2842dab2a0812a92add18489f1006d864fb5e42a3ef"
447+
sha256: "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288"
448448
url: "https://pub.flutter-io.cn"
449449
source: hosted
450-
version: "1.0.6"
450+
version: "1.0.5"
451451
media_kit_libs_windows_video:
452452
dependency: transitive
453453
description:
@@ -456,14 +456,22 @@ packages:
456456
url: "https://pub.flutter-io.cn"
457457
source: hosted
458458
version: "1.0.11"
459+
media_kit_native_event_loop:
460+
dependency: transitive
461+
description:
462+
name: media_kit_native_event_loop
463+
sha256: "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40"
464+
url: "https://pub.flutter-io.cn"
465+
source: hosted
466+
version: "1.0.9"
459467
media_kit_video:
460468
dependency: "direct main"
461469
description:
462470
name: media_kit_video
463-
sha256: a656a9463298c1adc64c57f2d012874f7f2900f0c614d9545a3e7b8bb9e2137b
471+
sha256: "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f"
464472
url: "https://pub.flutter-io.cn"
465473
source: hosted
466-
version: "1.3.0"
474+
version: "1.2.5"
467475
message_pack_dart:
468476
dependency: transitive
469477
description:
@@ -653,10 +661,18 @@ packages:
653661
dependency: transitive
654662
description:
655663
name: safe_local_storage
656-
sha256: e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236
664+
sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
657665
url: "https://pub.flutter-io.cn"
658666
source: hosted
659-
version: "2.0.1"
667+
version: "1.0.2"
668+
screen_brightness:
669+
dependency: "direct overridden"
670+
description:
671+
name: screen_brightness
672+
sha256: eca7bd9d2c3c688bcad14855361cab7097839400b6b4a56f62b7ae511c709958
673+
url: "https://pub.flutter-io.cn"
674+
source: hosted
675+
version: "2.1.2"
660676
screen_brightness_android:
661677
dependency: transitive
662678
description:
@@ -665,6 +681,22 @@ packages:
665681
url: "https://pub.flutter-io.cn"
666682
source: hosted
667683
version: "2.1.1"
684+
screen_brightness_ios:
685+
dependency: transitive
686+
description:
687+
name: screen_brightness_ios
688+
sha256: bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb
689+
url: "https://pub.flutter-io.cn"
690+
source: hosted
691+
version: "2.1.1"
692+
screen_brightness_macos:
693+
dependency: transitive
694+
description:
695+
name: screen_brightness_macos
696+
sha256: "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9"
697+
url: "https://pub.flutter-io.cn"
698+
source: hosted
699+
version: "2.1.1"
668700
screen_brightness_platform_interface:
669701
dependency: transitive
670702
description:
@@ -673,6 +705,14 @@ packages:
673705
url: "https://pub.flutter-io.cn"
674706
source: hosted
675707
version: "2.1.0"
708+
screen_brightness_windows:
709+
dependency: transitive
710+
description:
711+
name: screen_brightness_windows
712+
sha256: d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448
713+
url: "https://pub.flutter-io.cn"
714+
source: hosted
715+
version: "2.1.0"
676716
shelf:
677717
dependency: "direct main"
678718
description:
@@ -840,10 +880,10 @@ packages:
840880
dependency: transitive
841881
description:
842882
name: uri_parser
843-
sha256: ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270
883+
sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
844884
url: "https://pub.flutter-io.cn"
845885
source: hosted
846-
version: "3.0.0"
886+
version: "2.0.2"
847887
url_launcher:
848888
dependency: "direct main"
849889
description:
@@ -936,10 +976,10 @@ packages:
936976
dependency: transitive
937977
description:
938978
name: volume_controller
939-
sha256: e82fd689bb8e1fe8e64be3fa5946ff8699058f8cf9f4c1679acdba20cda7f5bd
979+
sha256: c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e
940980
url: "https://pub.flutter-io.cn"
941981
source: hosted
942-
version: "3.3.3"
982+
version: "2.0.8"
943983
wakelock_plus:
944984
dependency: "direct main"
945985
description:

0 commit comments

Comments
 (0)