修复评论中包含部分颜文字可能卡死的问题

CeuiLiSA · Aug 13, 2020 · ea05f70 · ea05f70
1 parent 585fa20
commit ea05f70
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentComment.java b/app/src/main/java/ceui/lisa/fragments/FragmentComment.java
@@ -2,10 +2,8 @@
 
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Rect;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.MotionEvent;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.appcompat.app.AlertDialog;

diff --git a/app/src/main/java/ceui/lisa/utils/Emoji.java b/app/src/main/java/ceui/lisa/utils/Emoji.java
@@ -58,16 +58,18 @@ public class Emoji {
      * @return boolean
      */
     public static boolean hasEmoji(String origin) {
+        Common.showLog("hasEmoji hasEmoji");
         if (TextUtils.isEmpty(origin)) {
             return false;
         }
-        return origin.contains("(") &&
-                origin.contains(")") &&
-                Character.isLowerCase(
-                        origin.charAt(
-                                origin.indexOf("(") + 1 // （右边的必须是小写字母。
-                        )
-                );
+        boolean hasEmoji = false;
+        for (String name : NAMES) {
+            if (origin.contains(name)) {
+                hasEmoji = true;
+                break;
+            }
+        }
+        return hasEmoji;
     }
 
     /**
@@ -78,17 +80,16 @@ public static boolean hasEmoji(String origin) {
     public static String transform(String origin) {
         String before = origin;
         while (hasEmoji(before)) {
-            int startIndex = before.indexOf("(");
-            int endIndex = before.indexOf(")");
-            if (startIndex >= 0 && endIndex >= startIndex) {
-                //截取这个表情
-                String emoji = before.substring(startIndex, endIndex + 1);
-
-                //将表情替换为对应的<img>
-                if (!TextUtils.isEmpty(emoji)) {
-                    before = replace(before, emoji);
+            String temp = "";
+            for (String name : NAMES) {
+                if (origin.contains(name)) {
+                    temp = name;
+                    break;
                 }
             }
+            if (!TextUtils.isEmpty(temp)) {
+                before = replace(before, temp);
+            }
         }
         return before;
     }