Merge remote-tracking branch 'main/master'

# Conflicts:
#	example/package.json
#	package.json

Author: lcTerry

JPush.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.frameworks      = 'UIKit','CFNetwork','CoreFoundation','CoreTelephony','SystemConfiguration','CoreGraphics','Foundation','Security'
   s.weak_frameworks = 'UserNotifications'
   s.libraries       = 'z','resolv'
-  s.vendored_libraries = "ios/RCTJPushModule/*.a"
+  s.vendored_frameworks = "ios/RCTJPushModule/*.xcframework"
   s.dependency 'React'
 end

ios/RCTJPushModule.xcodeproj/project.pbxproj

@@ -3,12 +3,12 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		5C103CA7236041E7000AD3DA /* RCTJPushEventQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C103CA6236041E7000AD3DA /* RCTJPushEventQueue.m */; };
-		6202416F2ABD3DA900D71FBD /* libjpush-ios-5.2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6202416E2ABD3DA900D71FBD /* libjpush-ios-5.2.0.a */; };
+		623F02B02BDA15F70041AD17 /* jpush-ios-5.3.0.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 623F02AF2BDA15F70041AD17 /* jpush-ios-5.3.0.xcframework */; };
 		624386D81E096B8800F69E07 /* RCTJPushModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D41E096B8800F69E07 /* RCTJPushModule.m */; };
 /* End PBXBuildFile section */
 
@@ -27,19 +27,18 @@
 /* Begin PBXFileReference section */
 		5C103CA5236041E7000AD3DA /* RCTJPushEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJPushEventQueue.h; sourceTree = "<group>"; };
 		5C103CA6236041E7000AD3DA /* RCTJPushEventQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJPushEventQueue.m; sourceTree = "<group>"; };
-		6202416E2ABD3DA900D71FBD /* libjpush-ios-5.2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjpush-ios-5.2.0.a"; path = "RCTJPushModule/libjpush-ios-5.2.0.a"; sourceTree = "<group>"; };
+		623F02AF2BDA15F70041AD17 /* jpush-ios-5.3.0.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "jpush-ios-5.3.0.xcframework"; path = "RCTJPushModule/jpush-ios-5.3.0.xcframework"; sourceTree = "<group>"; };
 		624386D31E096B8800F69E07 /* RCTJPushModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJPushModule.h; sourceTree = "<group>"; };
 		624386D41E096B8800F69E07 /* RCTJPushModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJPushModule.m; sourceTree = "<group>"; };
 		6280980A1CEDC407000D3A81 /* libRCTJPushModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTJPushModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		62DA93BC21E8679300208462 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		628098071CEDC407000D3A81 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6202416F2ABD3DA900D71FBD /* libjpush-ios-5.2.0.a in Frameworks */,
+				623F02B02BDA15F70041AD17 /* jpush-ios-5.3.0.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -49,7 +48,7 @@
 		5CF8E647231E3A9200B12200 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				6202416E2ABD3DA900D71FBD /* libjpush-ios-5.2.0.a */,
+				623F02AF2BDA15F70041AD17 /* jpush-ios-5.3.0.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -76,7 +75,6 @@
 			children = (
 				5C103CA5236041E7000AD3DA /* RCTJPushEventQueue.h */,
 				5C103CA6236041E7000AD3DA /* RCTJPushEventQueue.m */,
-				62DA93BC21E8679300208462 /* JPUSHService.h */,
 				624386D31E096B8800F69E07 /* RCTJPushModule.h */,
 				624386D41E096B8800F69E07 /* RCTJPushModule.m */,
 			);

ios/RCTJPushModule/jpush-ios-5.3.0.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>libJPushM.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>libJPushM.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>

ios/RCTJPushModule/JPUSHService.h …amework/ios-arm64/Headers/JPUSHService.hios/RCTJPushModule/JPUSHService.h renamed to ios/RCTJPushModule/jpush-ios-5.3.0.xcframework/ios-arm64/Headers/JPUSHService.h ios/RCTJPushModule/JPUSHService.h renamed to ios/RCTJPushModule/jpush-ios-5.3.0.xcframework/ios-arm64/Headers/JPUSHService.h

@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 5.2.0
+#define JPUSH_VERSION_NUMBER 5.3.0
 
 #import <Foundation/Foundation.h>
 
@@ -175,6 +175,13 @@ typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) {
 
 @end
 
+@interface JPushCollectControl : NSObject
+
+/* gps 经纬度信息。设置为NO,不采集经纬度信息。默认为YES。 */
+@property (nonatomic, assign) BOOL gps;
+
+@end
+
 /*!
  * JPush 核心头文件
  */
@@ -763,6 +770,13 @@ typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) {
  */
 + (void)setLogOFF;
 
+/*!
+ 数据采集控制
+ 
+ @param control 数据采集配置。
+ */
++ (void)setCollectControl:(JPushCollectControl *)control;
+
 /*!
  * @abstract 设置SDK地理位置权限开关
  *

ios/RCTJPushModule/jpush-ios-5.3.0.xcframework/ios-arm64/PrivacyInfo.xcprivacy

@@ -0,0 +1,23 @@
+<?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/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+		</dict>
+	</array>
+</dict>
+</plist>