Skip to content

Commit e7becaa

Browse files
olymolym
committed
Change static libraries to binary framework bundle
1 parent 9454251 commit e7becaa

File tree

43 files changed

+657
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+657
-34
lines changed

‎ACRCloudDemoSwift/ACRCloudDemo_Swift-Bridging-Header.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Use this file to import your target's public headers that you would like to expose to Swift.
33
//
44

5-
#import "ACRCloudConfig.h"
6-
#import "ACRCloudRecognition.h"
5+
#import <ACRCloudiOSSDK/ACRCloudConfig.h>
6+
#import <ACRCloudiOSSDK/ACRCloudRecognition.h>

‎ACRCloudDemoSwift/ACRCloudDemo_Swift.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
09F9C3ED268B05A800EAB920 /* ACRCloudSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09F9C3EC268B05A800EAB920 /* ACRCloudSDK.xcframework */; };
10+
09CAAE522B5927CE0083663D /* ACRCloudiOSSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09CAAE512B5927CE0083663D /* ACRCloudiOSSDK.xcframework */; };
1111
A24E360E1D5B74F600C98C28 /* LICENSE.MD in Sources */ = {isa = PBXBuildFile; fileRef = A24E360D1D5B74F600C98C28 /* LICENSE.MD */; };
1212
A2D968871CA512B0009618E1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2D968861CA512B0009618E1 /* AppDelegate.swift */; };
1313
A2D968891CA512B0009618E1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2D968881CA512B0009618E1 /* ViewController.swift */; };
@@ -38,7 +38,7 @@
3838
/* End PBXContainerItemProxy section */
3939

4040
/* Begin PBXFileReference section */
41-
09F9C3EC268B05A800EAB920 /* ACRCloudSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ACRCloudSDK.xcframework; path = ../ACRCloudSDK.xcframework; sourceTree = "<group>"; };
41+
09CAAE512B5927CE0083663D /* ACRCloudiOSSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ACRCloudiOSSDK.xcframework; path = ../ACRCloudiOSSDK.xcframework; sourceTree = "<group>"; };
4242
A24E360D1D5B74F600C98C28 /* LICENSE.MD */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.MD; sourceTree = "<group>"; };
4343
A2D968831CA512AF009618E1 /* ACRCloudDemo_Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ACRCloudDemo_Swift.app; sourceTree = BUILT_PRODUCTS_DIR; };
4444
A2D968861CA512B0009618E1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -63,9 +63,9 @@
6363
files = (
6464
A2D968C71CA6560D009618E1 /* libc++.tbd in Frameworks */,
6565
A2D968BD1CA51EE1009618E1 /* AudioToolbox.framework in Frameworks */,
66+
09CAAE522B5927CE0083663D /* ACRCloudiOSSDK.xcframework in Frameworks */,
6667
A2D968BB1CA51ED6009618E1 /* Security.framework in Frameworks */,
6768
A2D968B91CA51EC0009618E1 /* AVFoundation.framework in Frameworks */,
68-
09F9C3ED268B05A800EAB920 /* ACRCloudSDK.xcframework in Frameworks */,
6969
);
7070
runOnlyForDeploymentPostprocessing = 0;
7171
};
@@ -89,8 +89,8 @@
8989
A2D9687A1CA512AF009618E1 = {
9090
isa = PBXGroup;
9191
children = (
92-
09F9C3EC268B05A800EAB920 /* ACRCloudSDK.xcframework */,
9392
A2D968C61CA6560D009618E1 /* libc++.tbd */,
93+
09CAAE512B5927CE0083663D /* ACRCloudiOSSDK.xcframework */,
9494
A2D968BC1CA51EE1009618E1 /* AudioToolbox.framework */,
9595
A2D968BA1CA51ED6009618E1 /* Security.framework */,
9696
A2D968B81CA51EC0009618E1 /* AVFoundation.framework */,

‎ACRCloudDemoSwift/ACRCloudDemo_Swift.xcodeproj/project.xcworkspace/xcuserdata/olym.xcuserdatad/UserInterfaceState.xcuserstate‎

-388 Bytes
Binary file not shown.

‎ACRCloudDemoSwift/ACRCloudDemo_Swift/ViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ViewController: UIViewController {
3535
config.protocol = "https";
3636

3737
/* used for local model */
38-
if (config.recMode == rec_mode_local || config.recMode == rec_mode_both) {
38+
if (config.recMode == rec_mode_local) {
3939
config.homedir = Bundle.main.resourcePath!.appending("/acrcloud_local_db");
4040
}
4141

‎ACRCloudSDK.xcframework/ios-arm64/libACRCloud_IOS_SDK.a‎

-681 KB
Binary file not shown.

‎ACRCloudSDK.xcframework/ios-arm64_x86_64-maccatalyst/libACRCloud_IOS_SDK.a‎

-1.38 MB
Binary file not shown.

‎ACRCloudSDK.xcframework/ios-arm64_x86_64-simulator/libACRCloud_IOS_SDK.a‎

-1.38 MB
Binary file not shown.

‎ACRCloudiOSDemo/ACRCloudiOSDemo.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -16,7 +16,7 @@
1616
090A02222521E7100053E0A9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 090A02212521E7100053E0A9 /* Main.storyboard */; };
1717
090A02292521E7790053E0A9 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 090A02282521E7790053E0A9 /* libc++.tbd */; };
1818
090A022D2521E99B0053E0A9 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 090A022C2521E99B0053E0A9 /* AVFoundation.framework */; };
19-
09F9C3E4268ADB7000EAB920 /* ACRCloudSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09F9C3E3268ADB7000EAB920 /* ACRCloudSDK.xcframework */; };
19+
09CAAE502B5926BD0083663D /* ACRCloudiOSSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09CAAE4F2B5926BD0083663D /* ACRCloudiOSSDK.xcframework */; };
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXFileReference section */
@@ -34,16 +34,16 @@
3434
090A02212521E7100053E0A9 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
3535
090A02282521E7790053E0A9 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
3636
090A022C2521E99B0053E0A9 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
37-
09F9C3E3268ADB7000EAB920 /* ACRCloudSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ACRCloudSDK.xcframework; path = ../ACRCloudSDK.xcframework; sourceTree = "<group>"; };
37+
09CAAE4F2B5926BD0083663D /* ACRCloudiOSSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ACRCloudiOSSDK.xcframework; path = ../ACRCloudiOSSDK.xcframework; sourceTree = "<group>"; };
3838
/* End PBXFileReference section */
3939

