Skip to content

Commit 1113966

Browse files
zoyi-jinzoyi-jin
authored
Merge pull request #45 from zoyi/develop
0.5.0
2 parents b01ddfa + f4d9d64 commit 1113966

14 files changed

+1242
-522
lines changed

Diff for: ‎RNChannelIO.podspec

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ Pod::Spec.new do |s|
55
s.description = "channel plugin for react native"
66
s.homepage = "https://channel.io"
77
s.license = { :type => "SDK", :file => "LICENSE" }
8-
s.author = "ZOYI"
8+
s.author = { 'Channel Corp.' => '[email protected]', 'Jam' => '[email protected]', 'Jin' => '[email protected]' }
99
s.platform = :ios, "10.0"
10-
s.source = { :git => "https://github.com/zoyi/react-native-channel-io.git", :tag => "master" }
11-
s.source_files = "ios/**/*.{h,m}"
10+
s.source = { :git => "https://github.com/zoyi/react-native-channel-io.git" }
11+
s.source_files = "ios/**/*.{h,m}"
1212
s.requires_arc = true
1313
s.swift_version = '5.0'
1414

1515
s.ios.deployment_target = '10.0'
1616

1717
s.dependency "React"
18-
s.dependency "ChannelIO"
18+
s.dependency "ChannelIOSDK"
1919
end
20-
21-

