Merge pull request #390 from jpush/dev

Dev
jpush · Oct 30, 2017 · bb713c3 · bb713c3
2 parents 74cee4b + 49b1a79
commit bb713c3
Show file tree

Hide file tree

Showing 11 changed files with 389 additions and 9 deletions.
diff --git a/android/libs/jpush-android-3.0.7.jar b/android/libs/jpush-android-3.0.7.jar
diff --git a/android/libs/jpush-android-3.0.9.jar b/android/libs/jpush-android-3.0.9.jar
diff --git a/example/android/app/src/main/assets/index.android.bundle b/example/android/app/src/main/assets/index.android.bundle
diff --git a/example/android/app/src/main/assets/index.android.bundle.meta b/example/android/app/src/main/assets/index.android.bundle.meta
@@ -0,0 +1 @@
+�iԨ���\�]w�[���a�d
diff --git a/example/package.json b/example/package.json
@@ -7,8 +7,8 @@
     "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "dependencies": {
-    "jcore-react-native": "^1.1.7",
-    "jpush-react-native": "^2.1.1",
+    "jcore-react-native": "^1.2.0",
+    "jpush-react-native": "^2.1.2",
     "react": "^16.0.0-alpha.12",
     "react-native": "^0.47.1",
     "react-native-onesignal": "^3.0.4",

diff --git a/example/react-native-android/push_activity.js b/example/react-native-android/push_activity.js
@@ -115,6 +115,18 @@ export default class PushActivity extends React.Component {
 		JPushModule.addGetRegistrationIdListener((registrationId) => {
 			console.log("Device register succeed, registrationId " + registrationId);
 		});
+		// var notification = {
+		// 	buildId: 1,
+		// 	id: 5,
+		// 	title: 'jpush',
+		// 	content: 'This is a test!!!!',
+		// 	extra: {
+		// 		key1: 'value1',
+		// 		key2: 'value2'
+		// 	},
+		// 	fireTime: 2000,
+		// }
+		// JPushModule.sendLocalNotification(notification);
 	}
 
 	componentWillUnmount() {

diff --git a/ios/RCTJPushModule.xcodeproj/project.pbxproj b/ios/RCTJPushModule.xcodeproj/project.pbxproj
@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		624386D71E096B8800F69E07 /* RCTJPushActionQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */; };
 		624386D81E096B8800F69E07 /* RCTJPushModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D41E096B8800F69E07 /* RCTJPushModule.m */; };
-		626F957A1F2EF8CC009C6BB5 /* jpush-ios-3.0.6.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 626F95791F2EF8CC009C6BB5 /* jpush-ios-3.0.6.a */; };
+		626A78821FA336AA0074D518 /* jpush-ios-3.0.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 626A78811FA336AA0074D518 /* jpush-ios-3.0.7.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -30,7 +30,7 @@
 		624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJPushActionQueue.m; 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>"; };
-		626F95791F2EF8CC009C6BB5 /* jpush-ios-3.0.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-3.0.6.a"; sourceTree = "<group>"; };
+		626A78811FA336AA0074D518 /* jpush-ios-3.0.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-3.0.7.a"; sourceTree = "<group>"; };
 		6280980A1CEDC407000D3A81 /* libRCTJPushModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTJPushModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -39,7 +39,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				626F957A1F2EF8CC009C6BB5 /* jpush-ios-3.0.6.a in Frameworks */,
+				626A78821FA336AA0074D518 /* jpush-ios-3.0.7.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -65,7 +65,7 @@
 		6280980C1CEDC407000D3A81 /* RCTJPushModule */ = {
 			isa = PBXGroup;
 			children = (
-				626F95791F2EF8CC009C6BB5 /* jpush-ios-3.0.6.a */,
+				626A78811FA336AA0074D518 /* jpush-ios-3.0.7.a */,
 				623D05801EA4D29100F31FBE /* JPUSHService.h */,
 				624386D11E096B8800F69E07 /* RCTJPushActionQueue.h */,
 				624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */,

diff --git a/...deproj/project.xcworkspace/xcuserdata/HuminiOS.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/HuminiOS.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/RCTJPushModule/JPUSHService.h b/ios/RCTJPushModule/JPUSHService.h
@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 3.0.6
+#define JPUSH_VERSION_NUMBER 3.0.7
 
 #import <Foundation/Foundation.h>
 
@@ -222,6 +222,7 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) {
 
 /**
  删除指定tags
+
  @param tags 需要删除的tags集合
  @param completion 响应回调
  @param seq 请求序列号

diff --git a/ios/RCTJPushModule/jpush-ios-3.0.6.a → ios/RCTJPushModule/jpush-ios-3.0.7.a b/ios/RCTJPushModule/jpush-ios-3.0.6.a → ios/RCTJPushModule/jpush-ios-3.0.7.a
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jpush-react-native",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "a jpush plugin for react native application",
   "main": "index.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/jpush/jpush-react-native#readme",
   "peerDependencies": {
-    "jcore-react-native": ">= 1.1.5"
+    "jcore-react-native": ">= 1.2.0"
   },
   "rnpm": {
     "ios": {