Skip to content

Commit d05266c

Browse files
author
garenwang
committed
fix
1 parent 4010bc8 commit d05266c

File tree

48 files changed

+102
-420
lines changed

Some content is hidden

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

48 files changed

+102
-420
lines changed

‎COSBeaconAPI_Base.xcframework/Info.plist‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<array>
77
<dict>
88
<key>LibraryIdentifier</key>
9-
<string>ios-i386_x86_64-simulator</string>
9+
<string>ios-arm64_x86_64-maccatalyst</string>
1010
<key>LibraryPath</key>
1111
<string>COSBeaconAPI_Base.framework</string>
1212
<key>SupportedArchitectures</key>
1313
<array>
14-
<string>i386</string>
14+
<string>arm64</string>
1515
<string>x86_64</string>
1616
</array>
1717
<key>SupportedPlatform</key>
1818
<string>ios</string>
1919
<key>SupportedPlatformVariant</key>
20-
<string>simulator</string>
20+
<string>maccatalyst</string>
2121
</dict>
2222
<dict>
2323
<key>LibraryIdentifier</key>
@@ -34,18 +34,19 @@
3434
</dict>
3535
<dict>
3636
<key>LibraryIdentifier</key>
37-
<string>ios-arm64_x86_64-maccatalyst</string>
37+
<string>ios-arm64_i386_x86_64-simulator</string>
3838
<key>LibraryPath</key>
3939
<string>COSBeaconAPI_Base.framework</string>
4040
<key>SupportedArchitectures</key>
4141
<array>
4242
<string>arm64</string>
43+
<string>i386</string>
4344
<string>x86_64</string>
4445
</array>
4546
<key>SupportedPlatform</key>
4647
<string>ios</string>
4748
<key>SupportedPlatformVariant</key>
48-
<string>maccatalyst</string>
49+
<string>simulator</string>
4950
</dict>
5051
</array>
5152
<key>CFBundlePackageType</key>

‎COSBeaconAPI_Base.xcframework/ios-arm64_armv7/COSBeaconAPI_Base.framework/COSBeaconAPI_Base‎

5.16 KB
Binary file not shown.

‎COSBeaconAPI_Base.xcframework/ios-arm64_armv7/COSBeaconAPI_Base.framework/Headers/COSBeaconBaseInfoModel.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ NS_ASSUME_NONNULL_BEGIN
6363
@property (assign, readonly) long long romSize;
6464
/// openuuid 自建
6565
@property (copy, readonly) NSString *openUdid;
66-
/// A50
67-
@property (copy) NSString *A50;
68-
/// A51
69-
@property (copy) NSString *A51;
66+
/// idfv
67+
@property (copy) NSString *idfv;
68+
/// idfa
69+
@property (copy) NSString *idfa;
7070
/// 是否越狱
7171
@property (assign, readonly) BOOL isReet;
7272
/// 主通道的channelId
@@ -120,7 +120,7 @@ NS_ASSUME_NONNULL_BEGIN
120120
/// 启动来源
121121
@property (copy) NSString *launchSource;
122122
/// 设备名
123-
@property (copy, readonly) NSString *A106 DEPRECATED_MSG_ATTRIBUTE("安全合规建设,4.2.75以后不再采集");
123+
@property (copy, readonly) NSString *deviceName DEPRECATED_MSG_ATTRIBUTE("安全合规建设,4.2.75以后不再采集");
124124
/// 设备型号
125125
@property (copy, readonly) NSString *deviceModel;
126126
/// 设备类型

‎COSBeaconAPI_Base.xcframework/ios-arm64_armv7/COSBeaconAPI_Base.framework/Headers/COSBeaconReport+internal.h‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎COSBeaconAPI_Base.xcframework/ios-arm64_armv7/COSBeaconAPI_Base.framework/Headers/COSBeaconReport.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ extern BOOL COSBeaconHasStarted;
7575
/// 是否采集WiFiMac地址，参数为NO时不采集，默认采集，如果需要关闭则需要在初始化前设置为NO
7676
@property (assign) BOOL collectMacEnable DEPRECATED_MSG_ATTRIBUTE("4.2.74以后不再采集,如需使用请自行采集后通过[COSBeaconReport.sharedInstance setWifiName:/setWifiMac:]填充");
7777

78-
/// 是否采集A51,参数为NO时不采集，默认采集，如果需要关闭则需要在初始化前设置为NO
79-
@property (assign) BOOL collectA51Enable DEPRECATED_MSG_ATTRIBUTE("4.2.74以后不再采集,如需使用请自行采集后通过[COSBeaconReport.sharedInstance setA51:]填充");
78+
/// 是否采集idfa,参数为NO时不采集，默认采集，如果需要关闭则需要在初始化前设置为NO
79+
@property (assign) BOOL collectIdfaEnable DEPRECATED_MSG_ATTRIBUTE("4.2.74以后不再采集,如需使用请自行采集后通过[COSBeaconReport.sharedInstance setIDFA:]填充");
8080

8181

82-
/// 是否采集A50，默认采集。无特殊情况不要关闭 ! 若关闭后务必在授权后填充A50(setA50:)
83-
@property (assign) BOOL collectA50Enable;
82+
/// 是否采集idfv，默认采集。无特殊情况不要关闭 ! 若关闭后务必在授权后填充IDFV(setIDFV:)
83+
@property (assign) BOOL collectIdfvEnable;
8484

