Skip to content

Commit af672e9

Browse files
Robert-StackflowRobert-Stackflow
committed
Rollback video player changes under Windows platform
1 parent 9fc5118 commit af672e9

File tree

10 files changed

+13
-174
lines changed

10 files changed

+13
-174
lines changed

‎certificate/Loftify.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "Loftify"
5-
#define MyAppVersion "1.9.0"
5+
#define MyAppVersion "1.10.0"
66
#define MyAppPublisher "Cloudchewie"
77
#define MyAppURL "https://apps.cloudchewie.com/loftify"
88
#define MyAppExeName "Loftify.exe"

‎lib/Screens/main_screen.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,9 @@ class MainScreenState extends State<MainScreen>
765765
_hasJumpedToPinVerify = false;
766766
});
767767
} else {
768+
windowManager.show();
769+
windowManager.focus();
770+
windowManager.restore();
768771
IToast.showTop("尚未设置手势密码");
769772
}
770773
} else if (menuItem.key == 'show_official_website') {

‎lib/main.dart‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import 'package:loftify/Utils/hive_util.dart';
3838
import 'package:loftify/Utils/request_header_util.dart';
3939
import 'package:provider/provider.dart';
4040
import 'package:tray_manager/tray_manager.dart';
41-
import 'package:video_player_media_kit/video_player_media_kit.dart';
4241
import 'package:window_manager/window_manager.dart';
4342

4443
import 'Screens/Info/favorite_folder_detail_screen.dart';
@@ -88,13 +87,13 @@ Future<void> initApp() async {
8887
await DatabaseManager.getDataBase();
8988
Hive.defaultDirectory = await FileUtil.getApplicationDir();
9089
NotificationUtil.init();
91-
VideoPlayerMediaKit.ensureInitialized(
92-
android: true,
93-
iOS: false,
94-
macOS: false,
95-
windows: true,
96-
linux: false,
97-
);
90+
// VideoPlayerMediaKit.ensureInitialized(
91+
// android: false,
92+
// iOS: false,
93+
// macOS: false,
94+
// windows: true,
95+
// linux: false,
96+
// );
9897
}
9998

10099
Future<void> initWindow() async {

‎linux/flutter/generated_plugin_registrant.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <gtk/gtk_plugin.h>
1010
#include <hotkey_manager_linux/hotkey_manager_linux_plugin.h>
1111
#include <isar_flutter_libs/isar_flutter_libs_plugin.h>
12-
#include <media_kit_video/media_kit_video_plugin.h>
1312
#include <screen_retriever/screen_retriever_plugin.h>
1413
#include <tray_manager/tray_manager_plugin.h>
1514
#include <url_launcher_linux/url_launcher_plugin.h>
@@ -25,9 +24,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
2524
g_autoptr(FlPluginRegistrar) isar_flutter_libs_registrar =
2625
fl_plugin_registry_get_registrar_for_plugin(registry, "IsarFlutterLibsPlugin");
2726
isar_flutter_libs_plugin_register_with_registrar(isar_flutter_libs_registrar);
28-
g_autoptr(FlPluginRegistrar) media_kit_video_registrar =
29-
fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitVideoPlugin");
30-
media_kit_video_plugin_register_with_registrar(media_kit_video_registrar);
3127
g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
3228
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
3329
screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);

‎linux/flutter/generated_plugins.cmake‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ list(APPEND FLUTTER_PLUGIN_LIST
66
gtk
77
hotkey_manager_linux
88
isar_flutter_libs
9-
media_kit_video
109
screen_retriever
1110
tray_manager
1211
url_launcher_linux
1312
window_manager
1413
)
1514

1615
list(APPEND FLUTTER_FFI_PLUGIN_LIST
17-
media_kit_native_event_loop
1816
)
1917

2018
set(PLUGIN_BUNDLED_LIBRARIES)

‎macos/Flutter/GeneratedPluginRegistrant.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ import flutter_local_notifications
1313
import hotkey_manager_macos
1414
import isar_flutter_libs
1515
import just_audio
16-
import media_kit_libs_macos_video
17-
import media_kit_video
1816
import package_info_plus
1917
import path_provider_foundation
20-
import screen_brightness_macos
2118
import screen_retriever
2219
import share_plus
2320
import sqflite
@@ -36,11 +33,8 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
3633
HotkeyManagerMacosPlugin.register(with: registry.registrar(forPlugin: "HotkeyManagerMacosPlugin"))
3734
IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin"))
3835
JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
39-
MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
40-
MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
4136
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
4237
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
43-
ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin"))
4438
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
4539
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
4640
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))

