Skip to content

Commit e6fbbe3

Browse files
KenChoiKenChoi
KenChoi
authored and
KenChoi
committed
merge conflict
2 parents cb4898d + bceb4fb commit e6fbbe3

File tree

4 files changed

+149
-114
lines changed

4 files changed

+149
-114
lines changed

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3636
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
3737
95B2BF2485864532802CD38F /* libRNSVG.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E53DEE966F3C4EF59620DD03 /* libRNSVG.a */; };
38+
C35CED31F46948F2971796B6 /* libRCTJCoreModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED02A3F004274BBB8685B0A3 /* libRCTJCoreModule.a */; };
3839
/* End PBXBuildFile section */
3940

4041
/* Begin PBXContainerItemProxy section */
@@ -248,6 +249,13 @@
248249
remoteGlobalIDString = 6212EB151F3C34BB00BDF51A;
249250
remoteInfo = RCTJMessageModule;
250251
};
252+
62D683FA1F4486300083CDF6 /* PBXContainerItemProxy */ = {
253+
isa = PBXContainerItemProxy;
254+
containerPortal = 7F0F814AF6184BD6AF643105 /* RCTJCoreModule.xcodeproj */;
255+
proxyType = 2;
256+
remoteGlobalIDString = 6212E9B41F3990DC00BDF51A;
257+
remoteInfo = RCTJCoreModule;
258+
};
251259
78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
252260
isa = PBXContainerItemProxy;
253261
containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@@ -288,9 +296,11 @@
288296
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
289297
6BF8C24637104E46893AB7C2 /* RNSVG.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSVG.xcodeproj; path = "../node_modules/react-native-svg/ios/RNSVG.xcodeproj"; sourceTree = "<group>"; };
290298
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
299+
7F0F814AF6184BD6AF643105 /* 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>"; };
291300
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
292301
B68903A680EE48DAA80CB4A8 /* libRCTJMessageModule.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTJMessageModule.a; sourceTree = "<group>"; };
293302
E53DEE966F3C4EF59620DD03 /* libRNSVG.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSVG.a; sourceTree = "<group>"; };
303+
ED02A3F004274BBB8685B0A3 /* libRCTJCoreModule.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTJCoreModule.a; sourceTree = "<group>"; };
294304
/* End PBXFileReference section */
295305

