Commit some code

.github/workflows/workflow_dispatch.yml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Upload..
         run: |
-          curl -i -X POST -F "${{ env.ZIP_NAME }}.deb" http://nightmare.fun:444/api/v1/file/uploadfile/
+          curl -X POST -F "file=@${{ env.ZIP_NAME }}.deb" http://nightmare.press:444/api/v1/file/uploadfile/
           # curl --upload-file "${{ env.ZIP_NAME }}.deb" https://transfersh.com/${{ env.APP_NAME }}.deb
 
   # build-linux-arm64:
@@ -219,7 +219,7 @@ jobs:
 
       - name: Upload
         run: |
-          curl -i -X POST -F "${{ env.ZIP_NAME }}.dmg" http://nightmare.fun:444/api/v1/file/uploadfile/
+          curl -X POST -F "file=@${{ env.ZIP_NAME }}.dmg" http://nightmare.press:444/api/v1/file/uploadfile/
           # curl --upload-file "${{ env.ZIP_NAME }}.dmg" https://transfersh.com/${{ env.APP_NAME }}_macOS.dmg
             
   build-windows:
@@ -282,5 +282,5 @@ jobs:
 
       - name: Upload
         run: |
-          curl -i -X POST -F "${{ env.ZIP_NAME }}_Windows.zip" http://nightmare.fun:444/api/v1/file/uploadfile/
+          curl -X POST -F "file=@${{ env.ZIP_NAME }}_Windows.zip" http://nightmare.press:444/api/v1/file/uploadfile/
           # curl --upload-file "${{ env.ZIP_NAME }}_Windows.zip" "https://transfersh.com/${{ env.APP_NAME }}_Windows.zip"

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "cmake.configureOnOpen": false
+    "cmake.configureOnOpen": false,
+    "java.configuration.updateBuildConfiguration": "interactive"
 }

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.2.6
+- 修复域名过期，无法登录和资源无法加载的问题
+
 ## 2.2.5
 - 速享上架iOS啦，https://apps.apple.com/us/app/%E9%80%9F%E4%BA%AB/id6447294725?platform=iphone，复制浏览器打开，由于下载量还比较少，搜索搜不到
 - 其他优化
@@ -172,7 +175,7 @@ web上传文件暂不支持
 
 能简单说清楚就直接描述，不能请按照反馈模板进行反馈。
 
-旧机型、TV，去官网下arm_v7a版本的 http://nightmare.fun/YanTool/resources/SpeedShare/?C=N;O=A
+旧机型、TV，去官网下arm_v7a版本的 http://nightmare.press/YanTool/resources/SpeedShare/?C=N;O=A
 
 ## 1.3.2
 * [新增]剪切板共享功能(测试中)

android/app/src/main/java/com/nightmare/speedshare/MainActivity.java

