Skip to content

Commit dd46fc9

Browse files
zoyi-jinzoyi-jin
committed
resolve review
1 parent fe6c0e2 commit dd46fc9

File tree

4 files changed

+142
-191
lines changed

4 files changed

+142
-191
lines changed

‎ios/RCTConvert+ChannelIO.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ static NSString * const BOOT_STATUS_REQUIRE_PAYMENT = @"REQUIRE_PAYMENT";
3535
static NSString * const BOOT_STATUS_ACCESS_DENIED = @"ACCESS_DENIED";
3636
static NSString * const BOOT_STATUS_UNKNOWN_ERROR = @"UNKNOWN_ERROR";
3737

38+
// ChannelBUttonOption
39+
static NSString * const KEY_CHANNEL_BUTTON_OPTION_POSITION_RIGHT = @"right";
40+
static NSString * const KEY_CHANNEL_BUTTON_OPTION_POSITION_LEFT = @"left";
41+
3842
// ChannelButtonOption
3943
static NSString * const CHANNEL_BUTTON_OPTION_POSITION = @"position";
4044
static NSString * const CHANNEL_BUTTON_OPTION_POSITION_RIGHT = @"right";

‎ios/RCTConvert+ChannelIO.m‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,56 +50,55 @@ @implementation RCTConvert (ChannelIOEnums)
5050
@implementation RCTConvert (ChannelIO)
5151

5252
+ (BootConfig *)bootConfig:(id)json {
53-
BootConfig *settings = [[BootConfig alloc] init];
54-
settings.pluginKey = [RCTConvert NSString:json[KEY_PLUGIN_KEY]];
55-
settings.memberHash = [RCTConvert NSString:json[KEY_MEMBER_HASH]];
56-
settings.hidePopup = json[KEY_HIDE_POPUP] == nil
57-
? [RCTConvert BOOL:json[KEY_HIDE_DEFAULT_IN_APP_PUSH]] : [RCTConvert BOOL:json[KEY_HIDE_POPUP]];
58-
settings.trackDefaultEvent = json[KEY_TRACK_DEFAULT_EVENT] == nil
59-
? [RCTConvert BOOL:json[KEY_ENABLED_TRACK_DEFAULT_EVENT]]
60-
: [RCTConvert BOOL:json[KEY_TRACK_DEFAULT_EVENT]];
53+
BootConfig *config = [[BootConfig alloc] init];
54+
config.pluginKey = [RCTConvert NSString:json[KEY_PLUGIN_KEY]];
55+
config.memberHash = [RCTConvert NSString:json[KEY_MEMBER_HASH]];
56+
config.hidePopup = json[KEY_HIDE_POPUP] != nil
57+
? [RCTConvert BOOL:json[KEY_HIDE_POPUP]] : [RCTConvert BOOL:json[KEY_HIDE_DEFAULT_IN_APP_PUSH]];
58+
config.trackDefaultEvent = json[KEY_TRACK_DEFAULT_EVENT] != nil
59+
? [RCTConvert BOOL:json[KEY_TRACK_DEFAULT_EVENT]] : [RCTConvert BOOL:json[KEY_ENABLED_TRACK_DEFAULT_EVENT]];
6160

6261
if (json[KEY_LAUNCHER_CONFIG] == nil && json[KEY_CHANNEL_BUTTON_OPTION] != nil) {
63-
settings.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_CHANNEL_BUTTON_OPTION]];
62+
config.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_CHANNEL_BUTTON_OPTION]];
6463
} else if (json[KEY_LAUNCHER_CONFIG] != nil && json[KEY_CHANNEL_BUTTON_OPTION] == nil) {
65-
settings.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_LAUNCHER_CONFIG]];
64+
config.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_LAUNCHER_CONFIG]];
6665
}
6766