‎pubspec.lock‎

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,54 +1045,6 @@ packages:
10451045
url: "https://pub.flutter-io.cn"
10461046
source: hosted
10471047
version: "0.8.0"
1048-
media_kit:
1049-
dependency: transitive
1050-
description:
1051-
name: media_kit
1052-
sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
1053-
url: "https://pub.flutter-io.cn"
1054-
source: hosted
1055-
version: "1.1.10+1"
1056-
media_kit_libs_android_video:
1057-
dependency: "direct main"
1058-
description:
1059-
name: media_kit_libs_android_video
1060-
sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c"
1061-
url: "https://pub.flutter-io.cn"
1062-
source: hosted
1063-
version: "1.3.6"
1064-
media_kit_libs_macos_video:
1065-
dependency: "direct main"
1066-
description:
1067-
name: media_kit_libs_macos_video
1068-
sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d
1069-
url: "https://pub.flutter-io.cn"
1070-
source: hosted
1071-
version: "1.1.4"
1072-
media_kit_libs_windows_video:
1073-
dependency: "direct main"
1074-
description:
1075-
name: media_kit_libs_windows_video
1076-
sha256: "7bace5f35d9afcc7f9b5cdadb7541d2191a66bb3fc71bfa11c1395b3360f6122"
1077-
url: "https://pub.flutter-io.cn"
1078-
source: hosted
1079-
version: "1.0.9"
1080-
media_kit_native_event_loop:
1081-
dependency: transitive
1082-
description:
1083-
name: media_kit_native_event_loop
1084-
sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e
1085-
url: "https://pub.flutter-io.cn"
1086-
source: hosted
1087-
version: "1.0.8"
1088-
media_kit_video:
1089-
dependency: transitive
1090-
description:
1091-
name: media_kit_video
1092-
sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
1093-
url: "https://pub.flutter-io.cn"
1094-
source: hosted
1095-
version: "1.2.4"
10961048
menu_base:
10971049
dependency: transitive
10981050
description:
@@ -1397,62 +1349,6 @@ packages:
13971349
url: "https://pub.flutter-io.cn"
13981350
source: hosted
13991351
version: "0.27.7"
1400-
safe_local_storage:
1401-
dependency: transitive
1402-
description:
1403-
name: safe_local_storage
1404-
sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
1405-
url: "https://pub.flutter-io.cn"
1406-
source: hosted
1407-
version: "1.0.2"
1408-
screen_brightness:
1409-
dependency: transitive
1410-
description:
1411-
name: screen_brightness
1412-
sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd
1413-
url: "https://pub.flutter-io.cn"
1414-
source: hosted
1415-
version: "0.2.2+1"
1416-
screen_brightness_android:
1417-
dependency: transitive
1418-
description:
1419-
name: screen_brightness_android
1420-
sha256: "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf"
1421-
url: "https://pub.flutter-io.cn"
1422-
source: hosted
1423-
version: "0.1.0+2"
1424-
screen_brightness_ios:
1425-
dependency: transitive
1426-
description:
1427-
name: screen_brightness_ios
1428-
sha256: "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2"
1429-
url: "https://pub.flutter-io.cn"
1430-
source: hosted
1431-
version: "0.1.0"
1432-
screen_brightness_macos:
1433-
dependency: transitive
1434-
description:
1435-
name: screen_brightness_macos
1436-
sha256: "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd"
1437-
url: "https://pub.flutter-io.cn"
1438-
source: hosted
1439-
version: "0.1.0+1"
1440-
screen_brightness_platform_interface:
1441-
dependency: transitive
1442-
description:
1443-
name: screen_brightness_platform_interface
1444-
sha256: b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171
1445-
url: "https://pub.flutter-io.cn"
1446-
source: hosted
1447-
version: "0.1.0"
1448-
screen_brightness_windows:
1449-
dependency: transitive
1450-
description:
1451-
name: screen_brightness_windows
1452-
sha256: "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86"
1453-
url: "https://pub.flutter-io.cn"
1454-
source: hosted
1455-
version: "0.1.3"
14561352
screen_retriever:
14571353
dependency: transitive
14581354
description:
@@ -1690,22 +1586,6 @@ packages:
16901586
url: "https://pub.flutter-io.cn"
16911587
source: hosted
16921588
version: "2.2.2"
1693-
universal_platform:
1694-
dependency: transitive
1695-
description:
1696-
name: universal_platform
1697-
sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
1698-
url: "https://pub.flutter-io.cn"
1699-
source: hosted
1700-
version: "1.1.0"
1701-
uri_parser:
1702-
dependency: transitive
1703-
description:
1704-
name: uri_parser
1705-
sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
1706-
url: "https://pub.flutter-io.cn"
1707-
source: hosted
1708-
version: "2.0.2"
17091589
url_launcher:
17101590
dependency: "direct main"
17111591
description:
@@ -1834,14 +1714,6 @@ packages:
18341714
url: "https://pub.flutter-io.cn"
18351715
source: hosted
18361716
version: "2.6.1"
1837-
video_player_media_kit:
1838-
dependency: "direct main"
1839-
description:
1840-
name: video_player_media_kit
1841-
sha256: eadf78b85d0ecc6f65bb5ca84c5ad9546a8609c6c0ee207e81673f7969461f3b
1842-
url: "https://pub.flutter-io.cn"
1843-
source: hosted
1844-
version: "1.0.5"
18451717
video_player_platform_interface:
18461718
dependency: transitive
18471719
description:
@@ -1874,14 +1746,6 @@ packages:
18741746
url: "https://pub.flutter-io.cn"
18751747
source: hosted
18761748
version: "14.2.1"
1877-
volume_controller:
1878-
dependency: transitive
1879-
description:
1880-
name: volume_controller
1881-
sha256: "189bdc7a554f476b412e4c8b2f474562b09d74bc458c23667356bce3ca1d48c9"
1882-
url: "https://pub.flutter-io.cn"
1883-
source: hosted
1884-
version: "2.0.7"
18851749
wakelock_plus:
18861750
dependency: transitive
18871751
description:

