diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3365dd7d..afb0b3ea 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,9 @@ on: branches: - main # paths-ignore - + repository_dispatch: + types: + - api env: # APP名称 APP_NAME: ADBKIT diff --git a/CHANGELOG.md b/CHANGELOG.md index 9031e87e..8f5ca45b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.3.9 +- 修复 adb dex server在安卓12启动失败的问题 +- 优化日志显示 +- 修复无法加载 Android13 图标的bug +- Flutter框架引擎升级到3.7.1 + ## 1.3.8-1 - 修复设备激活Shizuku提示权限不足的问题 diff --git a/assets/app_server b/assets/app_server index 6e254d76..dc6821d4 100644 Binary files a/assets/app_server and b/assets/app_server differ diff --git a/lib/adb_tool.dart b/lib/adb_tool.dart index 8304c799..243560b8 100644 --- a/lib/adb_tool.dart +++ b/lib/adb_tool.dart @@ -1,6 +1,6 @@ library adb_tool; -import 'package:flutter_acrylic/flutter_acrylic.dart'; +// import 'package:flutter_acrylic/flutter_acrylic.dart'; // 这个文件提供其他项目集成adb_tool的时候导包 export 'app/modules/history/history_page.dart'; @@ -18,6 +18,7 @@ export 'themes/theme.dart'; Future getMacTitlebarWidth() async { - return await Window.getTitlebarHeight(); + return 0; + // return await Window.getTitlebarHeight(); } diff --git a/lib/adbkit_entrypoint.dart b/lib/adbkit_entrypoint.dart index 053bcad7..a699b435 100644 --- a/lib/adbkit_entrypoint.dart +++ b/lib/adbkit_entrypoint.dart @@ -68,9 +68,9 @@ class _ADBToolEntryPointState extends State with WindowListen Global.instance.initGlobal(); Global.instance.hasSafeArea = widget.hasSafeArea; Global.instance.showQRCode = widget.showQRCode; - AppManager.globalInstance; DevicesController controller = Get.find(); controller.init(); + AppManager.globalInstance; isInit = true; } diff --git a/lib/app/controller/config_controller.dart b/lib/app/controller/config_controller.dart index 535c02b9..d9bfcdd2 100644 --- a/lib/app/controller/config_controller.dart +++ b/lib/app/controller/config_controller.dart @@ -3,7 +3,7 @@ import 'package:adb_tool/config/settings.dart'; import 'package:adb_tool/themes/theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_acrylic/flutter_acrylic.dart'; +// import 'package:flutter_acrylic/flutter_acrylic.dart'; import 'package:get/get.dart' hide ScreenType; import 'package:global_repository/global_repository.dart'; import 'package:settings/settings.dart'; @@ -35,29 +35,29 @@ class ConfigController extends GetxController { }; void syncBackgroundStyle() { - if (backgroundStyle == BackgroundStyle.normal) { - if (GetPlatform.isWindows || GetPlatform.isLinux) { - return; - } - Window.setEffect( - effect: WindowEffect.disabled, - color: theme.colorScheme.background, - dark: false, - ); - } - if (backgroundStyle == BackgroundStyle.image) { - Window.setEffect( - effect: WindowEffect.disabled, - color: theme.colorScheme.background.withOpacity(0.2), - dark: false, - ); - } else { - Window.setEffect( - effect: WindowEffect.acrylic, - color: theme.colorScheme.background.withOpacity(0.2), - dark: false, - ); - } + // if (backgroundStyle == BackgroundStyle.normal) { + // if (GetPlatform.isWindows || GetPlatform.isLinux) { + // return; + // } + // Window.setEffect( + // effect: WindowEffect.disabled, + // color: theme.colorScheme.background, + // dark: false, + // ); + // } + // if (backgroundStyle == BackgroundStyle.image) { + // Window.setEffect( + // effect: WindowEffect.disabled, + // color: theme.colorScheme.background.withOpacity(0.2), + // dark: false, + // ); + // } else { + // Window.setEffect( + // effect: WindowEffect.acrylic, + // color: theme.colorScheme.background.withOpacity(0.2), + // dark: false, + // ); + // } } void changeBackgroundStyle(BackgroundStyle style) { diff --git a/lib/app/controller/devices_controller.dart b/lib/app/controller/devices_controller.dart index 30123d96..fff5c1c0 100644 --- a/lib/app/controller/devices_controller.dart +++ b/lib/app/controller/devices_controller.dart @@ -111,7 +111,9 @@ class DevicesController extends GetxController { String out = await execCmd('$adb start-server'); Log.d('adb start-server out:$out'); // ignore: empty_catches - } catch (e) {} + } catch (e) { + Log.e(e); + } Future.delayed(const Duration(milliseconds: 1000), () { letADBStarted(); }); diff --git a/lib/app/modules/developer_tool/dash_board.dart b/lib/app/modules/developer_tool/dash_board.dart index c3c281e0..9d3973fd 100644 --- a/lib/app/modules/developer_tool/dash_board.dart +++ b/lib/app/modules/developer_tool/dash_board.dart @@ -43,6 +43,7 @@ class _DashboardState extends State with WindowListener { ADBChannel adbChannel; Terminal terminal = Terminal(); + /// 获取卡片宽度,主要是做响应式适配的 double getCardWidth() { ResponsiveWrapperData data = ResponsiveWrapper.of(context); if (data.isPhone) { @@ -363,7 +364,7 @@ class _DashboardState extends State with WindowListener { List paths; if (GetPlatform.isDesktop) { paths = []; - final typeGroup = XTypeGroup( + const typeGroup = XTypeGroup( label: 'apk', extensions: ['apk'], ); @@ -375,6 +376,7 @@ class _DashboardState extends State with WindowListener { paths.add(xFile.path); } } else { + // ignore: use_build_context_synchronously paths = await FileSelector.pick(context); } if (paths.isEmpty) { @@ -411,6 +413,7 @@ class _DashboardState extends State with WindowListener { ); } + void installApkWithPaths(List paths) { showDialog( context: context, diff --git a/lib/app/modules/developer_tool/dialog/install_apk.dart b/lib/app/modules/developer_tool/dialog/install_apk.dart index d7d58c9c..1b11b047 100644 --- a/lib/app/modules/developer_tool/dialog/install_apk.dart +++ b/lib/app/modules/developer_tool/dialog/install_apk.dart @@ -14,7 +14,11 @@ class InstallApkDialog extends StatefulWidget { this.paths, @required this.adbChannel, }) : super(key: key); + + /// 路径列表 final List paths; + + /// adb channel 实例 final ADBChannel adbChannel; @override @@ -45,6 +49,7 @@ class _InstallApkDialogState extends State { setState(() {}); } }); + StringBuffer stringBuffer = StringBuffer(); for (final String path in widget.paths) { final String name = p.basename(path); currentFile = name; @@ -52,11 +57,15 @@ class _InstallApkDialogState extends State { try { await widget.adbChannel.install(path); } catch (e) { - showToast('$name 安装失败,输出:$e'); + stringBuffer.write('$name: ${e.message}\n'); } fileIndex++; // showToast('$name 已上传'); } + if (stringBuffer.isNotEmpty) { + showToast('安装Apk错误输出\n:${stringBuffer.toString().trim()}', duration: const Duration(milliseconds: 5000)); + } + // ignore: use_build_context_synchronously Navigator.of(context).pop(); } @@ -86,7 +95,7 @@ class _InstallApkDialogState extends State { RichText( text: TextSpan( children: [ - TextSpan( + TextSpan( text: '(', style: TextStyle( color: AppColors.fontColor, @@ -95,14 +104,14 @@ class _InstallApkDialogState extends State { ), TextSpan( text: '$fileIndex', - style: TextStyle( + style: TextStyle( color: Theme.of(context).primaryColor, fontWeight: bold, ), ), TextSpan( text: '/$fileNum)', - style: TextStyle( + style: TextStyle( color: AppColors.fontColor, fontWeight: bold, ), diff --git a/lib/app/modules/developer_tool/implement/binadb_channel.dart b/lib/app/modules/developer_tool/implement/binadb_channel.dart index c984250b..41f53c45 100644 --- a/lib/app/modules/developer_tool/implement/binadb_channel.dart +++ b/lib/app/modules/developer_tool/implement/binadb_channel.dart @@ -19,24 +19,24 @@ class BinADBChannel extends ADBChannel { @override Future install(String file) async { - await execCmmand('adb -s $serial install -t $file'); + await execCmmand('$adb -s $serial install -t $file'); } @override Future push(String localPath, String remotePath) async { final String fileName = basename(localPath); - await execCmmand('adb -s $serial push $localPath $remotePath$fileName'); + await execCmmand('$adb -s $serial push $localPath $remotePath$fileName'); } @override Future changeNetDebugStatus(int port) async { if (port == 5555) { await execCmmand( - 'adb -s $serial tcpip 5555', + '$adb -s $serial tcpip 5555', ); } else { await execCmmand( - 'adb -s $serial usb', + '$adb -s $serial usb', ); } } diff --git a/lib/app/modules/developer_tool/task_manager.dart b/lib/app/modules/developer_tool/task_manager.dart index 905d34d4..63fe7409 100644 --- a/lib/app/modules/developer_tool/task_manager.dart +++ b/lib/app/modules/developer_tool/task_manager.dart @@ -8,7 +8,6 @@ import 'package:adb_tool/utils/http/http.dart'; import 'package:adb_tool/utils/task.dart'; import 'package:adbutil/adbutil.dart'; import 'package:app_manager/app_manager.dart'; -import 'package:app_manager/core/interface/app_channel.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart' hide Response; @@ -36,14 +35,13 @@ class _TaskManagerState extends State { initTask() async { channel = await DexServer.startServer(widget.entity.serial); screenSize = ScreenSize.fromWM( - await execCmd('adb -s ${widget.entity.serial} shell wm size'), + await execCmd('$adb -s ${widget.entity.serial} shell wm size'), ); Timer.periodic(const Duration(seconds: 1), (timer) async { if (!mounted) { timer.cancel(); } - Response res = - await httpInstance.get('http://127.0.0.1:${channel.port}/'); + Response res = await httpInstance.get('http://127.0.0.1:${channel.port}/'); List data = res.data; Log.i(data); diff --git a/lib/app/modules/exec_cmd_page.dart b/lib/app/modules/exec_cmd_page.dart index fa9856bf..1926c091 100644 --- a/lib/app/modules/exec_cmd_page.dart +++ b/lib/app/modules/exec_cmd_page.dart @@ -33,8 +33,7 @@ class _ExecCmdPageState extends State { @override Widget build(BuildContext context) { AppBar appBar; - if (ResponsiveWrapper.of(context).isPhone || - controller.screenType == ScreenType.phone) { + if (ResponsiveWrapper.of(context).isPhone || controller.screenType == ScreenType.phone) { appBar = AppBar( title: Text(S.of(context).terminal), automaticallyImplyLeading: false, @@ -74,7 +73,7 @@ class _ExecCmdPageState extends State { ItemButton( title: '开启服务', onTap: () async { - const String cmd = 'adb start-server\r'; + String cmd = '$adb start-server\r'; Global().pty.writeString(cmd); AdbUtil.startPoolingListDevices(); }, @@ -82,7 +81,7 @@ class _ExecCmdPageState extends State { ItemButton( title: '停止服务', onTap: () async { - const String cmd = 'adb kill-server\r'; + String cmd = '$adb kill-server\r'; Global().pty.writeString(cmd); AdbUtil.stopPoolingListDevices(); final DevicesController controller = Get.find(); @@ -92,8 +91,7 @@ class _ExecCmdPageState extends State { ItemButton( title: '重启服务', onTap: () async { - const String cmd = - 'adb kill-server && adb start-server\r'; + String cmd = '$adb kill-server && adb start-server\r'; Global().pty.writeString(cmd); }, ), diff --git a/lib/app/modules/home/views/adaptive_view.dart b/lib/app/modules/home/views/adaptive_view.dart index 067091e1..8c07b664 100644 --- a/lib/app/modules/home/views/adaptive_view.dart +++ b/lib/app/modules/home/views/adaptive_view.dart @@ -10,7 +10,7 @@ import 'package:adb_tool/utils/plugin_util.dart'; import 'package:animations/animations.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_acrylic/flutter_acrylic.dart'; +// import 'package:flutter_acrylic/flutter_acrylic.dart'; import 'package:get/get.dart' hide ScreenType; import 'package:global_repository/global_repository.dart'; import 'package:responsive_framework/responsive_framework.dart'; @@ -46,8 +46,8 @@ class _AdbToolState extends State with WidgetsBindingObserver { if (GetPlatform.isMacOS && RuntimeEnvir.packageName == Config.packageName) { // 如果这个项目是独立运行的,那么RuntimeEnvir.packageName会在main函数中被设置成Config.packageName Config.flutterPackage = 'packages/adb_tool/'; - Window.makeTitlebarTransparent(); - Window.enableFullSizeContentView(); + // Window.makeTitlebarTransparent(); + // Window.enableFullSizeContentView(); } configController.syncBackgroundStyle(); WidgetsBinding.instance.addObserver(this); diff --git a/lib/app/modules/wrappers/app_launcher_wrapper.dart b/lib/app/modules/wrappers/app_launcher_wrapper.dart index b94507c0..e5d0edcd 100644 --- a/lib/app/modules/wrappers/app_launcher_wrapper.dart +++ b/lib/app/modules/wrappers/app_launcher_wrapper.dart @@ -4,7 +4,6 @@ import 'package:adb_tool/utils/dex_server.dart'; import 'package:app_launcher/app_launcher.dart'; import 'package:app_manager/app_manager.dart'; import 'package:app_manager/controller/app_manager_controller.dart'; -import 'package:app_manager/core/interface/app_channel.dart'; import 'package:flutter/material.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:get/get.dart'; @@ -18,7 +17,7 @@ class AppLauncherWrapper extends StatefulWidget { final DevicesEntity devicesEntity; @override - _AppLauncherWrapperState createState() => _AppLauncherWrapperState(); + State createState() => _AppLauncherWrapperState(); } class _AppLauncherWrapperState extends State { diff --git a/lib/app/modules/wrappers/app_manager_wrapper.dart b/lib/app/modules/wrappers/app_manager_wrapper.dart index 1cd32fbf..6bf7cec2 100644 --- a/lib/app/modules/wrappers/app_manager_wrapper.dart +++ b/lib/app/modules/wrappers/app_manager_wrapper.dart @@ -3,7 +3,6 @@ import 'package:adb_tool/themes/app_colors.dart'; import 'package:adb_tool/utils/dex_server.dart'; import 'package:app_manager/app_manager.dart'; import 'package:app_manager/controller/app_manager_controller.dart'; -import 'package:app_manager/core/interface/app_channel.dart'; import 'package:flutter/material.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:get/get.dart'; @@ -17,7 +16,7 @@ class AppManagerWrapper extends StatefulWidget { final DevicesEntity devicesEntity; @override - _AppManagerWrapperState createState() => _AppManagerWrapperState(); + State createState() => _AppManagerWrapperState(); } class _AppManagerWrapperState extends State { @@ -50,8 +49,7 @@ class _AppManagerWrapperState extends State { } return AppManagerEntryPoint( // 直接进到设备的shell - process: YanProcess() - ..exec('adb -s ${widget.devicesEntity.serial} shell'), + process: YanProcess()..exec('adb -s ${widget.devicesEntity.serial} shell'), ); } } diff --git a/lib/config/config.dart b/lib/config/config.dart index 031d455c..7dd39890 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -7,8 +7,8 @@ class Config { static String packageName = 'com.nightmare.adbtools'; static Directory localDir = Directory('${RuntimeEnvir.configPath}/AdbTool'); static File historySaveFile = File('${localDir.path}/.history'); - static int versionCode = 33; - static String versionName = '1.3.6'; + static int versionCode = 37; + static String versionName = '1.3.9'; static String adbLocalPath = '/data/local/tmp'; static String sdcard = '/sdcard'; diff --git a/lib/global/instance/global.dart b/lib/global/instance/global.dart index 954fb786..3e327827 100644 --- a/lib/global/instance/global.dart +++ b/lib/global/instance/global.dart @@ -50,7 +50,7 @@ class Global { bool isInit = false; Multicast multicast = Multicast( - port: adbToolUdpPort, + port: adbToolUdpPort , ); GlobalKey navigatorKey = GlobalKey(); @@ -231,10 +231,14 @@ class Global { Log.i('是否自动连接局域网设备 ${controller.autoConnect}'); isInit = true; if (controller.autoConnect) { - _receiveBoardCast(); + try { + _receiveBoardCast(); + } catch (e) {} } if (GetPlatform.isAndroid) { - _sendBoardCast(); + try { + _sendBoardCast(); + } catch (e) {} } _socketServer(); await installAdbToEnvir(); diff --git a/lib/global/widget/mac_safearea.dart b/lib/global/widget/mac_safearea.dart index dcac8171..afecc377 100644 --- a/lib/global/widget/mac_safearea.dart +++ b/lib/global/widget/mac_safearea.dart @@ -1,6 +1,6 @@ import 'package:adb_tool/global/instance/global.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_acrylic/flutter_acrylic.dart'; +// import 'package:flutter_acrylic/flutter_acrylic.dart'; import 'package:get/utils.dart'; import 'package:window_manager/window_manager.dart'; diff --git a/lib/main.dart b/lib/main.dart index d352d173..d3ec2e13 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,7 @@ library adb_tool; import 'dart:async'; import 'package:adb_tool/global/instance/plugin_manager.dart'; import 'package:file_manager_view/file_manager_view.dart' hide Config; -import 'package:flutter_acrylic/flutter_acrylic.dart'; +// import 'package:flutter_acrylic/flutter_acrylic.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:global_repository/global_repository.dart'; @@ -47,7 +47,7 @@ Future runADBClient({Color primary}) async { if (primary != null) { seed = primary; } - // 启动文件管理器服务,以供 ADB KIT 选择本机文件 + // // 启动文件管理器服务,以供 ADB KIT 选择本机文件 Server.start(); runZonedGuarded( () async { @@ -60,9 +60,9 @@ Future runADBClient({Color primary}) async { appSupportDirectory: dir, ); } - if (GetPlatform.isDesktop) { - await Window.initialize(); - } + // if (GetPlatform.isDesktop) { + // await Window.initialize(); + // } runApp(const MaterialAppWrapper()); }, (error, stackTrace) { diff --git a/lib/utils/dex_server.dart b/lib/utils/dex_server.dart index 8762e2aa..e1cb6411 100644 --- a/lib/utils/dex_server.dart +++ b/lib/utils/dex_server.dart @@ -6,7 +6,6 @@ import 'package:adb_tool/config/config.dart'; import 'package:adb_tool/config/settings.dart'; import 'package:adbutil/adbutil.dart'; import 'package:app_manager/app_manager.dart'; -import 'package:app_manager/core/interface/app_channel.dart'; import 'package:get/get.dart'; import 'package:global_repository/global_repository.dart'; import 'package:settings/settings.dart'; @@ -18,7 +17,7 @@ import 'package:settings/settings.dart'; class DexServer { DexServer._(); static Map serverStartList = {}; - static int rangeStart = 6040; + static int rangeStart = 14040; // TODO(nightmare):这个最终应该改成isolate, static Future startServer(String devicesId) async { await initSetting(); @@ -64,8 +63,6 @@ class DexServer { if (line.contains(startTag)) { Log.e('time:${stopwatch.elapsed}'); // 这个端口是对方设备成功绑定的端口 - Log.d(line); - Log.d(line.replaceAll(RegExp('.*>|<.*'), '')); final int remotePort = int.tryParse(line.replaceAll(RegExp('.*>|<.*'), '')); Log.d('remotePort -> $remotePort'); // 这个端口是本机成功绑定的端口 @@ -78,9 +75,9 @@ class DexServer { rangeStart += 10; Log.d('localPort -> $localPort'); // 这样才能保证列表正常 - final RemoteAppChannel channel = RemoteAppChannel(); - channel.port = localPort; - channel.serial = devicesId; + final RemoteAppChannel channel = RemoteAppChannel(port: localPort); + // TODO 下面这行之前是放开的注释 + // channel.serial = devicesId; serverStartList[devicesId] = channel; completer.complete(channel); } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 8607071e..7e11ab27 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -7,7 +7,6 @@ #include "generated_plugin_registrant.h" #include -#include #include #include #include @@ -16,9 +15,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) desktop_drop_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopDropPlugin"); desktop_drop_plugin_register_with_registrar(desktop_drop_registrar); - g_autoptr(FlPluginRegistrar) flutter_acrylic_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterAcrylicPlugin"); - flutter_acrylic_plugin_register_with_registrar(flutter_acrylic_registrar); g_autoptr(FlPluginRegistrar) screen_retriever_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin"); screen_retriever_plugin_register_with_registrar(screen_retriever_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 87d93cc8..e9086211 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_drop - flutter_acrylic screen_retriever url_launcher_linux window_manager diff --git a/macos/Podfile b/macos/Podfile index dade8dfa..049abe29 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.11' +platform :osx, '10.14' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/macos/Podfile.lock b/macos/Podfile.lock index b7443687..55c4b53e 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -3,12 +3,11 @@ PODS: - FlutterMacOS - file_selector_macos (0.0.1): - FlutterMacOS - - flutter_acrylic (0.1.0): - - FlutterMacOS - flutter_pty (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - - path_provider_macos (0.0.1): + - path_provider_foundation (0.0.1): + - Flutter - FlutterMacOS - screen_retriever (0.0.1): - FlutterMacOS @@ -22,10 +21,9 @@ PODS: DEPENDENCIES: - desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`) - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) - - flutter_acrylic (from `Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos`) - flutter_pty (from `Flutter/ephemeral/.symlinks/plugins/flutter_pty/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos`) - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`) @@ -36,14 +34,12 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos file_selector_macos: :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos - flutter_acrylic: - :path: Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos flutter_pty: :path: Flutter/ephemeral/.symlinks/plugins/flutter_pty/macos FlutterMacOS: :path: Flutter/ephemeral - path_provider_macos: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos screen_retriever: :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos url_launcher_macos: @@ -56,15 +52,14 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898 file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6 - flutter_acrylic: c3df24ae52ab6597197837ce59ef2a8542640c17 flutter_pty: 41b6f848ade294be726a6b94cdd4a67c3bc52f59 - FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 - path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852 screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 - url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 + url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2 wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 -PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c +PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 COCOAPODS: 1.11.3 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 8062cf27..7ee3bada 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -256,6 +256,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -404,7 +405,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -484,7 +485,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -531,7 +532,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift index 52d0b289..14bdb105 100644 --- a/macos/Runner/MainFlutterWindow.swift +++ b/macos/Runner/MainFlutterWindow.swift @@ -1,44 +1,56 @@ import Cocoa import FlutterMacOS -import flutter_acrylic +// import flutter_acrylic class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() let windowFrame = self.frame - let blurryContainerViewController = BlurryContainerViewController() - self.contentViewController = blurryContainerViewController + self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) - /* Initialize the flutter_acrylic plugin */ - MainFlutterWindowManipulator.start(mainFlutterWindow: self) - - RegisterGeneratedPlugins(registry: blurryContainerViewController.flutterViewController) - /* Hiding the window titlebar */ - // self.titleVisibility = NSWindow.TitleVisibility.hidden; -// self.titlebarAppearsTransparent = true; -// self.isMovableByWindowBackground = true; -// // self.standardWindowButton(NSWindow.ButtonType.miniaturizeButton)?.isEnabled = false; - -// /* Making the window transparent */ -// self.isOpaque = false -// self.backgroundColor = .clear -// /* Adding a NSVisualEffectView to act as a translucent background */ -// let contentView = contentViewController!.view; -// let superView = contentView.superview!; - -// let blurView = NSVisualEffectView() -// blurView.frame = superView.bounds -// blurView.autoresizingMask = [.width, .height] -// blurView.blendingMode = NSVisualEffectView.BlendingMode.behindWindow -// /* Pick the correct material for the task */ -// if #available(macOS 10.14, *) { -// blurView.material = NSVisualEffectView.Material.underWindowBackground -// } - + RegisterGeneratedPlugins(registry: flutterViewController) -// /* Replace the contentView and the background view */ -// superView.replaceSubview(contentView, with: blurView) -// blurView.addSubview(contentView) super.awakeFromNib() } + +// override func awakeFromNib() { +// let windowFrame = self.frame +// let blurryContainerViewController = BlurryContainerViewController() +// self.contentViewController = blurryContainerViewController +// self.setFrame(windowFrame, display: true) + +// /* Initialize the flutter_acrylic plugin */ +// MainFlutterWindowManipulator.start(mainFlutterWindow: self) + +// RegisterGeneratedPlugins(registry: blurryContainerViewController.flutterViewController) +// /* Hiding the window titlebar */ +// // self.titleVisibility = NSWindow.TitleVisibility.hidden; +// // self.titlebarAppearsTransparent = true; +// // self.isMovableByWindowBackground = true; +// // // self.standardWindowButton(NSWindow.ButtonType.miniaturizeButton)?.isEnabled = false; + +// // /* Making the window transparent */ +// // self.isOpaque = false +// // self.backgroundColor = .clear +// // /* Adding a NSVisualEffectView to act as a translucent background */ +// // let contentView = contentViewController!.view; +// // let superView = contentView.superview!; + +// // let blurView = NSVisualEffectView() +// // blurView.frame = superView.bounds +// // blurView.autoresizingMask = [.width, .height] +// // blurView.blendingMode = NSVisualEffectView.BlendingMode.behindWindow +// // /* Pick the correct material for the task */ +// // if #available(macOS 10.14, *) { +// // blurView.material = NSVisualEffectView.Material.underWindowBackground +// // } + + +// // /* Replace the contentView and the background view */ +// // superView.replaceSubview(contentView, with: blurView) +// // blurView.addSubview(contentView) +// super.awakeFromNib() + // } } diff --git a/pubspec.lock b/pubspec.lock index ffcbf52c..28e9e75e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -15,7 +15,7 @@ packages: description: name: android_intent_plus sha256: e49b4d9e26135dd7ef83606aac56bd3105345e8243de903939a15c5aa07cc0ec - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.2" animations: @@ -23,38 +23,42 @@ packages: description: name: animations sha256: fe8a6bdca435f718bb1dc8a11661b2c22504c6da40ef934cee8327ed77934164 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.7" + app_channel: + dependency: transitive + description: + path: applib_util + ref: HEAD + resolved-ref: f8ccf0eb57cc1d0f5fcae1df3ad4f8a82e6b1658 + url: "https://github.com/nightmare-space/applib" + source: git + version: "0.0.1" app_launcher: dependency: "direct main" description: - path: "../app_launcher" - relative: true - source: path + path: "." + ref: HEAD + resolved-ref: adcb8bbf7ecc24781d3da07ed8812665a11bfcfb + url: "https://github.com/nightmare-space/app_launcher" + source: git version: "1.0.0+1" app_manager: dependency: "direct main" description: - path: "../app_manager" - relative: true - source: path - version: "1.0.0+1" - applib_util: - dependency: transitive - description: - path: applib_util + path: "." ref: HEAD - resolved-ref: e6c03d33f0405aa0944b7a6c5b57277dc67413b7 - url: "https://github.com/nightmare-space/applib" + resolved-ref: "006d4ac396f8c7122ced0002f94f4944bf3bc450" + url: "https://github.com/nightmare-space/app_manager" source: git - version: "0.0.1" + version: "1.0.0+1" archive: dependency: transitive description: name: archive sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.3.6" args: @@ -62,7 +66,7 @@ packages: description: name: args sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.3.2" async: @@ -70,7 +74,7 @@ packages: description: name: async sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.10.0" better_player: @@ -78,7 +82,7 @@ packages: description: name: better_player sha256: f2e5d57ea49fb7c4d93838d23846ca5ddf78af6f946e103aeacf2afdd01909b3 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.0.83" boolean_selector: @@ -86,7 +90,7 @@ packages: description: name: boolean_selector sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.1" characters: @@ -94,7 +98,7 @@ packages: description: name: characters sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.1" clock: @@ -102,7 +106,7 @@ packages: description: name: clock sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.1" collection: @@ -110,7 +114,7 @@ packages: description: name: collection sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.17.0" convert: @@ -118,23 +122,23 @@ packages: description: name: convert sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.1" cross_file: dependency: transitive description: name: cross_file - sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b - url: "https://pub.flutter-io.cn" + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" + url: "https://pub.dev" source: hosted - version: "0.3.3+2" + version: "0.3.3+4" crypto: dependency: transitive description: name: crypto sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.2" csslib: @@ -142,7 +146,7 @@ packages: description: name: csslib sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.17.2" cupertino_icons: @@ -150,7 +154,7 @@ packages: description: name: cupertino_icons sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.5" desktop_drop: @@ -158,7 +162,7 @@ packages: description: name: desktop_drop sha256: "0cd056191b701a2b5ba040f2306349e461fafdaa5df4569b2228cdf87b58eced" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.3.3" device_info: @@ -175,7 +179,7 @@ packages: description: name: dio sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.0.6" equatable: @@ -183,7 +187,7 @@ packages: description: name: equatable sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.5" fake_async: @@ -191,7 +195,7 @@ packages: description: name: fake_async sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.1" ffi: @@ -199,7 +203,7 @@ packages: description: name: ffi sha256: d97fffd9d86f3dccc7a9059128b468a99320c69007cc9d41a3a1bda07d4e86dc - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.0" file: @@ -207,7 +211,7 @@ packages: description: name: file sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.1.4" file_manager_view: @@ -215,7 +219,7 @@ packages: description: path: "." ref: HEAD - resolved-ref: eae86f10fd7b3e5ed6582557716d48476463b717 + resolved-ref: cd556df12ce832897a534f53ef5d022fcc74f35e url: "https://github.com/nightmare-space/file_manager_view.git" source: git version: "1.0.0+1" @@ -224,7 +228,7 @@ packages: description: name: file_selector sha256: "9e34368bfacdf644e2c8a59e2b241cfb722bcbbd09876410e8775ae4905d6a49" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.4+3" file_selector_macos: @@ -232,7 +236,7 @@ packages: description: name: file_selector_macos sha256: e87311d719039da30d26ae829aab3ae66f82deb3318cd70ffecb608c99e3da68 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.2+2" file_selector_nightmare: @@ -240,7 +244,7 @@ packages: description: path: "." ref: HEAD - resolved-ref: b9aef9618f9ae612f45b3e8a66b1a446489589f7 + resolved-ref: "64ee69ba4f988eecbb49b62611d821e53755c9f6" url: "https://github.com/nightmare-space/file_selector_meng" source: git version: "1.0.0+1" @@ -249,7 +253,7 @@ packages: description: name: file_selector_platform_interface sha256: "17cdfe3d13a7d3e29e3d3978577ce840fcf94497d7de51bdea378abf9a34fc2c" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.4.0" file_selector_web: @@ -257,7 +261,7 @@ packages: description: name: file_selector_web sha256: bf166d08f4c3f79286774cdfa39ed301e076c5a903c435f5199818288f24a66d - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.1+5" file_selector_windows: @@ -265,7 +269,7 @@ packages: description: name: file_selector_windows sha256: "8bbcc82fe0d3cdf5ae5c289492ddfd703ec028028d9f194dbceae04cfbde1c48" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.2+2" fl_chart: @@ -273,7 +277,7 @@ packages: description: name: fl_chart sha256: "29da130cdef13f47e1798a66e99fd119e557c293b98be8ebaf6fed2cbc43bf29" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.50.6" flutter: @@ -281,20 +285,20 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_acrylic: - dependency: "direct main" + flutter_displaymode: + dependency: transitive description: - name: flutter_acrylic - sha256: "142304f28d1775da21dc8e3183971a0610943ff0fedc3a877d6d08f47478679b" - url: "https://pub.flutter-io.cn" + name: flutter_displaymode + sha256: "136b0314fdc78fe995b0b75061fe9ff8210dffca84f8f8110f8f71029479db3b" + url: "https://pub.dev" source: hosted - version: "1.1.0+1" + version: "0.5.0" flutter_lints: dependency: "direct dev" description: name: flutter_lints sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.1" flutter_localizations: @@ -306,16 +310,16 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: "981442432b632237ffc1cf8092b4173b9e9f2278b5740637287c3069b51c8f09" - url: "https://pub.flutter-io.cn" + sha256: "818cf6c28377ba2c91ed283c96fd712e9c175dd2d2488eb7fc93b6afb9ad2e08" + url: "https://pub.dev" source: hosted - version: "0.6.13" + version: "0.6.13+1" flutter_pty: dependency: "direct main" description: name: flutter_pty sha256: "1f3114f125e4c447866511560818d6ac368471712cc952a25b5a06586aa80b64" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.3.1" flutter_spinkit: @@ -323,7 +327,7 @@ packages: description: name: flutter_spinkit sha256: "77a2117c0517ff909221f3160b8eb20052ab5216107581168af574ac1f05dff8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "5.1.0" flutter_svg: @@ -331,7 +335,7 @@ packages: description: name: flutter_svg sha256: f2aa23d9d1721cd5c2c5097558368d2a1f85be35a85a6cf26a626e80c369a47c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.5" flutter_test: @@ -349,7 +353,7 @@ packages: description: name: flutter_widget_from_html_core sha256: e8f4f8b461a140ffb7c71f938bc76efc758893e7468843d9dbf70cb0b9e900cb - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.5+3" fwfh_text_style: @@ -357,7 +361,7 @@ packages: description: name: fwfh_text_style sha256: "37806ee0222f79b6e8d4c698c322c897eae6a817258156f40aeece4e588fac60" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.22.08+1" get: @@ -365,7 +369,7 @@ packages: description: name: get sha256: "2ba20a47c8f1f233bed775ba2dd0d3ac97b4cf32fc17731b3dfc672b06b0e92a" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.6.5" global_repository: @@ -382,7 +386,7 @@ packages: description: name: hive sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.2.3" html: @@ -390,7 +394,7 @@ packages: description: name: html sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.15.1" http: @@ -398,7 +402,7 @@ packages: description: name: http sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.13.5" http_methods: @@ -406,7 +410,7 @@ packages: description: name: http_methods sha256: c192bb6fb4ae99d06053f67a2c1c65350a29bc778a39d9a12b96bd2ec820e9dc - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0" http_parser: @@ -414,7 +418,7 @@ packages: description: name: http_parser sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.0.2" image: @@ -422,7 +426,7 @@ packages: description: name: image sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.3.0" intl: @@ -430,7 +434,7 @@ packages: description: name: intl sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.17.0" js: @@ -438,38 +442,40 @@ packages: description: name: js sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.6.5" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + url: "https://pub.dev" + source: hosted + version: "4.8.0" lints: dependency: transitive description: name: lints sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.1" logger_view: dependency: "direct main" description: - path: "../logger_view" - relative: true - source: path + path: "." + ref: HEAD + resolved-ref: bd4a2adf012dc7b7e012b430e06118b2d5ba4e1a + url: "https://github.com/nightmare-space/logger_view" + source: git version: "0.0.1" - macos_window_utils: - dependency: transitive - description: - name: macos_window_utils - sha256: ece6315199f84931d7e32869aa3d8d4d2a82e6f4416ed292f9cf9345b0105feb - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.2" markdown: dependency: transitive description: name: markdown sha256: c2b81e184067b41d0264d514f7cdaa2c02d38511e39d6521a1ccc238f6d7b3f2 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.0.1" matcher: @@ -477,7 +483,7 @@ packages: description: name: matcher sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.12.13" material_color_utilities: @@ -485,7 +491,7 @@ packages: description: name: material_color_utilities sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.0" meta: @@ -493,7 +499,7 @@ packages: description: name: meta sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.0" mime: @@ -501,7 +507,7 @@ packages: description: name: mime sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.4" multicast: @@ -517,16 +523,16 @@ packages: dependency: "direct main" description: name: multicast_dns - sha256: "279609613229c7f3e7079f6299799d7c5f6aae63f20a2afdf229793544366c17" - url: "https://pub.flutter-io.cn" + sha256: "80e54aba906a7cc68fdc6a201e76b135af27155e2f8e958181d85e2b73786591" + url: "https://pub.dev" source: hosted - version: "0.3.2+2" + version: "0.3.2+3" open_file: dependency: transitive description: name: open_file sha256: "5cd0288033d613ee7908aa974b7ff00805ae55d253f64d311603cf2e30613ca8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.2.1" path: @@ -534,7 +540,7 @@ packages: description: name: path sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.2" path_drawing: @@ -542,7 +548,7 @@ packages: description: name: path_drawing sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.1" path_parsing: @@ -550,7 +556,7 @@ packages: description: name: path_parsing sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.1" path_provider: @@ -558,7 +564,7 @@ packages: description: name: path_provider sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.12" path_provider_android: @@ -566,7 +572,7 @@ packages: description: name: path_provider_android sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.22" path_provider_foundation: @@ -574,7 +580,7 @@ packages: description: name: path_provider_foundation sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.1" path_provider_linux: @@ -582,7 +588,7 @@ packages: description: name: path_provider_linux sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.7" path_provider_platform_interface: @@ -590,7 +596,7 @@ packages: description: name: path_provider_platform_interface sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.5" path_provider_windows: @@ -598,7 +604,7 @@ packages: description: name: path_provider_windows sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.3" permission_handler: @@ -606,7 +612,7 @@ packages: description: name: permission_handler sha256: "7c008a350caabef1b372b5a2f5559dc178fc6f0745c4f6f5a0fd103b11d740d2" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.0.0" permission_handler_platform_interface: @@ -614,7 +620,7 @@ packages: description: name: permission_handler_platform_interface sha256: "68abbc472002b5e6dfce47fe9898c6b7d8328d58b5d2524f75e277c07a97eb84" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.9.0" petitparser: @@ -622,7 +628,7 @@ packages: description: name: petitparser sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "5.1.0" platform: @@ -630,7 +636,7 @@ packages: description: name: platform sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.0" platform_info: @@ -638,7 +644,7 @@ packages: description: name: platform_info sha256: "012e73712166cf0b56d3eb95c0d33491f56b428c169eca385f036448474147e4" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.2.0" plugin_platform_interface: @@ -646,7 +652,7 @@ packages: description: name: plugin_platform_interface sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.3" pointycastle: @@ -654,7 +660,7 @@ packages: description: name: pointycastle sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.6.2" process: @@ -662,7 +668,7 @@ packages: description: name: process sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.2.4" qr: @@ -670,7 +676,7 @@ packages: description: name: qr sha256: "5c4208b4dc0d55c3184d10d83ee0ded6212dc2b5e2ba17c5a0c0aab279128d21" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.0" qr_code_scanner: @@ -678,7 +684,7 @@ packages: description: name: qr_code_scanner sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.1" qr_flutter: @@ -686,7 +692,7 @@ packages: description: name: qr_flutter sha256: c5c121c54cb6dd837b9b9d57eb7bc7ec6df4aee741032060c8833a678c80b87e - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.0.0" quiver: @@ -694,7 +700,7 @@ packages: description: name: quiver sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.2.1" responsive_framework: @@ -702,15 +708,23 @@ packages: description: name: responsive_framework sha256: e083346029b008335b008274c4d3fac5b9e0ca8796f201ed20884f579101d584 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.0" + retrofit: + dependency: transitive + description: + name: retrofit + sha256: "9254ec985d5e26a839a9070ae25b98f0781c9c420e4241c5fb8b8965aa1fc7f2" + url: "https://pub.dev" + source: hosted + version: "3.3.1" screen_retriever: dependency: transitive description: name: screen_retriever sha256: "9c3839c4eb80807cd8210afa3c84a177ba00aef9f9b7b74ad92d3a0ab1d7e7ed" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.1.5" screenshot: @@ -718,7 +732,7 @@ packages: description: name: screenshot sha256: "30bb9fade6eb2578a1fc2e84f6b184141fc86883cda10988d4500ff00eb728e2" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.0" settings: @@ -735,7 +749,7 @@ packages: description: name: shelf sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.4.0" shelf_router: @@ -743,7 +757,7 @@ packages: description: name: shelf_router sha256: "0b0bfb835e8b2bb43c5341ee689f0d2851e9cea377a4f2db4ec06a1a99beace4" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.3" shelf_static: @@ -751,23 +765,15 @@ packages: description: name: shelf_static sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.1" - shortcut: - dependency: transitive - description: - name: shortcut - sha256: "66ce9728aa52134eb59fda55c0aad017b35ae5114fe927e3d60f7375936ce3f5" - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.0.1" signale: dependency: transitive description: name: signale sha256: "537253d2fa1f382876b6b9e05e7eed4b2bf1182086c3903059dfab5e5f369289" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.0.8" sky_engine: @@ -780,7 +786,7 @@ packages: description: name: source_span sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.9.1" stack_trace: @@ -788,7 +794,7 @@ packages: description: name: stack_trace sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.11.0" stream_channel: @@ -796,7 +802,7 @@ packages: description: name: stream_channel sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.1" string_scanner: @@ -804,7 +810,7 @@ packages: description: name: string_scanner sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0" synchronized: @@ -812,7 +818,7 @@ packages: description: name: synchronized sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.1" term_glyph: @@ -820,7 +826,7 @@ packages: description: name: term_glyph sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: @@ -828,7 +834,7 @@ packages: description: name: test_api sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.4.16" typed_data: @@ -836,7 +842,7 @@ packages: description: name: typed_data sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.1" url_launcher: @@ -844,7 +850,7 @@ packages: description: name: url_launcher sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.1.8" url_launcher_android: @@ -852,7 +858,7 @@ packages: description: name: url_launcher_android sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.0.23" url_launcher_ios: @@ -860,7 +866,7 @@ packages: description: name: url_launcher_ios sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.0.18" url_launcher_linux: @@ -868,7 +874,7 @@ packages: description: name: url_launcher_linux sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.2" url_launcher_macos: @@ -876,7 +882,7 @@ packages: description: name: url_launcher_macos sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.2" url_launcher_platform_interface: @@ -884,7 +890,7 @@ packages: description: name: url_launcher_platform_interface sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.1" url_launcher_web: @@ -892,7 +898,7 @@ packages: description: name: url_launcher_web sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.14" url_launcher_windows: @@ -900,7 +906,7 @@ packages: description: name: url_launcher_windows sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.3" vector_math: @@ -908,7 +914,7 @@ packages: description: name: vector_math sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.4" visibility_detector: @@ -916,7 +922,7 @@ packages: description: name: visibility_detector sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.3.3" wakelock: @@ -924,7 +930,7 @@ packages: description: name: wakelock sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.6.2" wakelock_macos: @@ -932,7 +938,7 @@ packages: description: name: wakelock_macos sha256: "047c6be2f88cb6b76d02553bca5a3a3b95323b15d30867eca53a19a0a319d4cd" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.4.0" wakelock_platform_interface: @@ -940,7 +946,7 @@ packages: description: name: wakelock_platform_interface sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.3.0" wakelock_web: @@ -948,7 +954,7 @@ packages: description: name: wakelock_web sha256: "1b256b811ee3f0834888efddfe03da8d18d0819317f20f6193e2922b41a501b5" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.4.0" wakelock_windows: @@ -956,7 +962,7 @@ packages: description: name: wakelock_windows sha256: "857f77b3fe6ae82dd045455baa626bc4b93cb9bb6c86bf3f27c182167c3a5567" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.1" win32: @@ -964,7 +970,7 @@ packages: description: name: win32 sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.3" window_manager: @@ -972,7 +978,7 @@ packages: description: name: window_manager sha256: d812d3189d23465d2e94baa2505a4462b46dde4939012ff370711c6897d747ae - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.9" xdg_directories: @@ -980,7 +986,7 @@ packages: description: name: xdg_directories sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.0+3" xml: @@ -988,7 +994,7 @@ packages: description: name: xml sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.2.2" xterm: @@ -1002,4 +1008,4 @@ packages: version: "3.4.1" sdks: dart: ">=2.19.0 <3.0.0" - flutter: ">=3.7.0" + flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index efea8274..9fcf8d92 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: adb_tool description: The best ADB client for Android/Windows/Linux/macOS. publish_to: "none" -version: 1.3.8+36 +version: 1.3.9+37 environment: sdk: ">=2.7.0 <3.0.0" @@ -11,8 +11,8 @@ dependencies: # localizations intl: ^0.17.0 animations: ^2.0.2 - # desktop window stype - flutter_acrylic: ^1.0.0 + # # desktop window stype + # flutter_acrylic: ^1.1.0 # adb plugin can manager app app_manager: git: https://github.com/nightmare-space/app_manager @@ -109,21 +109,23 @@ dependency_overrides: better_player: 0.0.83 # global_repository: # path: ../global_repository - app_launcher: - path: ../app_launcher + # app_launcher: + # path: ../app_launcher # # multicast: # # path: ../multicast # device_info: # path: ../device_info - app_manager: - path: ../app_manager + # app_manager: + # path: ../app_manager # adbutil: # path: ../adbutil # xterm: # path: /Users/nightmare/Desktop/nightmare-space/xterm.dart - logger_view: - path: ../logger_view + # logger_view: + # path: ../logger_view qr_code_scanner: ^1.0.0 + # app_channel: + # path: ../applib/applib_util # file_selector_nightmare: # path: ../file_selector_meng flutter_intl: diff --git a/scripts/build/build_apk_split_abi.sh b/scripts/build/build_apk_split_abi.sh index ed74d40e..ee2e0499 100755 --- a/scripts/build/build_apk_split_abi.sh +++ b/scripts/build/build_apk_split_abi.sh @@ -1,5 +1,6 @@ # 分abi打包脚本 -flutter build apk --split-per-abi +flutter build apk --obfuscate --split-debug-info -t lib/main.dart --split-per-abi +# flutter build apk --tree-shake-icons --split-per-abi LOCAL_DIR=$( cd $(dirname $0) pwd @@ -9,3 +10,7 @@ mkdir $PROJECT_DIR/dist/ 2>/dev/null cp -f $PROJECT_DIR/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk $PROJECT_DIR/dist/ cp -f $PROJECT_DIR/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk $PROJECT_DIR/dist/ cp -f $PROJECT_DIR/build/app/outputs/flutter-apk/app-x86_64-release.apk $PROJECT_DIR/dist/ +# ✓ Built build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk (14.8MB). +# ✓ Built build/app/outputs/flutter-apk/app-arm64-v8a-release.apk (17.5MB). +# ✓ Built build/app/outputs/flutter-apk/app-x86_64-release.apk (14.7MB). + diff --git a/scripts/build/install_mac_app.sh b/scripts/build/install_mac_app.sh index c042780c..05d10bea 100755 --- a/scripts/build/install_mac_app.sh +++ b/scripts/build/install_mac_app.sh @@ -1,4 +1,10 @@ # flutter clean +LOCAL_DIR=$( + cd $(dirname $0) + pwd +) +PROJECT_DIR=$LOCAL_DIR/../.. +source $LOCAL_DIR/../properties.sh flutter build macos -./scripts/patch_executable.sh -mv -f "./build/macos/Build/Products/Release/ADB TOOL.app" "/Applications/ADB TOOL.app" \ No newline at end of file +$PROJECT_DIR/scripts/patch_executable.sh +cp -rf "./build/macos/Build/Products/Release/ADB TOOL.app" "/Applications/" \ No newline at end of file diff --git a/scripts/properties.sh b/scripts/properties.sh index 98ba9900..eef2ff77 100755 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -1,3 +1,3 @@ -VERSION='1.3.8-1' +VERSION='1.3.9' TARGET_PATH=root@$server:/home/nightmare/YanTool/resources/ADBTool APP_NAME='ADBKIT'