68-
if (json[KEY_MEMBER_ID] == nil && json[KEY_USER_ID] != nil) {
69-
settings.memberId = [RCTConvert NSString:json[KEY_USER_ID]];
70-
} else {
71-
settings.memberId = [RCTConvert NSString:json[KEY_MEMBER_ID]];
67+
if (json[KEY_MEMBER_ID] != nil && json[KEY_USER_ID] == nil) {
68+
config.memberId = [RCTConvert NSString:json[KEY_MEMBER_ID]];
69+
} else if (json[KEY_MEMBER_ID] == nil && json[KEY_USER_ID] != nil) {
70+
config.memberId = [RCTConvert NSString:json[KEY_USER_ID]];
7271
}
7372

7473
NSString *language = [RCTConvert NSString:json[KEY_LANGUAGE]];
7574
NSString *locale = [RCTConvert NSString:json[KEY_LOCALE]];
7675
if (json[KEY_LOCALE] != nil) {
7776
if ([locale isEqualToString:LANGUAGE_OPTION_KO]) {
78-
settings.language = LanguageOptionKorean;
77+
config.language = LanguageOptionKorean;
7978
} else if ([locale isEqualToString:LANGUAGE_OPTION_JA]) {
80-
settings.language = LanguageOptionJapanese;
79+
config.language = LanguageOptionJapanese;
8180
} else if ([locale isEqualToString:LANGUAGE_OPTION_EN]) {
82-
settings.language = LanguageOptionEnglish;
81+
config.language = LanguageOptionEnglish;
8382
} else {
84-
settings.language = LanguageOptionDevice;
83+
config.language = LanguageOptionDevice;
8584
}
8685
} else {
8786
if ([language isEqualToString:LANGUAGE_OPTION_KO]) {
88-
settings.language = LanguageOptionKorean;
87+
config.language = LanguageOptionKorean;
8988
} else if ([language isEqualToString:LANGUAGE_OPTION_JA]) {
90-
settings.language = LanguageOptionJapanese;
89+
config.language = LanguageOptionJapanese;
9190
} else if ([language isEqualToString:LANGUAGE_OPTION_EN]) {
92-
settings.language = LanguageOptionEnglish;
91+
config.language = LanguageOptionEnglish;
9392
} else {
94-
settings.language = LanguageOptionDevice;
93+
config.language = LanguageOptionDevice;
9594
}
9695
}
9796

9897
if (json[KEY_PROFILE] != nil) {
99-
settings.profile = [RCTConvert profile:json[KEY_PROFILE]];
98+
config.profile = [RCTConvert profile:json[KEY_PROFILE]];
10099
}
101100

102-
return settings;
101+
return config;
103102
}
104103

105104
+ (Profile *)profile:(NSDictionary *)json {
@@ -120,18 +119,17 @@ + (ChannelButtonOption *)channelButtonOption:(id)json {
120119
return nil;
121120
}
122121

123-
ChannelButtonOption *config = [[ChannelButtonOption alloc] init];
122+
ChannelButtonOption *option = [[ChannelButtonOption alloc] init];
124123

125-
config.xMargin = [RCTConvert float:json[CHANNEL_BUTTON_OPTION_X_MARGIN]];
126-
config.yMargin = [RCTConvert float:json[CHANNEL_BUTTON_OPTION_Y_MARGIN]];
124+
option.xMargin = [RCTConvert float:json[CHANNEL_BUTTON_OPTION_X_MARGIN]];
125+
option.yMargin = [RCTConvert float:json[CHANNEL_BUTTON_OPTION_Y_MARGIN]];
127126
NSString *position = [RCTConvert NSString:json[CHANNEL_BUTTON_OPTION_POSITION]];
128127
if ([position isEqualToString:CHANNEL_BUTTON_OPTION_POSITION_LEFT]) {
129-
config.position = ChannelButtonPositionLeft;
128+
option.position = ChannelButtonPositionLeft;
130129
} else {
131-
config.position = ChannelButtonPositionRight;
130+
option.position = ChannelButtonPositionRight;
132131
}
133-
return config;
132+
return option;
134133
}
135134

136135
@end
137-

‎ios/RNChannelIO.h‎

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
1818
@end
1919

2020
// event key
21-
static NSString * const KEY_EVENT = @"Event";
21+
static NSString * const EVENT = @"Event";
22+
2223
static NSString * const KEY_EVENT_ON_BADGE_CHANGED = @"ON_BADGE_CHANGED";
2324
static NSString * const KEY_EVENT_ON_PROFILE_CHANGED = @"ON_PROFILE_CHANGED";
2425
static NSString * const KEY_EVENT_ON_POPUP_DATA_RECEIVED = @"ON_POPUP_DATA_RECEIVED";
@@ -27,9 +28,7 @@ static NSString * const KEY_EVENT_ON_HIDE_MESSENGER = @"ON_HIDE_MESSENGER";
2728
static NSString * const KEY_EVENT_ON_CHAT_CREATED = @"ON_CHAT_CREATED";
2829
static NSString * const KEY_EVENT_ON_PRE_URL_CLICKED = @"ON_PRE_URL_CLICKED";
2930
static NSString * const KEY_EVENT_ON_URL_CLICKED = @"ON_URL_CLICKED";
30-
static NSString * const KEY_EVENT_ON_PUSH_NOTIFICATION_CLICKED = @"ON_PUSH_NOTIFICATION_CLICKED";
3131

32-
// event
3332
static NSString * const EVENT_ON_BADGE_CHANGED = @"ChannelIO:Event:OnBadgeChanged";
3433
static NSString * const EVENT_ON_PROFILE_CHANGED = @"ChannelIO:Event:OnProfileChanged";
3534
static NSString * const EVENT_ON_POPUP_DATA_RECEIVED = @"ChannelIO:Event:OnPopupDataReceive";
@@ -38,16 +37,10 @@ static NSString * const EVENT_ON_HIDE_MESSENGER = @"ChannelIO:Event:OnHideMessen
3837
static NSString * const EVENT_ON_CHAT_CREATED = @"ChannelIO:Event:OnChatCreated";
3938
static NSString * const EVENT_ON_PRE_URL_CLICKED = @"ChannelIO:Event:OnPreUrlClicked";
4039
static NSString * const EVENT_ON_URL_CLICKED = @"ChannelIO:Event:OnUrlClicked";
41-
static NSString * const EVENT_ON_PUSH_NOTIFICATION_CLICKED = @"ChannelIO:Event:OnPushNotificationClicked";
4240

