Skip to content

Commit c49f2b8

Browse files
wanghenghengwanghengheng
committed
去吧，皮卡丘~~
1 parent 1b81418 commit c49f2b8

File tree

7 files changed

+87
-67
lines changed

7 files changed

+87
-67
lines changed

‎Coding_iOS/Util/OC_Category/NSString+Common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
- (CGFloat)getWidthWithFont:(UIFont *)font constrainedToSize:(CGSize)size;
3333
-(BOOL)containsEmoji;
3434

35-
- (NSString *)emotionMonkeyName;
35+
- (NSString *)emotionSpecailName;
3636

3737
+ (NSString *)sizeDisplayWithByte:(CGFloat)sizeOfByte;
3838

‎Coding_iOS/Util/OC_Category/NSString+Common.m

Lines changed: 59 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -219,69 +219,72 @@ -(BOOL)containsEmoji{
219219
return returnValue;
220220
}
221221
#pragma mark emotion_monkey
222-
+ (NSDictionary *)emotion_monkey_dict {
223-
static NSDictionary *_emotion_monkey_dict;
222+
+ (NSDictionary *)emotion_specail_dict {
223+
static NSDictionary *_emotion_specail_dict;
224224
static dispatch_once_t onceToken;
225225
dispatch_once(&onceToken, ^{
226-
_emotion_monkey_dict = @{
226+
_emotion_specail_dict = @{
227227
//猴子大表情
228-
@"coding_emoji_01": @"哈哈",
229-
@"coding_emoji_02": @"吐",
230-
@"coding_emoji_03": @"压力山大",
231-
@"coding_emoji_04": @"忧伤",
232-
@"coding_emoji_05": @"坏人",
233-
@"coding_emoji_06": @"酷",
234-
@"coding_emoji_07": @"哼",
235-
@"coding_emoji_08": @"你咬我啊",
236-
@"coding_emoji_09": @"内急",
237-
@"coding_emoji_10": @"32个赞",
238-
@"coding_emoji_11": @"加油",
239-
@"coding_emoji_12": @"闭嘴",
240-
@"coding_emoji_13": @"wow",
241-
@"coding_emoji_14": @"泪流成河",
242-
@"coding_emoji_15": @"NO!",
243-
@"coding_emoji_16": @"疑问",
244-
@"coding_emoji_17": @"耶",
245-
@"coding_emoji_18": @"生日快乐",
246-
@"coding_emoji_19": @"求包养",
247-
@"coding_emoji_20": @"吹泡泡",
248-
@"coding_emoji_21": @"睡觉",
249-
@"coding_emoji_22": @"惊讶",
250-
@"coding_emoji_23": @"Hi",
251-
@"coding_emoji_24": @"打发点咯",
252-
@"coding_emoji_25": @"呵呵",
253-
@"coding_emoji_26": @"喷血",
254-
@"coding_emoji_27": @"Bug",
255-
@"coding_emoji_28": @"听音乐",
256-
@"coding_emoji_29": @"垒码",
257-
@"coding_emoji_30": @"我打你哦",
258-
@"coding_emoji_31": @"顶足球",
259-
@"coding_emoji_32": @"放毒气",
260-
@"coding_emoji_33": @"表白",
261-
@"coding_emoji_34": @"抓瓢虫",
262-
@"coding_emoji_35": @"下班",
263-
@"coding_emoji_36": @"冒泡",
264-
@"coding_emoji_38": @"2015",
265-
@"coding_emoji_39": @"拜年",
266-
@"coding_emoji_40": @"发红包",
267-
@"coding_emoji_41": @"放鞭炮",
268-
@"coding_emoji_42": @"求红包",
269-
@"coding_emoji_43": @"新年快乐",
228+
@"coding_emoji_01": @" :哈哈: ",
229+
@"coding_emoji_02": @" :吐: ",
230+
@"coding_emoji_03": @" :压力山大: ",
231+
@"coding_emoji_04": @" :忧伤: ",
232+
@"coding_emoji_05": @" :坏人: ",
233+
@"coding_emoji_06": @" :酷: ",
234+
@"coding_emoji_07": @" :哼: ",
235+
@"coding_emoji_08": @" :你咬我啊: ",
236+
@"coding_emoji_09": @" :内急: ",
237+
@"coding_emoji_10": @" :32个赞: ",
238+
@"coding_emoji_11": @" :加油: ",
239+
@"coding_emoji_12": @" :闭嘴: ",
240+
@"coding_emoji_13": @" :wow: ",
241+
@"coding_emoji_14": @" :泪流成河: ",
242+
@"coding_emoji_15": @" :NO!: ",
243+
@"coding_emoji_16": @" :疑问: ",
244+
@"coding_emoji_17": @" :耶: ",
245+
@"coding_emoji_18": @" :生日快乐: ",
246+
@"coding_emoji_19": @" :求包养: ",
247+
@"coding_emoji_20": @" :吹泡泡: ",
248+
@"coding_emoji_21": @" :睡觉: ",
249+
@"coding_emoji_22": @" :惊讶: ",
250+
@"coding_emoji_23": @" :Hi: ",
251+
@"coding_emoji_24": @" :打发点咯: ",
252+
@"coding_emoji_25": @" :呵呵: ",
253+
@"coding_emoji_26": @" :喷血: ",
254+
@"coding_emoji_27": @" :Bug: ",
255+
@"coding_emoji_28": @" :听音乐: ",
256+
@"coding_emoji_29": @" :垒码: ",
257+
@"coding_emoji_30": @" :我打你哦: ",
258+
@"coding_emoji_31": @" :顶足球: ",
259+
@"coding_emoji_32": @" :放毒气: ",
260+
@"coding_emoji_33": @" :表白: ",
261+
@"coding_emoji_34": @" :抓瓢虫: ",
262+
@"coding_emoji_35": @" :下班: ",
263+
@"coding_emoji_36": @" :冒泡: ",
264+
@"coding_emoji_38": @" :2015: ",
265+
@"coding_emoji_39": @" :拜年: ",
266+
@"coding_emoji_40": @" :发红包: ",
267+
@"coding_emoji_41": @" :放鞭炮: ",
268+
@"coding_emoji_42": @" :求红包: ",
269+
@"coding_emoji_43": @" :新年快乐: ",
270270
//猴子大表情 Gif
271-
@"coding_emoji_gif_01": @"奔月",
272-
@"coding_emoji_gif_02": @"吃月饼",
273-
@"coding_emoji_gif_03": @"捞月",
274-
@"coding_emoji_gif_04": @"打招呼",
275-
@"coding_emoji_gif_05": @"悠闲",
276-
@"coding_emoji_gif_06": @"赏月",
277-
@"coding_emoji_gif_07": @"中秋快乐",
278-
@"coding_emoji_gif_08": @"爬爬",
271+
@"coding_emoji_gif_01": @" :奔月: ",
272+
@"coding_emoji_gif_02": @" :吃月饼: ",
273+
@"coding_emoji_gif_03": @" :捞月: ",
274+
@"coding_emoji_gif_04": @" :打招呼: ",
275+
@"coding_emoji_gif_05": @" :悠闲: ",
276+
@"coding_emoji_gif_06": @" :赏月: ",
277+
@"coding_emoji_gif_07": @" :中秋快乐: ",
278+
@"coding_emoji_gif_08": @" :爬爬: ",
279+
//特殊 emoji 字符
280+
//...
281+
279282
};
280283
});
281-
return _emotion_monkey_dict;
284+
return _emotion_specail_dict;
282285
}
283-
- (NSString *)emotionMonkeyName{
284-
return [NSString emotion_monkey_dict][self];
286+
- (NSString *)emotionSpecailName{
287+
return [NSString emotion_specail_dict][self];
285288
}
286289

287290
+ (NSString *)sizeDisplayWithByte:(CGFloat)sizeOfByte{

‎Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ typedef NS_ENUM(NSInteger, AGEmojiKeyboardViewCategoryImage) {
1414
AGEmojiKeyboardViewCategoryImageEmoji,
1515
AGEmojiKeyboardViewCategoryImageMonkey,
1616
AGEmojiKeyboardViewCategoryImageMonkey_Gif,
17+
AGEmojiKeyboardViewCategoryImageEmoji_Code,
1718
};
1819

1920
@protocol AGEmojiKeyboardViewDelegate;

‎Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ - (NSDictionary *)emojis {
4141

4242
- (NSString *)categoryNameAtIndex:(NSUInteger)index {
4343
// NSArray *categoryList = @[segmentRecentName, @"People", @"Objects", @"Nature", @"Places", @"Symbols"];
44-
NSArray *categoryList = @[@"emoji", @"big_monkey", @"big_monkey_gif"];
45-
return categoryList[index];
44+
NSArray *categoryList = @[@"emoji", @"big_monkey", @"big_monkey_gif", @"emoji_code"];
45+
return index < categoryList.count? categoryList[index]: categoryList.lastObject;
4646
}
4747

4848
- (AGEmojiKeyboardViewCategoryImage)defaultSelectedCategory {
@@ -64,8 +64,8 @@ - (NSArray *)imagesForSelectedSegments {
6464
static dispatch_once_t onceToken;
6565
dispatch_once(&onceToken, ^{
6666
array = [NSMutableArray array];
67-
for (AGEmojiKeyboardViewCategoryImage i = AGEmojiKeyboardViewCategoryImageEmoji;
68-
i <= AGEmojiKeyboardViewCategoryImageMonkey_Gif;
67+
for (int i = 0;
68+
i < self.emojis.allKeys.count;
6969
++i) {
7070
[array addObject:[self.dataSource emojiKeyboardView:self imageForSelectedCategory:i]];
7171
}
@@ -78,8 +78,8 @@ - (NSArray *)imagesForNonSelectedSegments {
7878
static dispatch_once_t onceToken;
7979
dispatch_once(&onceToken, ^{
8080
array = [NSMutableArray array];
81-
for (AGEmojiKeyboardViewCategoryImage i = AGEmojiKeyboardViewCategoryImageEmoji;
82-
i <= AGEmojiKeyboardViewCategoryImageMonkey_Gif;
81+
for (int i = 0;
82+
i < self.emojis.allKeys.count;
8383
++i) {
8484
[array addObject:[self.dataSource emojiKeyboardView:self imageForNonSelectedCategory:i]];
8585
}

‎Coding_iOS/Vendor/AGEmojiKeyboard/emotion_list.plist

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,23 @@
141141
<string>coding_emoji_gif_05</string>
142142
<string>coding_emoji_gif_08</string>
143143
</array>
144+
<key>emoji_code</key>
145+
<array>
146+
<string>🎂</string>
147+
<string>🕙</string>
148+
<string>🍺</string>
149+
<string>🔍</string>
150+
<string>📱</string>
151+
<string>🏠</string>
152+
<string>🚗</string>
153+
<string>🎁</string>
154+
<string>⚽</string>
155+
<string>🆘</string>
156+
<string>💤</string>
157+
<string>🎤</string>
158+
<string>☔</string>
159+
<string>📖</string>
160+
<string>🙏</string>
161+
</array>
144162
</dict>
145163
</plist>

‎Coding_iOS/Views/Cell/TweetSendTextCell.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,8 @@ - (void)keyboardChange:(NSNotification*)aNotification{
240240
- (void)emojiKeyBoardView:(AGEmojiKeyboardView *)emojiKeyBoardView didUseEmoji:(NSString *)emoji {
241241
NSRange selectedRange = self.tweetContentView.selectedRange;
242242

243-
NSString *emotion_monkey = [emoji emotionMonkeyName];
243+
NSString *emotion_monkey = [emoji emotionSpecailName];
244244
if (emotion_monkey) {
245-
emotion_monkey = [NSString stringWithFormat:@" :%@: ", emotion_monkey];
246245
self.tweetContentView.text = [self.tweetContentView.text stringByReplacingCharactersInRange:selectedRange withString:emotion_monkey];
247246
self.tweetContentView.selectedRange = NSMakeRange(selectedRange.location +emotion_monkey.length, 0);
248247
[self textViewDidChange:self.tweetContentView];

‎Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,9 +998,8 @@ - (void)keyboardChange:(NSNotification*)aNotification{
998998

999999
- (void)emojiKeyBoardView:(AGEmojiKeyboardView *)emojiKeyBoardView didUseEmoji:(NSString *)emoji {
10001000

1001-
NSString *emotion_monkey = [emoji emotionMonkeyName];
1001+
NSString *emotion_monkey = [emoji emotionSpecailName];
10021002
if (emotion_monkey) {
1003-
emotion_monkey = [NSString stringWithFormat:@" :%@: ", emotion_monkey];
10041003
if (_delegate && [_delegate respondsToSelector:@selector(messageInputView:sendBigEmotion:)]) {
10051004
[self.delegate messageInputView:self sendBigEmotion:emotion_monkey];
10061005
}

0 commit comments

Comments
 (0)