diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 5439b25..621a9e6 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -21,7 +21,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 integration_test: 13825b8a9334a850581300559b8839134b124670 - jc_printer: 5938db1fe300937b40621ee0ddedc32c7c9e8d63 + jc_printer: 98d27e989a3129f784669a21dd5883eec26ba102 PODFILE CHECKSUM: 02caaa843f6501172c0d470d80e72f61175c8b93 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index d0e1f7c..bf3b5bc 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -208,6 +208,7 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 20F8517985BB5619A77F396B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -300,6 +301,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 20F8517985BB5619A77F396B /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index 6b2d553..8f58983 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -45,5 +45,9 @@ UIApplicationSupportsIndirectInputEvents + NSBluetoothAlwaysUsageDescription + 需要蓝牙权限 + NSBluetoothPeripheralUsageDescription + 需要蓝牙权限 diff --git a/ios/Classes/FWnetworkWIFI.mm b/ios/Classes/FWnetworkWIFI.mm deleted file mode 100644 index ee39908..0000000 --- a/ios/Classes/FWnetworkWIFI.mm +++ /dev/null @@ -1,27 +0,0 @@ - -#include "FWnetworkWIFI.h" - -@implementation FWnetworkWIFI - -+(instancetype)shareManager{ - FWnetworkWIFI * manager = [super init]; - return manager; -} - --(BOOL)isEnableWIFI{ - return NO; -} - - --(void)connectWIFIWithSSID:(NSString *)SSID pass:(NSString *)pass{ - -} --(void)startScan{ - -} --(void)stop{ - -} - - -@end diff --git a/ios/Classes/JCAPI.a b/ios/Classes/JCAPI.a deleted file mode 100644 index cac985b..0000000 Binary files a/ios/Classes/JCAPI.a and /dev/null differ diff --git a/ios/Classes/JcPrinterPlugin.m b/ios/Classes/JcPrinterPlugin.m index 7713dd1..e1c3069 100644 --- a/ios/Classes/JcPrinterPlugin.m +++ b/ios/Classes/JcPrinterPlugin.m @@ -1,5 +1,5 @@ #import "JcPrinterPlugin.h" -#import "JCAPI.h" +#import @implementation JcPrinterPlugin + (void)registerWithRegistrar:(NSObject*)registrar { diff --git a/ios/CocoaAsyncSocket.framework/CocoaAsyncSocket b/ios/Frameworks/CocoaAsyncSocket.framework/CocoaAsyncSocket similarity index 100% rename from ios/CocoaAsyncSocket.framework/CocoaAsyncSocket rename to ios/Frameworks/CocoaAsyncSocket.framework/CocoaAsyncSocket diff --git a/ios/CocoaAsyncSocket.framework/Headers/AsyncSocket.h b/ios/Frameworks/CocoaAsyncSocket.framework/Headers/AsyncSocket.h similarity index 100% rename from ios/CocoaAsyncSocket.framework/Headers/AsyncSocket.h rename to ios/Frameworks/CocoaAsyncSocket.framework/Headers/AsyncSocket.h diff --git a/ios/CocoaAsyncSocket.framework/Headers/AsyncUdpSocket.h b/ios/Frameworks/CocoaAsyncSocket.framework/Headers/AsyncUdpSocket.h similarity index 100% rename from ios/CocoaAsyncSocket.framework/Headers/AsyncUdpSocket.h rename to ios/Frameworks/CocoaAsyncSocket.framework/Headers/AsyncUdpSocket.h diff --git a/ios/CocoaAsyncSocket.framework/Headers/CocoaAsyncSocket.h b/ios/Frameworks/CocoaAsyncSocket.framework/Headers/CocoaAsyncSocket.h similarity index 100% rename from ios/CocoaAsyncSocket.framework/Headers/CocoaAsyncSocket.h rename to ios/Frameworks/CocoaAsyncSocket.framework/Headers/CocoaAsyncSocket.h diff --git a/ios/CocoaAsyncSocket.framework/Headers/GCDAsyncSocket.h b/ios/Frameworks/CocoaAsyncSocket.framework/Headers/GCDAsyncSocket.h similarity index 100% rename from ios/CocoaAsyncSocket.framework/Headers/GCDAsyncSocket.h rename to ios/Frameworks/CocoaAsyncSocket.framework/Headers/GCDAsyncSocket.h diff --git a/ios/CocoaAsyncSocket.framework/Headers/GCDAsyncUdpSocket.h b/ios/Frameworks/CocoaAsyncSocket.framework/Headers/GCDAsyncUdpSocket.h similarity index 100% rename from ios/CocoaAsyncSocket.framework/Headers/GCDAsyncUdpSocket.h rename to ios/Frameworks/CocoaAsyncSocket.framework/Headers/GCDAsyncUdpSocket.h diff --git a/ios/CocoaAsyncSocket.framework/Info.plist b/ios/Frameworks/CocoaAsyncSocket.framework/Info.plist similarity index 100% rename from ios/CocoaAsyncSocket.framework/Info.plist rename to ios/Frameworks/CocoaAsyncSocket.framework/Info.plist diff --git a/ios/CocoaAsyncSocket.framework/Modules/module.modulemap b/ios/Frameworks/CocoaAsyncSocket.framework/Modules/module.modulemap similarity index 100% rename from ios/CocoaAsyncSocket.framework/Modules/module.modulemap rename to ios/Frameworks/CocoaAsyncSocket.framework/Modules/module.modulemap diff --git a/ios/CocoaAsyncSocket.framework/_CodeSignature/CodeResources b/ios/Frameworks/CocoaAsyncSocket.framework/_CodeSignature/CodeResources similarity index 100% rename from ios/CocoaAsyncSocket.framework/_CodeSignature/CodeResources rename to ios/Frameworks/CocoaAsyncSocket.framework/_CodeSignature/CodeResources diff --git a/ios/Classes/FWnetworkWIFI.h b/ios/Frameworks/JCPrinterSDK.framework/Headers/FWnetworkWIFI.h similarity index 100% rename from ios/Classes/FWnetworkWIFI.h rename to ios/Frameworks/JCPrinterSDK.framework/Headers/FWnetworkWIFI.h diff --git a/ios/Classes/JCAPI.h b/ios/Frameworks/JCPrinterSDK.framework/Headers/JCAPI.h similarity index 100% rename from ios/Classes/JCAPI.h rename to ios/Frameworks/JCPrinterSDK.framework/Headers/JCAPI.h diff --git a/ios/Frameworks/JCPrinterSDK.framework/Headers/JCPrinterSDK.h b/ios/Frameworks/JCPrinterSDK.framework/Headers/JCPrinterSDK.h new file mode 100644 index 0000000..60070cc --- /dev/null +++ b/ios/Frameworks/JCPrinterSDK.framework/Headers/JCPrinterSDK.h @@ -0,0 +1,20 @@ +// +// JCPrinterSDK.h +// JCPrinterSDK +// +// Created by 歪脖子 on 2023/10/21. +// + +#import + +//! Project version number for JCPrinterSDK. +FOUNDATION_EXPORT double JCPrinterSDKVersionNumber; + +//! Project version string for JCPrinterSDK. +FOUNDATION_EXPORT const unsigned char JCPrinterSDKVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + +#import +#import diff --git a/ios/Frameworks/JCPrinterSDK.framework/Info.plist b/ios/Frameworks/JCPrinterSDK.framework/Info.plist new file mode 100644 index 0000000..b644c72 Binary files /dev/null and b/ios/Frameworks/JCPrinterSDK.framework/Info.plist differ diff --git a/ios/Frameworks/JCPrinterSDK.framework/JCPrinterSDK b/ios/Frameworks/JCPrinterSDK.framework/JCPrinterSDK new file mode 100755 index 0000000..b9edf57 Binary files /dev/null and b/ios/Frameworks/JCPrinterSDK.framework/JCPrinterSDK differ diff --git a/ios/JCSDKFont.bundle/Info.plist b/ios/Frameworks/JCPrinterSDK.framework/JCSDKFont.bundle/Info.plist similarity index 100% rename from ios/JCSDKFont.bundle/Info.plist rename to ios/Frameworks/JCPrinterSDK.framework/JCSDKFont.bundle/Info.plist diff --git a/ios/JCSDKFont.bundle/SourceHanSans-Regular.ttc b/ios/Frameworks/JCPrinterSDK.framework/JCSDKFont.bundle/SourceHanSans-Regular.ttc similarity index 100% rename from ios/JCSDKFont.bundle/SourceHanSans-Regular.ttc rename to ios/Frameworks/JCPrinterSDK.framework/JCSDKFont.bundle/SourceHanSans-Regular.ttc diff --git a/ios/JCSDKFont.bundle/language.json b/ios/Frameworks/JCPrinterSDK.framework/JCSDKFont.bundle/language.json similarity index 100% rename from ios/JCSDKFont.bundle/language.json rename to ios/Frameworks/JCPrinterSDK.framework/JCSDKFont.bundle/language.json diff --git a/ios/JCSDKPringterConfig.json b/ios/Frameworks/JCPrinterSDK.framework/JCSDKPringterConfig.json similarity index 100% rename from ios/JCSDKPringterConfig.json rename to ios/Frameworks/JCPrinterSDK.framework/JCSDKPringterConfig.json diff --git a/ios/Frameworks/JCPrinterSDK.framework/Modules/module.modulemap b/ios/Frameworks/JCPrinterSDK.framework/Modules/module.modulemap new file mode 100644 index 0000000..89f8f43 --- /dev/null +++ b/ios/Frameworks/JCPrinterSDK.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module JCPrinterSDK { + umbrella header "JCPrinterSDK.h" + export * + + module * { export * } +} diff --git a/ios/jc_printer.podspec b/ios/jc_printer.podspec index 0c4d662..6f6e6bd 100644 --- a/ios/jc_printer.podspec +++ b/ios/jc_printer.podspec @@ -14,13 +14,7 @@ Pod::Spec.new do |s| s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' - s.frameworks = 'AVFoundation', 'CoreMedia' - s.libraries = 'iconv.2', 'bz2.1.0' - s.vendored_frameworks = 'CocoaAsyncSocket.framework' - s.vendored_libraries = 'Classes/JCAPI.a' - - s.resources = ['JCSDKFont.bundle', 'JCSDKPringterConfig.json'] - s.resource_bundle = { 'JCSDKFont' => 'SourceHanSans-Regular.ttc' } + s.vendored_frameworks = 'Frameworks/JCPrinterSDK.framework', 'Frameworks/CocoaAsyncSocket.framework' s.dependency 'Flutter' s.platform = :ios, '11.0'