Diff for: ‎android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ repositories {
5555

5656
dependencies {
5757
implementation 'com.facebook.react:react-native:+'
58-
api 'com.zoyi.channel:plugin-android:7.0.+'
58+
api 'com.zoyi.channel:plugin-android:8.0.0'
5959
}

Diff for: ‎android/src/main/java/com/zoyi/channel/rn/Const.java

+44-63
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.zoyi.channel.react.android;
1+
package com.zoyi.channel.rn;
22

33
/**
44
* Created by jerry on 2018. 10. 12..
@@ -8,92 +8,73 @@ public class Const {
88

99
public static final String MODULE_NAME = "RNChannelIO";
1010

11-
// Boot
1211
public static final String KEY_PLUGIN_KEY = "pluginKey";
1312
public static final String KEY_MEMBER_ID = "memberId";
14-
public static final String KEY_USER_ID = "userId";
15-
public static final String KEY_LOCALE = "locale";
13+
public static final String KEY_MEMBER_HASH = "memberHash";
14+
public static final String KEY_PROFILE = "profile";
1615
public static final String KEY_LANGUAGE = "language";
17-
public static final String KEY_DEBUG_MODE = "debugMode";
18-
public static final String KEY_ENABLED_TRACK_DEFAULT_EVENT = "enabledTrackDefaultEvent";
19-
public static final String KEY_HIDE_DEFAULT_IN_APP_PUSH = "hideDefaultInAppPush";
20-
public static final String KEY_LAUNCHER_CONFIG = "launcherConfig";
21-
public static final String KEY_STATUS = "status";
22-
23-
// Guest
16+
public static final String KEY_UNSUBSCRIBED = "unsubscribed";
17+
public static final String KEY_TRACK_DEFAULT_EVENT = "trackDefaultEvent";
18+
public static final String KEY_HIDE_POPUP = "hidePopup";
19+
public static final String KEY_CHANNEL_BUTTON_OPTION = "channelButtonOption";
20+
public static final String KEY_TAGS = "tags";
21+
public static final String KEY_PROFILE_ONCE = "profileOnce";
2422
public static final String KEY_ID = "id";
2523
public static final String KEY_ALERT = "alert";
26-
public static final String KEY_PROFILE = "profile";
27-
public static final String KEY_GUEST = "guest";
28-
29-
// Profile
3024
public static final String KEY_NAME = "name";
3125
public static final String KEY_EMAIL = "email";
3226
public static final String KEY_MOBILE_NUMBER = "mobileNumber";
3327
public static final String KEY_AVATAR_URL = "avatarUrl";
34-
public static final String KEY_PROPERTY = "property";
35-
36-
// Push event
3728
public static final String KEY_CHAT_ID = "chatId";
38-
public static final String KEY_SENDER_AVATAR_URL = "senderAvatarUrl";
39-
public static final String KEY_SENDER_NAME = "senderName";
4029
public static final String KEY_MESSAGE = "message";
4130

42-
// Launcher config
43-
public static final String LAUNCHER_POSITION = "LauncherPosition";
31+
// Legacy
32+
public static final String KEY_USER_ID = "userId";
33+
public static final String KEY_LOCALE = "locale";
34+
public static final String KEY_ENABLED_TRACK_DEFAULT_EVENT = "enabledTrackDefaultEvent";
35+
public static final String KEY_HIDE_DEFAULT_IN_APP_PUSH = "hideDefaultInAppPush";
36+
public static final String KEY_LAUNCHER_CONFIG = "launcherConfig";
4437

38+
// Launcher config
4539
public static final String KEY_POSITION = "position";
4640
public static final String KEY_LAUNCHER_POSITION_RIGHT = "right";
4741
public static final String KEY_LAUNCHER_POSITION_LEFT = "left";
4842
public static final String KEY_X_MARGIN = "xMargin";
4943
public static final String KEY_Y_MARGIN = "yMargin";
5044

51-
public static final String LAUNCHER_RIGHT = "LauncherPositionRight";
52-
public static final String LAUNCHER_LEFT = "LauncherPositionLeft";
53-
54-
// Boot Status
55-
public static final String BOOT_STATUS = "BootStatus";
45+
// Result
46+
public static final String RESULT_KEY_STATUS = "status";
47+
public static final String RESULT_KEY_ERROR = "error";
48+
public static final String RESULT_KEY_USER = "user";
5649

57-
public static final String KEY_BOOT_SUCCESS = "success";
58-
public static final String KEY_BOOT_UNKNOWN = "unknown";
59-
public static final String KEY_BOOT_ACCESS_DENIED = "accessDenied";
60-
public static final String KEY_BOOT_TIMEOUT = "timeout";
61-
public static final String KEY_BOOT_REQUIRE_PAYMENT = "requirePayment";
62-
public static final String KEY_BOOT_NOT_INITIALIZED = "notInitialized";
63-
64-
public static final String BOOT_SUCCESS = "ChannelPluginCompletionStatusSuccess";
65-
public static final String BOOT_UNKNOWN = "ChannelPluginCompletionStatusUnknown";
66-
public static final String BOOT_ACCESS_DENIED = "ChannelPluginCompletionStatusAccessDenied";
67-
public static final String BOOT_TIMEOUT = "ChannelPluginCompletionStatusNetworkTimeout";
68-
public static final String BOOT_REQUIRE_PAYMENT = "ChannelPluginCompletionStatusRequirePayment";
69-
public static final String BOOT_NOT_INITIALIZED = "ChannelPluginCompletionStatusNotInitialized";
50+
// Error
51+
public static final String ERROR_UNKNOWN = "UNKNOWN_ERROR";
7052

7153
// Event
54+
public static final String KEY_EVENT = "Event";
55+
56+
public static final String KEY_EVENT_CHAT_ID = "chatId";
7257
public static final String KEY_EVENT_COUNT = "count";
73-
public static final String KEY_EVENT_LINK = "link";
74-
public static final String KEY_EVENT_PUSH = "push";
58+
public static final String KEY_EVENT_URL = "url";
59+
public static final String KEY_EVENT_POPUP = "popup";
7560
public static final String KEY_PROFILE_KEY = "key";
7661
public static final String KEY_PROFILE_VALUE = "value";
7762

78-
public static final String KEY_ON_CHANGE_BADGE = "ON_CHANGE_BADGE";
79-
public static final String KEY_ON_RECEIVE_PUSH = "ON_RECEIVE_PUSH";
80-
public static final String KEY_WILL_SHOW_MESSENGER = "WILL_SHOW_MESSENGER";
81-
public static final String KEY_WILL_HIDE_MESSENGER = "WILL_HIDE_MESSENGER";
82-
public static final String KEY_ON_CLICK_CHAT_LINK = "ON_CLICK_CHAT_LINK";
83-
public static final String KEY_ON_CLICK_REDIRECT_LINK = "ON_CLICK_REDIRECT_LINK";
84-
public static final String KEY_ON_CHANGE_PROFILE = "ON_CHANGE_PROFILE";
85-
86-
public static final String EVENT_WILL_SHOW_MESSENGER = "ChannelIO:Event:WillShowMessenger";
87-
public static final String EVENT_WILL_HIDE_MESSENGER = "ChannelIO:Event:WillHideMessenger";
88-
public static final String EVENT_ON_CHANGE_BADGE = "ChannelIO:Event:OnChangeBadge";
89-
public static final String EVENT_ON_RECEIVE_PUSH = "ChannelIO:Event:OnReceivePush";
90-
public static final String EVENT_ON_CLICK_CHAT_LINK = "ChannelIO:Event:OnClickChatLink";
91-
public static final String EVENT_ON_CLICK_REDIRECT_LINK = "ChannelIO:Event:OnClickRedirectLink";
92-
public static final String EVENT_ON_CHANGE_PROFILE = "ChannelIO:Event:onChangeProfile";
93-
94-
95-
public static final String Event = "Event";
96-
public static final String Locale = "Locale";
97-
public static final String BootStatus = "BootStatus";
98-
public static final String LauncherPosition = "LauncherPosition";
63+
public static final String KEY_ON_BADGE_CHANGED = "ON_BADGE_CHANGED";
64+
public static final String KEY_ON_PROFILE_CHANGED = "ON_PROFILE_CHANGED";
65+
public static final String KEY_ON_POPUP_DATA_RECEIVED = "ON_POPUP_DATA_RECEIVED";
66+
public static final String KEY_ON_SHOW_MESSENGER = "ON_SHOW_MESSENGER";
67+
public static final String KEY_ON_HIDE_MESSENGER = "ON_HIDE_MESSENGER";
68+
public static final String KEY_ON_CHAT_CREATED = "ON_CHAT_CREATED";
69+
public static final String KEY_ON_URL_CLICKED = "ON_URL_CLICKED";
70+
public static final String KEY_ON_PRE_URL_CLICKED = "ON_PRE_URL_CLICKED";
71+
72+
public static final String EVENT_ON_BADGE_CHANGED = "ChannelIO:Event:OnBadgeChanged";
73+
public static final String EVENT_ON_PROFILE_CHANGED = "ChannelIO:Event:OnProfileChanged";
74+
public static final String EVENT_ON_POPUP_DATA_RECEIVED = "ChannelIO:Event:OnPopupDataReceive";
75+
public static final String EVENT_ON_SHOW_MESSENGER = "ChannelIO:Event:OnShowMessenger";
76+
public static final String EVENT_ON_HIDE_MESSENGER = "ChannelIO:Event:OnHideMessenger";
77+
public static final String EVENT_ON_CHAT_CREATED = "ChannelIO:Event:OnChatCreated";
78+
public static final String EVENT_ON_URL_CLICKED = "ChannelIO:Event:OnUrlClicked";
79+
public static final String EVENT_ON_PRE_URL_CLICKED = "ChannelIO:Event:OnPreUrlClicked";
9980
}

0 commit comments

Comments
 (0)