✨

niuhuan · Dec 24, 2024 · 7313aa3 · 7313aa3
1 parent 7fa82be
commit 7313aa3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -195,8 +195,8 @@ jobs:
           cd native/jmbackend/platforms/android
           cargo ndk -o ../../../../android/app/src/main/jniLibs -t arm64-v8a build --release
           cd ../../../..
-          wget https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F6899/pdfium-android-arm64.tgz
-          tar zxvf pdfium-android-arm64.tgz --strip-components=1 -C android/app/src/main/jniLibs/arm64-v8a lib/libpdfium.so
+#          wget https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F6899/pdfium-android-arm64.tgz
+#          tar zxvf pdfium-android-arm64.tgz --strip-components=1 -C android/app/src/main/jniLibs/arm64-v8a lib/libpdfium.so
           flutter build apk --target-platform android-arm64
 
       - name: Install rust target and build (Android-arm32)
@@ -306,12 +306,18 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: 'build.AppImage'
-          path: 'build/build.AppImage'
+          path: 'build/linux.AppImage'
           retention-days: 3
       - if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.target == 'macos'
         name: 'Upload Artifact (MacOS)'
         uses: actions/upload-artifact@v4
         with:
           name: 'build.dmg'
-          path: 'build/build.dmg'
+          path: 'build/macos.dmg'
+      - if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.target == 'windows'
+        name: 'Upload Artifact (MacOS)'
+        uses: actions/upload-artifact@v4
+        with:
+          name: 'build.dmg'
+          path: 'build/windows.zip'
 
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -206,8 +206,9 @@ jobs:
           cp native/jmbackend/platforms/ios/target/aarch64-apple-ios/release/librust.a ios/
           cbindgen native/jmbackend/src/lib.rs -l c > ios/rust.h
 
-          wget https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F6913/pdfium-ios-device-arm64.tgz
-          tar zxvf pdfium-ios-device-arm64.tgz --strip-components=1 -C ios/Runner lib/libpdfium.dylib 
+#          wget https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F6913/pdfium-ios-device-arm64.tgz
+#          tar zxvf pdfium-ios-device-arm64.tgz --strip-components=1 -C ios/Runner lib/libpdfium.dylib
+
           flutter build ios --no-simulator --no-codesign --release
           cd build
           rm -rf Payload

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		DDCD8978277EE9D00009A939 /* librust.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDCD8977277EE9D00009A939 /* librust.a */; };
-		DDF8B9C92D1A840C00AA4035 /* libpdfium.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DDF8B9C82D1A840C00AA4035 /* libpdfium.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -37,7 +36,6 @@
 		A6006DA5939DD454EB60AB14 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		DDCD8976277EE9C70009A939 /* rust.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rust.h; sourceTree = "<group>"; };
 		DDCD8977277EE9D00009A939 /* librust.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = librust.a; sourceTree = "<group>"; };
-		DDF8B9C82D1A840C00AA4035 /* libpdfium.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libpdfium.dylib; sourceTree = "<group>"; };
 		F0BC3378A7483C376F67692E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -48,7 +46,6 @@
 			files = (
 				DDCD8978277EE9D00009A939 /* librust.a in Frameworks */,
 				2323622D1CF2465849CE2BCD /* Pods_Runner.framework in Frameworks */,
-				DDF8B9C92D1A840C00AA4035 /* libpdfium.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -88,7 +85,6 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				DDF8B9C82D1A840C00AA4035 /* libpdfium.dylib */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,

diff --git a/lib/screens/downloads_exporting_screen.dart b/lib/screens/downloads_exporting_screen.dart
@@ -104,7 +104,7 @@ class _DownloadsExportingScreenState extends State<DownloadsExportingScreen> {
           "分别导出CBZS.ZIP" + (!isPro ? "\n(发电后使用)" : ""),
         ),
         Container(height: 20),
-        if (true) ...[
+        if (!Platform.isIOS) ...[
           _buildButtonInner(
             _exportPdf,
             "分别导Pdf" + (!isPro ? "\n(发电后使用)" : ""),