@@ -266,7 +266,7 @@ private String getRealPath(Uri fileUrl) {
 
     @Override
     public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
+        super.configureFlutterEngine(flutterEngine);
 //        flutterEngine.en
         channel = new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(), "send_channel");
         channel.setMethodCallHandler(new MethodChannel.MethodCallHandler() {

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,4 +1,9 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M \
+--add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+--add-opens=java.base/java.io=ALL-UNNAMED \
+--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
 android.useAndroidX=true
 android.enableJetifier=true
-android.jetifier.blacklist=bcprov-jdk15on
+# android.jetifier.blacklist=bcprov-jdk15on

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

docs/QA.md

@@ -12,7 +12,7 @@ web端不能单独打开速享(从实现来看是可以，但我并不想这么
 ### 在哪下载Windows
 1.github actions
 
-- [个人服务器下载地址](http://nightmare.fun/YanTool/resources/SpeedShare/?C=N;O=A)
+- [个人服务器下载地址](http://nightmare.press/YanTool/resources/SpeedShare/?C=N;O=A)
 
 该项目集成了 Github Action 来提供自动打包的功能，然后使用`transfer.sh`进行包的上传，所以你可以在[actions](https://github.com/nightmare-space/speed_share/actions)中找`release`这个 task 能看到下载地址。
 

lib/app/controller/device_controller.dart

@@ -57,6 +57,7 @@ class Device {
 // 用于管理设备连接的类
 class DeviceController extends GetxController {
   DeviceController() {
+    return;
     if (GetPlatform.isWeb) {
       return;
     }
@@ -77,7 +78,7 @@ class DeviceController extends GetxController {
       //   History exist=newHistorys.firstWhere((element) => element.url=)
       // }
       // 向历史连接的设备发送连接消息
-      Future.delayed(const Duration(milliseconds: 200), () {
+      Future.delayed(const Duration(milliseconds: 2000), () {
         historys.datas!.forEach(
           ((element) {
             // TODO

lib/global/global.dart

@@ -91,7 +91,6 @@ class Global with ClipboardListener, WindowListener {
   // 初始化全局单例
   Future<void> initGlobal() async {
     Log.v('initGlobal', tag: 'GlobalInstance');
-    DateTime time = DateTime.now();
     uniqueKey = await UniqueUtil.getUniqueKey();
     deviceName = await UniqueUtil.getDevicesId();
     Log.v('deviceId -> $deviceName', tag: 'GlobalInstance');

lib/main.dart

@@ -62,35 +62,34 @@ Future<void> androidWindow() async {
 bool pop = false;
 
 Future<void> main() async {
-  if (!GetPlatform.isWeb) {
-    WidgetsFlutterBinding.ensureInitialized();
-    // 拿到应用程序路径
-    // get app directory
-    final dir = (await getApplicationSupportDirectory()).path;
-    RuntimeEnvir.initEnvirWithPackageName(
-      Config.packageName,
-      appSupportDirectory: dir,
-    );
-    // 启动文件服务器
-    // start file manager server
-    // todo 肯呢个需要更改成127.0.0.1
-    fm.Server.start();
-  }
-  Get.config(
-    enableLog: false,
-    logWriterCallback: (text, {isError = false}) {
-      // Log.d(text, tag: 'GetX');
-    },
-  );
-  if (!GetPlatform.isWeb) {
-    await initSetting();
-  }
-  Get.put(SettingController());
-  Get.put(DeviceController());
-  Get.put(ChatController());
-
   runZonedGuarded<void>(
     () async {
+      if (!GetPlatform.isWeb) {
+        WidgetsFlutterBinding.ensureInitialized();
+        // 拿到应用程序路径
+        // get app directory
+        final dir = (await getApplicationSupportDirectory()).path;
+        RuntimeEnvir.initEnvirWithPackageName(
+          Config.packageName,
+          appSupportDirectory: dir,
+        );
+        // 启动文件服务器
+        // start file manager server
+        // todo 肯呢个需要更改成127.0.0.1
+        fm.Server.start();
+      }
+      Get.config(
+        enableLog: false,
+        logWriterCallback: (text, {isError = false}) {
+          // Log.d(text, tag: 'GetX');
+        },
+      );
+      if (!GetPlatform.isWeb) {
+        await initSetting();
+      }
+      Get.put(SettingController());
+      Get.put(DeviceController());
+      Get.put(ChatController());
       WidgetsFlutterBinding.ensureInitialized();
       if (!GetPlatform.isIOS) {
         String dir;
@@ -103,23 +102,24 @@ Future<void> main() async {
         }
       }
       runApp(const SpeedShare());
+      // 透明状态栏
+      // transparent the appbar
+      StatusBarUtil.transparent();
+      Future.delayed(Duration(milliseconds: 5000), () {
+        Global().initGlobal();
+      });
+      FlutterError.onError = (FlutterErrorDetails details) {
+        FlutterError.presentError(details);
+        Log.e('页面构建异常 : ${details.exception}');
+      };
+      if (GetPlatform.isDesktop) {
+        if (!GetPlatform.isWeb) {
+          await windowManager.ensureInitialized();
+        }
+      }
     },
     (error, stackTrace) {
       Log.e('未捕捉到的异常 : $error \n$stackTrace');
     },
   );
-  FlutterError.onError = (FlutterErrorDetails details) {
-    FlutterError.presentError(details);
-    Log.e('页面构建异常 : ${details.exception}');
-  };
-  if (GetPlatform.isDesktop) {
-    if (!GetPlatform.isWeb) {
-      await windowManager.ensureInitialized();
-    }
-  }
-  // Image.network(src)
-  // 透明状态栏
-  // transparent the appbar
-  StatusBarUtil.transparent();
-  Global().initGlobal();
 }

lib/main_personal.dart

@@ -57,62 +57,49 @@ Future<void> androidWindow() async {
 bool pop = false;
 
 Future<void> main() async {
-  if (!GetPlatform.isWeb && !GetPlatform.isIOS) {
-    WidgetsFlutterBinding.ensureInitialized();
-    // 拿到应用程序路径
-    // get app directory
-    final dir = (await getApplicationSupportDirectory()).path;
-    RuntimeEnvir.initEnvirWithPackageName(
-      Config.packageName,
-      appSupportDirectory: dir,
-    );
-    // 启动文件服务器
-    // start file manager server
-    fm.Server.start();
-  }
-  Get.config(
-    enableLog: false,
-    logWriterCallback: (text, {bool isError = false}) {
-      // Log.d(text, tag: 'GetX');
-    },
-  );
-  if (!GetPlatform.isWeb) {
-    await initSetting();
-  }
-  Get.put(SettingController());
-  Get.put(DeviceController());
-  Get.put(ChatController());
-  initPersonal();
   runZonedGuarded<void>(
     () async {
       WidgetsFlutterBinding.ensureInitialized();
-      if (!GetPlatform.isIOS) {
-        String dir;
-        if (!GetPlatform.isWeb) {
-          dir = (await getApplicationSupportDirectory()).path;
-          RuntimeEnvir.initEnvirWithPackageName(
-            Config.packageName,
-            appSupportDirectory: dir,
-          );
-        }
+      if (!GetPlatform.isWeb && !GetPlatform.isIOS) {
+        // 拿到应用程序路径
+        // get app directory
+        final dir = (await getApplicationSupportDirectory()).path;
+        RuntimeEnvir.initEnvirWithPackageName(
+          Config.packageName,
+          appSupportDirectory: dir,
+        );
+        // 启动文件服务器
+        // start file manager server
+        fm.Server.start();
+      }
+      Get.config(
+        enableLog: false,
+        logWriterCallback: (text, {bool isError = false}) {
+          Log.d(text, tag: 'GetX');
+        },
+      );
+      if (!GetPlatform.isWeb) {
+        await initSetting();
       }
+      Get.put(SettingController());
+      Get.put(DeviceController());
+      Get.put(ChatController());
+      initPersonal();
       runApp(const SpeedShare());
+      FlutterError.onError = (FlutterErrorDetails details) {
+        FlutterError.presentError(details);
+        Log.e('页面构建异常 : ${details.exception}');
+      };
+      if (GetPlatform.isDesktop && !GetPlatform.isWeb) {
+        await windowManager.ensureInitialized();
+      }
+      // 透明状态栏
+      // transparent the appbar
+      StatusBarUtil.transparent();
+      Global().initGlobal();
     },
     (error, stackTrace) {
       Log.e('未捕捉到的异常 : $error \n$stackTrace');
     },
   );
-  FlutterError.onError = (FlutterErrorDetails details) {
-    FlutterError.presentError(details);
-    Log.e('页面构建异常 : ${details.exception}');
-  };
-  if (GetPlatform.isDesktop) {
-    if (!GetPlatform.isWeb) {
-      await windowManager.ensureInitialized();
-    }
-  }
-  // 透明状态栏
-  // transparent the appbar
-  StatusBarUtil.transparent();
-  Global().initGlobal();
 }

lib/material_app_entry_point.dart

@@ -74,9 +74,9 @@ class SpeedShare extends StatelessWidget {
                   },
                 ),
                 breakpoints: const [
-                  Breakpoint(start: 0, end: 300, name: MOBILE),
-                  Breakpoint(start: 300, end: 600, name: TABLET),
-                  Breakpoint(start: 600, end: 2000, name: DESKTOP),
+                  Breakpoint(start: 0, end: 500, name: MOBILE),
+                  Breakpoint(start: 500, end: 800, name: TABLET),
+                  Breakpoint(start: 800, end: 2000, name: DESKTOP),
                 ],
               );
             },

lib/modules/home/adapive_entry.dart

@@ -2,6 +2,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:responsive_framework/responsive_framework.dart';
+import 'package:signale/signale.dart';
 import 'package:speed_share/app/controller/controller.dart';
 
 import 'desktop_home.dart';
@@ -35,8 +36,10 @@ class _AdaptiveEntryPointState extends State<AdaptiveEntryPoint> {
   Widget build(BuildContext context) {
     // return SizedBox();
     if (ResponsiveBreakpoints.of(context).isDesktop) {
+      Log.i('$this is desktop');
       return const DesktopHome();
     }
+    Log.i('$this is mobile');
     return const MobileHome();
   }
 }

lib/modules/home/nav.dart

@@ -20,6 +20,7 @@ class Nav extends StatefulWidget {
 class _NavState extends State<Nav> {
   @override
   Widget build(BuildContext context) {
+    print('$this build');
     Widget center = Stack(
       alignment: Alignment.center,
       children: [

lib/modules/setting/setting_page.dart

@@ -396,7 +396,7 @@ class _SettingPageState extends State<SettingPage> {
                 ),
                 SettingItem(
                   onTap: () async {
-                    String url = 'http://nightmare.fun/YanTool/resources/SpeedShare/?C=N;O=A';
+                    String url = 'http://nightmare.press/YanTool/resources/SpeedShare/?C=N;O=A';
                     await canLaunchUrlString(url)
                         ? await launchUrlString(
                             url,