‎pubspec.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ dependencies:
1919
card_swiper: ^3.0.1 # 卡片滑动
2020
modal_bottom_sheet: ^3.0.0 # 底部弹窗
2121
video_player: ^2.9.1 # 视频播放
22-
video_player_media_kit: ^1.0.5 # 视频播放
23-
media_kit_libs_android_video: any
24-
media_kit_libs_macos_video: any
25-
media_kit_libs_windows_video: any
22+
# video_player_media_kit: ^1.0.5 # 视频播放
23+
# media_kit_libs_windows_video: ^1.0.9
2624
like_button: ^2.0.5 # 点赞按钮
2725
sliding_up_panel: ^2.0.0+1 # 滑动面板
2826
blur: ^3.1.0 # 模糊

‎windows/flutter/generated_plugin_registrant.cc‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
#include <hotkey_manager_windows/hotkey_manager_windows_plugin_c_api.h>
1111
#include <isar_flutter_libs/isar_flutter_libs_plugin.h>
1212
#include <local_auth_windows/local_auth_plugin.h>
13-
#include <media_kit_libs_windows_video/media_kit_libs_windows_video_plugin_c_api.h>
14-
#include <media_kit_video/media_kit_video_plugin_c_api.h>
1513
#include <permission_handler_windows/permission_handler_windows_plugin.h>
16-
#include <screen_brightness_windows/screen_brightness_windows_plugin.h>
1714
#include <screen_retriever/screen_retriever_plugin.h>
1815
#include <share_plus/share_plus_windows_plugin_c_api.h>
1916
#include <tray_manager/tray_manager_plugin.h>
@@ -29,14 +26,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
2926
registry->GetRegistrarForPlugin("IsarFlutterLibsPlugin"));
3027
LocalAuthPluginRegisterWithRegistrar(
3128
registry->GetRegistrarForPlugin("LocalAuthPlugin"));
32-
MediaKitLibsWindowsVideoPluginCApiRegisterWithRegistrar(
33-
registry->GetRegistrarForPlugin("MediaKitLibsWindowsVideoPluginCApi"));
34-
MediaKitVideoPluginCApiRegisterWithRegistrar(
35-
registry->GetRegistrarForPlugin("MediaKitVideoPluginCApi"));
3629
PermissionHandlerWindowsPluginRegisterWithRegistrar(
3730
registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
38-
ScreenBrightnessWindowsPluginRegisterWithRegistrar(
39-
registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin"));
4031
ScreenRetrieverPluginRegisterWithRegistrar(
4132
registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
4233
SharePlusWindowsPluginCApiRegisterWithRegistrar(

‎windows/flutter/generated_plugins.cmake‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
77
hotkey_manager_windows
88
isar_flutter_libs
99
local_auth_windows
10-
media_kit_libs_windows_video
11-
media_kit_video
1210
permission_handler_windows
13-
screen_brightness_windows
1411
screen_retriever
1512
share_plus
1613
tray_manager
@@ -19,7 +16,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
1916
)
2017

2118
list(APPEND FLUTTER_FFI_PLUGIN_LIST
22-
media_kit_native_event_loop
2319
)
2420

2521
set(PLUGIN_BUNDLED_LIBRARIES)

0 commit comments

Comments
 (0)