8585
/// 网络数据传输通道代理
8686
@property (nonatomic, weak) id<COSBeaconTransferProtocal> transferDelegate;
@@ -137,18 +137,18 @@ extern BOOL COSBeaconHasStarted;
137137

138138
/**
139139
* 设置O16和O36参数
140-
* 填充设备id: 灯塔默认只使用A50来区分设备, 通常建议集成时填充稳定的设备ID， 比如A51,或者专门的SDK产生的设备ID
140+
* 填充设备id: 灯塔默认只使用IDFV来区分设备, 通常建议集成时填充稳定的设备ID， 比如IDFA,或者专门的SDK产生的设备ID
141141
*/
142142
- (void)setOStarO16:(NSString *)o16 o36:(nullable NSString *)o36;
143143

144144
/// 把OStarSDK的版本号透传给灯塔
145145
- (void)setOStarVersion:(NSString *)ostarVersion;
146146

147-
/// 默认不采集A51,由需采集A51的应用宿主填充.
148-
- (void)setA51:(NSString *)A51;
147+
/// 默认不采集idfa,由需采集idfa的应用宿主填充.
148+
- (void)setIDFA:(NSString *)idfa;
149149

150-
/// 默认采集A50,业务如有关闭A50,用户同意隐私采集后,需填充给灯塔
151-
- (void)setA50:(NSString *)A50;
150+
/// 默认采集IDFV,业务如有关闭IDFV,用户同意隐私采集后,需填充给灯塔
151+
- (void)setIDFV:(NSString *)idfv;
152152

153153
/// 设置wifiName. 用户授权隐私数据采集后,可统一采集后填充到灯塔
154154
- (void)setWifiName:(NSString *)wifiName;
@@ -167,4 +167,4 @@ extern BOOL COSBeaconHasStarted;
167167

168168
NS_ASSUME_NONNULL_END
169169

170-
#define BEACON_SDK_VERSION @"4.2.76.86"
170+
#define BEACON_SDK_VERSION @"4.2.76.52"

‎COSBeaconAPI_Base.xcframework/ios-arm64_armv7/COSBeaconAPI_Base.framework/Info.plist‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎QCloudTrack/Classes/BeaconFramework/COSBeaconAPI_Base.xcframework/ios-i386_x86_64-simulator/COSBeaconAPI_Base.framework/COSBeaconAPI_Base‎ renamed to ‎COSBeaconAPI_Base.xcframework/ios-arm64_i386_x86_64-simulator/COSBeaconAPI_Base.framework/COSBeaconAPI_Base‎

10.5 MB
Binary file not shown.

‎COSBeaconAPI_Base.xcframework/ios-i386_x86_64-simulator/COSBeaconAPI_Base.framework/Headers/COSBeaconBaseInfoModel.h‎ renamed to ‎COSBeaconAPI_Base.xcframework/ios-arm64_i386_x86_64-simulator/COSBeaconAPI_Base.framework/Headers/COSBeaconBaseInfoModel.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ NS_ASSUME_NONNULL_BEGIN
6363
@property (assign, readonly) long long romSize;
6464
/// openuuid 自建
6565
@property (copy, readonly) NSString *openUdid;
66-
/// A50
67-
@property (copy) NSString *A50;
68-
/// A51
69-
@property (copy) NSString *A51;
66+
/// idfv
67+
@property (copy) NSString *idfv;
68+
/// idfa
69+
@property (copy) NSString *idfa;
7070
/// 是否越狱
7171
@property (assign, readonly) BOOL isReet;
7272
/// 主通道的channelId
@@ -120,7 +120,7 @@ NS_ASSUME_NONNULL_BEGIN
120120
/// 启动来源
121121
@property (copy) NSString *launchSource;
122122
/// 设备名
123-
@property (copy, readonly) NSString *A106 DEPRECATED_MSG_ATTRIBUTE("安全合规建设,4.2.75以后不再采集");
123+
@property (copy, readonly) NSString *deviceName DEPRECATED_MSG_ATTRIBUTE("安全合规建设,4.2.75以后不再采集");
124124
/// 设备型号
125125
@property (copy, readonly) NSString *deviceModel;
126126
/// 设备类型

‎COSBeaconAPI_Base.xcframework/ios-i386_x86_64-simulator/COSBeaconAPI_Base.framework/Headers/COSBeaconBaseInterface.h‎ renamed to ‎COSBeaconAPI_Base.xcframework/ios-arm64_i386_x86_64-simulator/COSBeaconAPI_Base.framework/Headers/COSBeaconBaseInterface.h‎

File renamed without changes.

‎COSBeaconAPI_Base.xcframework/ios-i386_x86_64-simulator/COSBeaconAPI_Base.framework/Headers/COSBeaconCallBackManager.h‎ renamed to ‎COSBeaconAPI_Base.xcframework/ios-arm64_i386_x86_64-simulator/COSBeaconAPI_Base.framework/Headers/COSBeaconCallBackManager.h‎

File renamed without changes.

0 commit comments

Comments
 (0)