Skip to content

Commit cffba79

Browse files
huangminlinuxhuangminlinux
authored
Merge pull request #527 from jpush/dev
Dev
2 parents bcd00a7 + 6c97755 commit cffba79

File tree

3 files changed

+64
-13
lines changed

3 files changed

+64
-13
lines changed

‎example/ios/PushDemo.xcodeproj/project.pbxproj‎

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; };
3737
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
3838
2DCD954D1E0B4F2C00145EB5 /* PushDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* PushDemoTests.m */; };
39+
506C0A0BA2884B1986A0F1CE /* libRCTJCoreModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 778ED37F5DB1437D836B468F /* libRCTJCoreModule.a */; };
3940
564D0D604F8F4F1188346046 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EAF34D6BC9B4C498B955709 /* Security.framework */; };
4041
5E0D9D2770B14FE3ABE83C24 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86CBDFAD319F42309899ECDB /* CFNetwork.framework */; };
4142
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
42-
62D9F57A1F413AFD001B21B1 /* libRCTJCoreModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62D9F5651F413AE2001B21B1 /* libRCTJCoreModule.a */; };
4343
63D768E78E014676B3D3BCF0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF4B8B2EACC14094BB3CEC79 /* UIKit.framework */; };
4444
6601F06A24F048D5B81F31CE /* libRCTJPushModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AD7EEA68397B44A5B8C9F892 /* libRCTJPushModule.a */; };
4545
6D8FC734065E49F48624606E /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DDBA399CDB14B9A8524C3C6 /* UserNotifications.framework */; };
@@ -234,9 +234,23 @@
234234
remoteGlobalIDString = 6280980A1CEDC407000D3A81;
235235
remoteInfo = RCTJPushModule;
236236
};
237-
62D9F5641F413AE2001B21B1 /* PBXContainerItemProxy */ = {
237+
6279623A212124B400CFE32D /* PBXContainerItemProxy */ = {
238238
isa = PBXContainerItemProxy;
239-
containerPortal = 62D9F55A1F413AE2001B21B1 /* RCTJCoreModule.xcodeproj */;
239+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
240+
proxyType = 2;
241+
remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
242+
remoteInfo = jsinspector;
243+
};
244+
6279623C212124B400CFE32D /* PBXContainerItemProxy */ = {
245+
isa = PBXContainerItemProxy;
246+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
247+
proxyType = 2;
248+
remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
249+
remoteInfo = "jsinspector-tvOS";
250+
};
251+
62796271212124D500CFE32D /* PBXContainerItemProxy */ = {
252+
isa = PBXContainerItemProxy;
253+
containerPortal = 8358380823CC4D39A0CCA3E3 /* RCTJCoreModule.xcodeproj */;
240254
proxyType = 2;
241255
remoteGlobalIDString = 6212E9B41F3990DC00BDF51A;
242256
remoteInfo = RCTJCoreModule;
@@ -339,11 +353,12 @@
339353
2D02E4901E0B4A5D006451C7 /* PushDemo-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "PushDemo-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
340354
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
341355
623D30881E8BE2B200E12ADF /* PushDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = PushDemo.entitlements; path = PushDemo/PushDemo.entitlements; sourceTree = "<group>"; };
342-
62D9F55A1F413AE2001B21B1 /* RCTJCoreModule.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTJCoreModule.xcodeproj; path = "../../../jshare-react-native/example/node_modules/jcore-react-native/ios/RCTJCoreModule.xcodeproj"; sourceTree = "<group>"; };
343356
63ECFB2ED7004752BBCF8EFB /* CoreGraphics.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
344357
68296063447D496F840FE8CE /* Foundation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
358+
778ED37F5DB1437D836B468F /* libRCTJCoreModule.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTJCoreModule.a; sourceTree = "<group>"; };
345359
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
346360
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
361+
8358380823CC4D39A0CCA3E3 /* RCTJCoreModule.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTJCoreModule.xcodeproj; path = "../node_modules/jcore-react-native/ios/RCTJCoreModule.xcodeproj"; sourceTree = "<group>"; };
347362
86CBDFAD319F42309899ECDB /* CFNetwork.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
348363
89D0AB2008B442929D3F394C /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
349364
8EAF34D6BC9B4C498B955709 /* Security.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
@@ -368,7 +383,6 @@
368383
isa = PBXFrameworksBuildPhase;
369384
buildActionMask = 2147483647;
370385
files = (
371-
62D9F57A1F413AFD001B21B1 /* libRCTJCoreModule.a in Frameworks */,
372386
146834051AC3E58100842450 /* libReact.a in Frameworks */,
373387
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
374388
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
@@ -392,6 +406,7 @@
392406
63D768E78E014676B3D3BCF0 /* UIKit.framework in Frameworks */,
393407
C663F8C22D504402957A3836 /* libresolv.tbd in Frameworks */,
394408
0A792A6DF82A46168B86F479 /* CoreGraphics.framework in Frameworks */,
409+
506C0A0BA2884B1986A0F1CE /* libRCTJCoreModule.a in Frameworks */,
395410
);
396411
runOnlyForDeploymentPostprocessing = 0;
397412
};
@@ -525,6 +540,8 @@
525540
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
526541
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
527542
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
543+
6279623B212124B400CFE32D /* libjsinspector.a */,
544+
6279623D212124B400CFE32D /* libjsinspector-tvOS.a */,
528545
62EDFB4E2019B8C000C0628D /* libthird-party.a */,
529546
62EDFB502019B8C000C0628D /* libthird-party.a */,
530547
62EDFB522019B8C000C0628D /* libdouble-conversion.a */,
@@ -548,6 +565,7 @@
548565
isa = PBXGroup;
549566
children = (
550567
AD7EEA68397B44A5B8C9F892 /* libRCTJPushModule.a */,
568+
778ED37F5DB1437D836B468F /* libRCTJCoreModule.a */,
551569
);
552570
name = "Recovered References";
553571
sourceTree = "<group>";
@@ -560,10 +578,10 @@
560578
name = Products;
561579
sourceTree = "<group>";
562580
};
563-
62D9F55B1F413AE2001B21B1 /* Products */ = {
581+
6279626E212124D500CFE32D /* Products */ = {
564582
isa = PBXGroup;
565583
children = (
566-
62D9F5651F413AE2001B21B1 /* libRCTJCoreModule.a */,
584+
62796272212124D500CFE32D /* libRCTJCoreModule.a */,
567585
);
568586
name = Products;
569587
sourceTree = "<group>";
@@ -592,7 +610,7 @@
592610
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
593611
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
594612
0EBB224694BA4F2BBC00C271 /* RCTJPushModule.xcodeproj */,
595-
62D9F55A1F413AE2001B21B1 /* RCTJCoreModule.xcodeproj */,
613+
8358380823CC4D39A0CCA3E3 /* RCTJCoreModule.xcodeproj */,
596614
);
597615
name = Libraries;
598616
sourceTree = "<group>";
@@ -785,8 +803,8 @@
785803
ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
786804
},
787805
{
788-
ProductGroup = 62D9F55B1F413AE2001B21B1 /* Products */;
789-
ProjectRef = 62D9F55A1F413AE2001B21B1 /* RCTJCoreModule.xcodeproj */;
806+
ProductGroup = 6279626E212124D500CFE32D /* Products */;
807+
ProjectRef = 8358380823CC4D39A0CCA3E3 /* RCTJCoreModule.xcodeproj */;
790808
},
791809
{
792810
ProductGroup = 626F95AB1F2F0071009C6BB5 /* Products */;
@@ -1000,11 +1018,25 @@
10001018
remoteRef = 626F95B41F2F0071009C6BB5 /* PBXContainerItemProxy */;
10011019
sourceTree = BUILT_PRODUCTS_DIR;
10021020
};
1003-
62D9F5651F413AE2001B21B1 /* libRCTJCoreModule.a */ = {
1021+
6279623B212124B400CFE32D /* libjsinspector.a */ = {
1022+
isa = PBXReferenceProxy;
1023+
fileType = archive.ar;
1024+
path = libjsinspector.a;
1025+
remoteRef = 6279623A212124B400CFE32D /* PBXContainerItemProxy */;
1026+
sourceTree = BUILT_PRODUCTS_DIR;
1027+
};
1028+
6279623D212124B400CFE32D /* libjsinspector-tvOS.a */ = {
1029+
isa = PBXReferenceProxy;
1030+
fileType = archive.ar;
1031+
path = "libjsinspector-tvOS.a";
1032+
remoteRef = 6279623C212124B400CFE32D /* PBXContainerItemProxy */;
1033+
sourceTree = BUILT_PRODUCTS_DIR;
1034+
};
1035+
62796272212124D500CFE32D /* libRCTJCoreModule.a */ = {
10041036
isa = PBXReferenceProxy;
10051037
fileType = archive.ar;
10061038
path = libRCTJCoreModule.a;
1007-
remoteRef = 62D9F5641F413AE2001B21B1 /* PBXContainerItemProxy */;
1039+
remoteRef = 62796271212124D500CFE32D /* PBXContainerItemProxy */;
10081040
sourceTree = BUILT_PRODUCTS_DIR;
10091041
};
10101042
62EDFB3C2019B8C000C0628D /* libfishhook.a */ = {
@@ -1218,13 +1250,15 @@
12181250
HEADER_SEARCH_PATHS = (
12191251
"$(inherited)",
12201252
"$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule",
1253+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
12211254
);
12221255
INFOPLIST_FILE = PushDemoTests/Info.plist;
12231256
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12241257
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12251258
LIBRARY_SEARCH_PATHS = (
12261259
"$(inherited)",
12271260
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1261+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
12281262
);
12291263
OTHER_LDFLAGS = (
12301264
"-ObjC",
@@ -1243,13 +1277,15 @@
12431277
HEADER_SEARCH_PATHS = (
12441278
"$(inherited)",
12451279
"$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule",
1280+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
12461281
);
12471282
INFOPLIST_FILE = PushDemoTests/Info.plist;
12481283
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12491284
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12501285
LIBRARY_SEARCH_PATHS = (
12511286
"$(inherited)",
12521287
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1288+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
12531289
);
12541290
OTHER_LDFLAGS = (
12551291
"-ObjC",
@@ -1271,6 +1307,7 @@
12711307
HEADER_SEARCH_PATHS = (
12721308
"$(inherited)",
12731309
"$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/",
1310+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
12741311
);
12751312
INFOPLIST_FILE = PushDemo/Info.plist;
12761313
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1295,6 +1332,7 @@
12951332
HEADER_SEARCH_PATHS = (
12961333
"$(inherited)",
12971334
"$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/",
1335+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
12981336
);
12991337
INFOPLIST_FILE = PushDemo/Info.plist;
13001338
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1324,12 +1362,14 @@
13241362
HEADER_SEARCH_PATHS = (
13251363
"$(inherited)",
13261364
"$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule",
1365+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
13271366
);
13281367
INFOPLIST_FILE = "PushDemo-tvOS/Info.plist";
13291368
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13301369
LIBRARY_SEARCH_PATHS = (
13311370
"$(inherited)",
13321371
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1372+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13331373
);
13341374
OTHER_LDFLAGS = (
13351375
"-ObjC",
@@ -1358,12 +1398,14 @@
13581398
HEADER_SEARCH_PATHS = (
13591399
"$(inherited)",
13601400
"$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule",
1401+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
13611402
);
13621403
INFOPLIST_FILE = "PushDemo-tvOS/Info.plist";
13631404
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13641405
LIBRARY_SEARCH_PATHS = (
13651406
"$(inherited)",
13661407
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1408+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13671409
);
13681410
OTHER_LDFLAGS = (
13691411
"-ObjC",
@@ -1393,6 +1435,7 @@
13931435
LIBRARY_SEARCH_PATHS = (
13941436
"$(inherited)",
13951437
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1438+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13961439
);
13971440
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.PushDemo-tvOSTests";
13981441
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1418,6 +1461,7 @@
14181461
LIBRARY_SEARCH_PATHS = (
14191462
"$(inherited)",
14201463
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1464+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
14211465
);
14221466
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.PushDemo-tvOSTests";
14231467
PRODUCT_NAME = "$(TARGET_NAME)";

‎ios/RCTJPushModule/RCTJPushModule.m‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,13 @@ - (void)didRegistRemoteNotification:(NSString *)token {
785785
NSLog(@"simulator can not get registrationid");
786786
callback(@[@""]);
787787
#elif TARGET_OS_IPHONE//真机
788+
if ([JPUSHService registrationID] != nil && ![[JPUSHService registrationID] isEqualToString:@""]) {
789+
// 如果已经成功获取 registrationID，从本地获取直接缓存
790+
callback(@[[JPUSHService registrationID]]);
791+
return;
792+
}
793+
794+
// 第一次获取时需要 jpush login 状态
788795
if (_isJPushDidLogin) {
789796
callback(@[[JPUSHService registrationID]]);
790797
} else {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jpush-react-native",
3-
"version": "2.2.7",
3+
"version": "2.2.8",
44
"description": "a jpush plugin for react native application",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)