43-
// language key
44-
static NSString * const KEY_LANGUAGE_KOREAN = @"korean";
45-
static NSString * const KEY_LANGUAGE_ENGLISH = @"english";
46-
static NSString * const KEY_LANGUAGE_JAPANESE = @"japanese";
47-
static NSString * const KEY_LANGUAGE_DEVICE = @"device";
41+
// BootStatus
42+
static NSString * const BOOT_STATUS = @"BootStatus";
4843

49-
// BootStatus key
50-
static NSString * const KEY_BOOT_STATUS = @"BootStatus";
5144
static NSString * const KEY_BOOT_STATUS_SUCCESS = @"success";
5245
static NSString * const KEY_BOOT_STATUS_NOT_INITIALIZED = @"notInitialized";
5346
static NSString * const KEY_BOOT_STATUS_NETWORK_TIMEOUT = @"networkTimeout";
@@ -57,10 +50,19 @@ static NSString * const KEY_BOOT_STATUS_REQUIRE_PAYMENT = @"requirePayment";
5750
static NSString * const KEY_BOOT_STATUS_ACCESS_DENIED = @"accessDenied";
5851
static NSString * const KEY_BOOT_STATUS_UNKNOWN_ERROR = @"unknownError";
5952

53+
// language
54+
static NSString * const LANGUAGE = @"language";
55+
56+
static NSString * const KEY_LANGUAGE_KOREAN = @"korean";
57+
static NSString * const KEY_LANGUAGE_ENGLISH = @"english";
58+
static NSString * const KEY_LANGUAGE_JAPANESE = @"japanese";
59+
static NSString * const KEY_LANGUAGE_DEVICE = @"device";
60+
6061
// error
6162
static NSString * const ERROR_UNKNOWN = @"UNKNOWN_ERROR";
6263

63-
static NSString * const KEY_CHANNEL_BUTTON_POSITION = @"ChannelButtonPosition";
64+
// ChannelButtonPosition
65+
static NSString * const CHANNEL_BUTTON_POSITION = @"ChannelButtonPosition";
6466

6567
static NSString * const KEY_STATUS = @"status";
6668
static NSString * const KEY_CHAT_ID = @"chatId";
@@ -76,24 +78,7 @@ static NSString * const KEY_TAGS = @"tags";
7678

7779
// deprecated
7880

79-
// event key
80-
static NSString * const KEY_EVENT_ON_CHANGE_BADGE = @"ON_BADGE_CHANGED";
81-
static NSString * const KEY_EVENT_ON_RECEIVE_PUSH = @"ON_PROFILE_CHANGED";
82-
static NSString * const KEY_EVENT_WILL_SHOW_MESSENGER = @"ON_POPUP_DATA_RECEIVED";
83-
static NSString * const KEY_EVENT_WILL_HIDE_MESSENGER = @"ON_SHOW_MESSENGER";
84-
static NSString * const KEY_EVENT_ON_CLICK_CHAT_LINK = @"ON_HIDE_MESSENGER";
85-
static NSString * const KEY_EVENT_ON_CHANGE_PROFILE = @"ON_CHANGE_PROFILE";
86-
87-
// event
88-
static NSString * const EVENT_ON_CHANGE_BADGE = @"ChannelIO:Event:OnChangeBadge";
89-
static NSString * const EVENT_ON_RECEIVE_PUSH = @"ChannelIO:Event:OnReceivePush";
90-
static NSString * const EVENT_WILL_SHOW_MESSENGER = @"ChannelIO:Event:WillShowMessenger";
91-
static NSString * const EVENT_WILL_HIDE_MESSENGER = @"ChannelIO:Event:WillHideMessenger";
92-
static NSString * const EVENT_ON_CLICK_CHAT_LINK = @"ChannelIO:Event:OnClickChatLink";
93-
static NSString * const EVENT_ON_CHANGE_PROFILE = @"ChannelIO:Event:OnChangeProfile";
94-
95-
static NSString * const KEY_CHANNEL_PLUGIN_COMPLETION_STATUS = @"ChannelPluginCompletionStatus";
96-
static NSString * const KEY_LAUNCHER_POSITION = @"LauncherPosition";
81+
static NSString * const CHANNEL_PLUGIN_COMPLETION_STATUS = @"ChannelPluginCompletionStatus";
82+
static NSString * const LAUNCHER_POSITION = @"LauncherPosition";
9783

9884
NS_ASSUME_NONNULL_END
99-

0 commit comments

Comments
 (0)