Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[WEEX-666][Android]Some Emoji emotion not Show On Android 9.0 #1804

Merged
merged 1 commit into from
Nov 26, 2018
Merged

[WEEX-666][Android]Some Emoji emotion not Show On Android 9.0 #1804

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions weex_core/Source/wson/wson_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,8 @@ namespace wson {
for(int i=0; i<length;){
u_int16_t c1 = utf16[i++];
if(isHighSurrogate(c1)){
i++;
if(i < length){
u_int16_t c2 = utf16[i];
u_int16_t c2 = utf16[i++];
if (isLowSurrogate(c2)) {
u_int32_t codePoint = toCodePoint(c1, c2);
count += utf16_char_convert_to_utf8_cstr(codePoint, src + count);
Expand All @@ -167,9 +166,8 @@ namespace wson {
for(int i=0; i<length;){
u_int16_t c1 = utf16[i++];
if(isHighSurrogate(c1)){
i++;
if(i < length){
u_int16_t c2 = utf16[i];
u_int16_t c2 = utf16[i++];
if (isLowSurrogate(c2)) {
u_int32_t codePoint = toCodePoint(c1, c2);
count += utf16_char_convert_to_utf8_cstr(codePoint, src + count);
Expand Down