296306
/* Begin PBXFrameworksBuildPhase section */
@@ -311,6 +321,7 @@
311321
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
312322
95B2BF2485864532802CD38F /* libRNSVG.a in Frameworks */,
313323
0282F6A6B8844CFEB5FAEAD3 /* libRCTJMessageModule.a in Frameworks */,
324+
C35CED31F46948F2971796B6 /* libRCTJCoreModule.a in Frameworks */,
314325
);
315326
runOnlyForDeploymentPostprocessing = 0;
316327
};
@@ -468,6 +479,14 @@
468479
name = Products;
469480
sourceTree = "<group>";
470481
};
482+
62D683F11F4486300083CDF6 /* Products */ = {
483+
isa = PBXGroup;
484+
children = (
485+
62D683FB1F4486300083CDF6 /* libRCTJCoreModule.a */,
486+
);
487+
name = Products;
488+
sourceTree = "<group>";
489+
};
471490
78C398B11ACF4ADC00677621 /* Products */ = {
472491
isa = PBXGroup;
473492
children = (
@@ -493,6 +512,7 @@
493512
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
494513
6BF8C24637104E46893AB7C2 /* RNSVG.xcodeproj */,
495514
53E405AEFA73434487A5D4CD /* RCTJMessageModule.xcodeproj */,
515+
7F0F814AF6184BD6AF643105 /* RCTJCoreModule.xcodeproj */,
496516
);
497517
name = Libraries;
498518
sourceTree = "<group>";
@@ -612,6 +632,10 @@
612632
ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */;
613633
ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
614634
},
635+
{
636+
ProductGroup = 62D683F11F4486300083CDF6 /* Products */;
637+
ProjectRef = 7F0F814AF6184BD6AF643105 /* RCTJCoreModule.xcodeproj */;
638+
},
615639
{
616640
ProductGroup = 62D683AB1F43F1A40083CDF6 /* Products */;
617641
ProjectRef = 53E405AEFA73434487A5D4CD /* RCTJMessageModule.xcodeproj */;
@@ -868,6 +892,13 @@
868892
remoteRef = 62D683B41F43F1A40083CDF6 /* PBXContainerItemProxy */;
869893
sourceTree = BUILT_PRODUCTS_DIR;
870894
};
895+
62D683FB1F4486300083CDF6 /* libRCTJCoreModule.a */ = {
896+
isa = PBXReferenceProxy;
897+
fileType = archive.ar;
898+
path = libRCTJCoreModule.a;
899+
remoteRef = 62D683FA1F4486300083CDF6 /* PBXContainerItemProxy */;
900+
sourceTree = BUILT_PRODUCTS_DIR;
901+
};
871902
78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
872903
isa = PBXReferenceProxy;
873904
fileType = archive.ar;
@@ -980,13 +1011,15 @@
9801011
"$(inherited)",
9811012
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
9821013
"$(SRCROOT)/../node_modules/jmessage-react-plugin/ios/RCTJMessageModule/**",
1014+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
9831015
);
9841016
INFOPLIST_FILE = JMessageDemo/Info.plist;
9851017
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
9861018
LIBRARY_SEARCH_PATHS = (
9871019
"$(inherited)",
9881020
"\"$(SRCROOT)/JMessageDemo\"",
9891021
"\"$(SRCROOT)/JMessageDemo\"",
1022+
"\"$(SRCROOT)/JMessageDemo\"",
9901023
);
9911024
OTHER_LDFLAGS = (
9921025
"$(inherited)",
@@ -1008,13 +1041,15 @@
10081041
"$(inherited)",
10091042
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
10101043
"$(SRCROOT)/../node_modules/jmessage-react-plugin/ios/RCTJMessageModule/**",
1044+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
10111045
);
10121046
INFOPLIST_FILE = JMessageDemo/Info.plist;
10131047
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10141048
LIBRARY_SEARCH_PATHS = (
10151049
"$(inherited)",
10161050
"\"$(SRCROOT)/JMessageDemo\"",
10171051
"\"$(SRCROOT)/JMessageDemo\"",
1052+
"\"$(SRCROOT)/JMessageDemo\"",
10181053
);
10191054
OTHER_LDFLAGS = (
10201055
"$(inherited)",
@@ -1042,6 +1077,7 @@
10421077
"$(inherited)",
10431078
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
10441079
"$(SRCROOT)/../node_modules/jmessage-react-plugin/ios/RCTJMessageModule/**",
1080+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
10451081
);
10461082
INFOPLIST_FILE = "JMessageDemo-tvOS/Info.plist";
10471083
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1073,6 +1109,7 @@
10731109
"$(inherited)",
10741110
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
10751111
"$(SRCROOT)/../node_modules/jmessage-react-plugin/ios/RCTJMessageModule/**",
1112+
"$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule",
10761113
);
10771114
INFOPLIST_FILE = "JMessageDemo-tvOS/Info.plist";
10781115
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

‎index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ export default class JMessage {
687687
}
688688
/**
689689
* 添加点击通知栏消息通知事件监听。
690-
* Note: Android only, (如果想要 iOS 端 实现相同的功能，需要同时集成 jpush-phonegap-plugin)
690+
* Note: Android only, (如果想要 iOS 端 实现相同的功能，需要同时集成 jpush-react-native)
691691
* @param {function} listener = function (message) {} // 以参数形式返回消息对象。
692692
*/
693693
static addClickMessageNotificationListener(listener) {

‎ios/RCTJMessageModule/RCTJMessageModule.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@
1616
#import "React/RCTBridgeModule.h"
1717
#endif
1818

19+
20+
#define receiveMsgEvent @"JMessage.ReceiveMsgEvent" // 接收到消息事件
21+
#define loginStateChangedEvent @"JMessage.LoginStateChanged" //
22+
#define clickMessageNotificationEvent @"JMessage.ClickMessageNotification" // 点击推送 Android Only
23+
#define syncOfflineMessageEvent @"JMessage.SyncOfflineMessage" // 同步离线消息事件
24+
#define syncRoamingMessageEvent @"JMessage.SyncRoamingMessage" // 同步漫游消息事件
25+
#define messageRetractEvent @"JMessage.MessageRetract" // 消息撤回事件
26+
#define contactNotifyEvent @"JMessage.ContactNotify" // 收到好友请求消息事件
27+
1928
@interface RCTJMessageModule : NSObject<RCTBridgeModule>
2029

2130
@end

0 commit comments

Comments
 (0)