Skip to content

Commit 16ec267

Browse files
committed
怎么还没定好呢。。
1 parent 32f8371 commit 16ec267

File tree

4 files changed

+19
-33
lines changed

4 files changed

+19
-33
lines changed

Coding_iOS/Util/OC_Category/NSString+Common.m

+11-2
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,17 @@ + (NSDictionary *)emotion_specail_dict {
277277
@"coding_emoji_gif_07": @" :中秋快乐: ",
278278
@"coding_emoji_gif_08": @" :爬爬: ",
279279
//特殊 emoji 字符
280-
//...
281-
280+
@"0️⃣": @"0",
281+
@"1️⃣": @"1",
282+
@"2️⃣": @"2",
283+
@"3️⃣": @"3",
284+
@"4️⃣": @"4",
285+
@"5️⃣": @"5",
286+
@"6️⃣": @"6",
287+
@"7️⃣": @"7",
288+
@"8️⃣": @"8",
289+
@"9️⃣": @"9",
290+
@"↩️": @"回车",
282291
};
283292
});
284293
return _emotion_specail_dict;

Coding_iOS/Vendor/AGEmojiKeyboard/emotion_list.plist

-15
Original file line numberDiff line numberDiff line change
@@ -143,21 +143,6 @@
143143
</array>
144144
<key>emoji_code</key>
145145
<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>
161146
</array>
162147
</dict>
163148
</plist>

Coding_iOS/Views/Cell/TweetSendTextCell.m

+4-8
Original file line numberDiff line numberDiff line change
@@ -261,14 +261,10 @@ - (void)emojiKeyBoardViewDidPressSendButton:(AGEmojiKeyboardView *)emojiKeyBoard
261261
}
262262

263263
- (UIImage *)emojiKeyboardView:(AGEmojiKeyboardView *)emojiKeyboardView imageForSelectedCategory:(AGEmojiKeyboardViewCategoryImage)category {
264-
UIImage *img;
265-
if (category == AGEmojiKeyboardViewCategoryImageEmoji) {
266-
img = [UIImage imageNamed:@"keyboard_emotion_emoji"];
267-
}else if (category == AGEmojiKeyboardViewCategoryImageMonkey){
268-
img = [UIImage imageNamed:@"keyboard_emotion_monkey"];
269-
}else{
270-
img = [UIImage imageNamed:@"keyboard_emotion_monkey_gif"];
271-
}
264+
UIImage *img = [UIImage imageNamed:(category == AGEmojiKeyboardViewCategoryImageEmoji? @"keyboard_emotion_emoji":
265+
category == AGEmojiKeyboardViewCategoryImageMonkey? @"keyboard_emotion_monkey":
266+
category == AGEmojiKeyboardViewCategoryImageMonkey_Gif? @"keyboard_emotion_monkey_gif":
267+
@"keyboard_emotion_emoji_code")] ?: [UIImage new];
272268
return img;
273269
}
274270

Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m

+4-8
Original file line numberDiff line numberDiff line change
@@ -1017,14 +1017,10 @@ - (void)emojiKeyBoardViewDidPressSendButton:(AGEmojiKeyboardView *)emojiKeyBoard
10171017
}
10181018

10191019
- (UIImage *)emojiKeyboardView:(AGEmojiKeyboardView *)emojiKeyboardView imageForSelectedCategory:(AGEmojiKeyboardViewCategoryImage)category {
1020-
UIImage *img;
1021-
if (category == AGEmojiKeyboardViewCategoryImageEmoji) {
1022-
img = [UIImage imageNamed:@"keyboard_emotion_emoji"];
1023-
}else if (category == AGEmojiKeyboardViewCategoryImageMonkey){
1024-
img = [UIImage imageNamed:@"keyboard_emotion_monkey"];
1025-
}else{
1026-
img = [UIImage imageNamed:@"keyboard_emotion_monkey_gif"];
1027-
}
1020+
UIImage *img = [UIImage imageNamed:(category == AGEmojiKeyboardViewCategoryImageEmoji? @"keyboard_emotion_emoji":
1021+
category == AGEmojiKeyboardViewCategoryImageMonkey? @"keyboard_emotion_monkey":
1022+
category == AGEmojiKeyboardViewCategoryImageMonkey_Gif? @"keyboard_emotion_monkey_gif":
1023+
@"keyboard_emotion_emoji_code")] ?: [UIImage new];
10281024
return img;
10291025
}
10301026

0 commit comments

Comments
 (0)