4040
/* Begin PBXFrameworksBuildPhase section */
4141
090A01FE2521E60E0053E0A9 /* Frameworks */ = {
4242
isa = PBXFrameworksBuildPhase;
4343
buildActionMask = 2147483647;
4444
files = (
45-
09F9C3E4268ADB7000EAB920 /* ACRCloudSDK.xcframework in Frameworks */,
4645
090A02292521E7790053E0A9 /* libc++.tbd in Frameworks */,
46+
09CAAE502B5926BD0083663D /* ACRCloudiOSSDK.xcframework in Frameworks */,
4747
090A022D2521E99B0053E0A9 /* AVFoundation.framework in Frameworks */,
4848
);
4949
runOnlyForDeploymentPostprocessing = 0;
@@ -54,7 +54,6 @@
5454
090A01F82521E60E0053E0A9 = {
5555
isa = PBXGroup;
5656
children = (
57-
09F9C3E3268ADB7000EAB920 /* ACRCloudSDK.xcframework */,
5857
090A02282521E7790053E0A9 /* libc++.tbd */,
5958
090A02032521E60E0053E0A9 /* ACRCloudiOSDemo */,
6059
090A02022521E60E0053E0A9 /* Products */,
@@ -92,6 +91,7 @@
9291
isa = PBXGroup;
9392
children = (
9493
090A022C2521E99B0053E0A9 /* AVFoundation.framework */,
94+
09CAAE4F2B5926BD0083663D /* ACRCloudiOSSDK.xcframework */,
9595
);
9696
name = Frameworks;
9797
sourceTree = "<group>";

‎ACRCloudiOSDemo/ACRCloudiOSDemo.xcodeproj/project.xcworkspace/xcuserdata/olym.xcuserdatad/UserInterfaceState.xcuserstate‎

3.52 KB
Binary file not shown.

‎ACRCloudiOSDemo/ACRCloudiOSDemo/ViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#import "ViewController.h"
1010

11-
#import "ACRCloudRecognition.h"
12-
#import "ACRCloudConfig.h"
11+
#import <ACRCloudiOSSDK/ACRCloudRecognition.h>
12+
#import <ACRCloudiOSSDK/ACRCloudConfig.h>
1313

1414
@interface ViewController ()
1515

@@ -41,7 +41,7 @@ - (void)viewDidLoad {
4141
_config.requestTimeout = 10;
4242

4343
/* used for local model */
44-
if (_config.recMode == rec_mode_local || _config.recMode == rec_mode_both)
44+
if (_config.recMode == rec_mode_local)
4545
_config.homedir = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"acrcloud_local_db"];
4646

4747
__weak typeof(self) weakSelf = self;

0 commit comments

Comments
 (0)