Merge branch '22'

# Conflicts: # package.json
jpush · Apr 25, 2024 · 43948a2 · 43948a2
2 parents 18fc95f + 7f9bd8b
commit 43948a2
Show file tree

Hide file tree

Showing 10 changed files with 230 additions and 9 deletions.
diff --git a/JCore.podspec b/JCore.podspec
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source             = { :git => "https://github.com/jpush/jcore-react-native.git", :tag => "#{s.version}" }
   s.source_files       = 'ios/RCTJCoreModule/*.{h,m}'
   s.preserve_paths     = "**/*.js"
-  s.vendored_libraries = "ios/RCTJCoreModule/*.a"
+  s.vendored_frameworks = "ios/RCTJCoreModule/*.xcframework"
  	s.libraries       = 'z','resolv', 'sqlite3', 'c++.1'
   s.dependency 'React'
 end
diff --git a/ios/RCTJCoreModule.xcodeproj/project.pbxproj b/ios/RCTJCoreModule.xcodeproj/project.pbxproj
@@ -3,13 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		08166A7B27EC622A00C7233B /* RCTJCoreModule.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6212E9EF1F3991D500BDF51A /* RCTJCoreModule.h */; };
-		620241712ABD434700D71FBD /* libjcore-ios-4.4.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 620241702ABD434700D71FBD /* libjcore-ios-4.4.0.a */; };
 		6212E9F11F3991D500BDF51A /* RCTJCoreModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 6212E9F01F3991D500BDF51A /* RCTJCoreModule.m */; };
+		623F02B22BDA179B0041AD17 /* jcore-ios-4.6.2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 623F02B12BDA179B0041AD17 /* jcore-ios-4.6.2.xcframework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -26,19 +26,18 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		08166A7C27EC628200C7233B /* Lib */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Lib; sourceTree = "<group>"; };
-		620241702ABD434700D71FBD /* libjcore-ios-4.4.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjcore-ios-4.4.0.a"; path = "RCTJCoreModule/libjcore-ios-4.4.0.a"; sourceTree = "<group>"; };
 		6212E9B41F3990DC00BDF51A /* libRCTJCoreModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTJCoreModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		6212E9EF1F3991D500BDF51A /* RCTJCoreModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJCoreModule.h; sourceTree = "<group>"; };
 		6212E9F01F3991D500BDF51A /* RCTJCoreModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJCoreModule.m; sourceTree = "<group>"; };
+		623F02B12BDA179B0041AD17 /* jcore-ios-4.6.2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "jcore-ios-4.6.2.xcframework"; path = "RCTJCoreModule/jcore-ios-4.6.2.xcframework"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		6212E9B11F3990DC00BDF51A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				620241712ABD434700D71FBD /* libjcore-ios-4.4.0.a in Frameworks */,
+				623F02B22BDA179B0041AD17 /* jcore-ios-4.6.2.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -48,7 +47,7 @@
 		5CE8168A22FC0295007D710C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				620241702ABD434700D71FBD /* libjcore-ios-4.4.0.a */,
+				623F02B12BDA179B0041AD17 /* jcore-ios-4.6.2.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -73,7 +72,6 @@
 		6212E9B61F3990DC00BDF51A /* RCTJCoreModule */ = {
 			isa = PBXGroup;
 			children = (
-				08166A7C27EC628200C7233B /* Lib */,
 				6212E9EF1F3991D500BDF51A /* RCTJCoreModule.h */,
 				6212E9F01F3991D500BDF51A /* RCTJCoreModule.m */,
 			);

diff --git a/ios/RCTJCoreModule/jcore-ios-4.6.2.xcframework/Info.plist b/ios/RCTJCoreModule/jcore-ios-4.6.2.xcframework/Info.plist
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>libJCore.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libJCore.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/ios/RCTJCoreModule/JGInforCollectionAuth.h → ...ios-arm64/Headers/JGInforCollectionAuth.h b/ios/RCTJCoreModule/JGInforCollectionAuth.h → ...ios-arm64/Headers/JGInforCollectionAuth.h
diff --git a/ios/RCTJCoreModule/jcore-ios-4.6.2.xcframework/ios-arm64/PrivacyInfo.xcprivacy b/ios/RCTJCoreModule/jcore-ios-4.6.2.xcframework/ios-arm64/PrivacyInfo.xcprivacy
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeCrashData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeDeviceID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePreciseLocation</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>E174.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/ios/RCTJCoreModule/jcore-ios-4.6.2.xcframework/ios-arm64/libJCore.a b/ios/RCTJCoreModule/jcore-ios-4.6.2.xcframework/ios-arm64/libJCore.a
diff --git a/...le/jcore-ios-4.6.2.xcframework/ios-arm64_x86_64-simulator/Headers/JGInforCollectionAuth.h b/...le/jcore-ios-4.6.2.xcframework/ios-arm64_x86_64-simulator/Headers/JGInforCollectionAuth.h
@@ -0,0 +1,27 @@
+//
+//  JGInforCollectionAuth.h
+//  JCore
+//
+//  Created by 豆瓣 on 2021/10/27.
+//  Copyright © 2021 jiguang. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// 合规接口，是否授权极光采集一定的设备信息
+@interface JGInforCollectionAuthItems : NSObject
+/// 是否授权，默认YES
+@property(nonatomic,assign)BOOL isAuth;
+@end
+
+@interface JGInforCollectionAuth : NSObject
+
+/// 设备信息采集授权接口（合规接口）
+/// 请务必在调用初始化、功能性接口前调用此接口进行合规授权
+/// @param authBlock auth:YES 则极光认为您同意极光采集一定的设备信息
++(void)JCollectionAuth:(void(^_Nullable)(JGInforCollectionAuthItems *authInfo))authBlock;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/...TJCoreModule/jcore-ios-4.6.2.xcframework/ios-arm64_x86_64-simulator/PrivacyInfo.xcprivacy b/...TJCoreModule/jcore-ios-4.6.2.xcframework/ios-arm64_x86_64-simulator/PrivacyInfo.xcprivacy
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeCrashData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeDeviceID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePreciseLocation</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>E174.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/ios/RCTJCoreModule/libjcore-ios-4.4.0.a → ...ork/ios-arm64_x86_64-simulator/libJCore.a b/ios/RCTJCoreModule/libjcore-ios-4.4.0.a → ...ork/ios-arm64_x86_64-simulator/libJCore.a
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "author"     : "wicked.tc130",
   "license"    : "ISC",
   "main"       : "index.js",
-  "version"    : "2.1.6",
+  "version"    : "2.1.7",
   "repository" : {
     "type": "git",
     "url": "https://github.com/jpush/jcore-react-native"