diff --git a/pubspec.lock b/pubspec.lock index 3ad2462b..ec5eea1a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -128,10 +128,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.flutter-io.cn" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -378,21 +378,13 @@ packages: source: sdk version: "0.0.0" flutter_widget_from_html_core: - dependency: transitive - description: - name: flutter_widget_from_html_core - sha256: e8f4f8b461a140ffb7c71f938bc76efc758893e7468843d9dbf70cb0b9e900cb - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.8.5+3" - fwfh_text_style: dependency: "direct overridden" description: - name: fwfh_text_style - sha256: "37806ee0222f79b6e8d4c698c322c897eae6a817258156f40aeece4e588fac60" + name: flutter_widget_from_html_core + sha256: d3239b1670e83fafb209d0ddccfd19bb1cd5382b3ac9a507eb1b36274df78fec url: "https://pub.flutter-io.cn" source: hosted - version: "2.22.08+1" + version: "0.14.7" get: dependency: "direct main" description: @@ -570,6 +562,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" + logging: + dependency: transitive + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.2.0" markdown: dependency: transitive description: @@ -606,10 +606,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -909,18 +909,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.flutter-io.cn" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -949,10 +949,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.flutter-io.cn" source: hosted - version: "0.6.0" + version: "0.6.1" tray_manager: dependency: "direct main" description: @@ -1100,10 +1100,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -1154,5 +1154,5 @@ packages: source: hosted version: "0.0.6" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index 4cafb2b5..6c6e8ea4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -99,7 +99,6 @@ flutter: dependency_overrides: flutter_svg: ^1.1.0 - fwfh_text_style: 2.22.8+1 # file_manager_view 依赖的是pub的shelf_static,速享需要使用自定义的 shelf_static: git: @@ -108,20 +107,6 @@ dependency_overrides: ffi: ^2.0.1 android_intent_plus: ^4.0.3 image_picker: ^1.0.4 - # android_window: - # path: /Users/didi/Documents/GitHub/flutter-android-window - # # xterm: ^3.2.6 - # logger_view: - # path: ../logger_view - # app_manager: - # path: ../app_manager - # app_channel: - # path: ../applib/applib_util - # global_repository: - # path: ../global_repository - # file_manager_view: - # path: ../file_manager_view - # user_center_frontend: - # path: ../user_center_frontend + flutter_widget_from_html_core: ^0.14.6 flutter_intl: enabled: true diff --git a/res/linux/speed-share.desktop b/res/linux/package/speed-share.desktop similarity index 100% rename from res/linux/speed-share.desktop rename to res/linux/package/speed-share.desktop diff --git a/res/linux/package/speed-share.png b/res/linux/package/speed-share.png new file mode 100644 index 00000000..77185a99 Binary files /dev/null and b/res/linux/package/speed-share.png differ diff --git a/res/linux/speed-share.png b/res/linux/speed-share.png deleted file mode 100644 index c130df85..00000000 Binary files a/res/linux/speed-share.png and /dev/null differ diff --git a/scripts/build/linux/generate_linux.sh b/scripts/build/linux/generate_linux.sh deleted file mode 100755 index a445acf9..00000000 --- a/scripts/build/linux/generate_linux.sh +++ /dev/null @@ -1,21 +0,0 @@ -rm -rf ./tmp -PACKAGE_DIR=./tmp -target_dir=$PACKAGE_DIR/opt/speed-share -mkdir -p $target_dir -mkdir -p $PACKAGE_DIR/usr/share/applications -ICON_PATH=$PACKAGE_DIR/usr/share/pixmaps -mkdir -p $ICON_PATH -cp -rf ./build/linux/x64/release/bundle/. $target_dir -cp -rf ./res/linux/speed-share.png $ICON_PATH/ -cp -rf ./res/linux/speed-share.desktop $PACKAGE_DIR/usr/share/applications/ -mkdir $PACKAGE_DIR/DEBIAN -echo " -Package: speed-share -Architecture: amd64 -Maintainer: @Nightmare -Version: 1.3.1-1 -Homepage: https://nightmare.press/speedshare/ -Description: screen your phone on computer -">$PACKAGE_DIR/DEBIAN/control -chmod 755 $PACKAGE_DIR/DEBIAN -dpkg-deb -b $PACKAGE_DIR "Speed Share.deb" \ No newline at end of file diff --git a/scripts/build/windows/patch_executable.bat b/scripts/build/windows/patch_executable.bat deleted file mode 100644 index fb007bf2..00000000 --- a/scripts/build/windows/patch_executable.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -xcopy .\res\windows\runtime .\build\windows\runner\Release /s /f \ No newline at end of file diff --git a/scripts/properties.sh b/scripts/properties.sh index df03d22e..132d59d5 100755 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -5,3 +5,4 @@ APP_NAME='SpeedShare' APP_NAME_CN='速享' MAC_APP_NAME='Speed Share' BUILD_ARG='-t lib/main_personal.dart' +LINUX_APP_NAME='speed-share' \ No newline at end of file diff --git a/scripts/upload/upload.sh b/scripts/upload/upload.sh deleted file mode 100755 index 434f5a24..00000000 --- a/scripts/upload/upload.sh +++ /dev/null @@ -1,48 +0,0 @@ -LOCAL_DIR=$( - cd $(dirname $0) - pwd -) -PROJECT_DIR=$LOCAL_DIR/../.. -source $LOCAL_DIR/../properties.sh -# echo $PROJECT_DIR -linux_app="$PROJECT_DIR/dist/$APP_NAME.deb" -target_linux_app="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Linux.deb" -if [ -f $linux_app ]; then - mv $linux_app $target_linux_app - rsync $target_linux_app "${TARGET_PATH}/${APP_NAME_CN}_${VERSION}_Linux.deb" -fi -mac_app="$PROJECT_DIR/dist/${APP_NAME}_macOS.dmg" -target_mac_app="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_macOS.dmg" -if [ -f $mac_app ]; then - mv $mac_app $target_mac_app - rsync $target_mac_app ${TARGET_PATH}/${APP_NAME_CN}_${VERSION}_macOS.dmg -fi -win_app="$PROJECT_DIR/dist/${APP_NAME}_Windows.zip" -target_name="${APP_NAME_CN}_${VERSION}_Windows.zip" -target_win_app="$PROJECT_DIR/dist/$target_name" -if [ -f $win_app ]; then - mv $win_app $target_win_app - echo "upload $target_name" - rsync "$target_win_app" "$TARGET_PATH/$target_name" -fi -arm64_apk="$PROJECT_DIR/dist/app-arm64-v8a-release.apk" -target_arm64_apk="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Android_arm64.apk" -if [ -f "$arm64_apk" ]; then - mv $arm64_apk $target_arm64_apk - echo upload android arm64... - rsync "$target_arm64_apk" "${TARGET_PATH}/${APP_NAME_CN}_${VERSION}_Android_arm64.apk" -fi -arm_apk="$PROJECT_DIR/dist/app-armeabi-v7a-release.apk" -target_arm_apk="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Android_arm_v7a.apk" -if [ -f "$arm_apk" ]; then - mv $arm_apk $target_arm_apk - echo upload android arm... - rsync "$target_arm_apk" "$TARGET_PATH/${APP_NAME_CN}_${VERSION}_Android_arm_v7a.apk" -fi -x86_apk="$PROJECT_DIR/dist/app-x86_64-release.apk" -target_x86_apk="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Android_x86_64.apk" -if [ -f "$x86_apk" ]; then - mv $x86_apk $target_x86_apk - echo upload android x86... - rsync "$target_x86_apk" "$TARGET_PATH/${APP_NAME_CN}_${VERSION}_Android_x86_64.apk" -fi