DESKTOP-JJ6HLMB 1 год назад
Родитель
Сommit
7a0ac629e0

+ 44 - 41
TMessagesProj/src/main/java/org/telegram/cricdit/view/ExpandTextView.java

@@ -274,14 +274,14 @@ public class ExpandTextView extends androidx.appcompat.widget.AppCompatTextView
             ClickableSpan clickableSpan = new ClickableSpan() {
                 @Override
                 public void onClick(View widget) {
-                    if (finalWorkingText.contains("https://g.cricdit.com/")) {
-                        int index = finalWorkingText.indexOf("https://g.cricdit.com/");
+                    if (finalWorkingText.contains("https://t.me/")) {
+                        int index = finalWorkingText.indexOf("https://t.me/");
                         int end = finalWorkingText.indexOf(" ", index);
                         String gName;
                         if (end != -1) {
-                            gName = finalWorkingText.substring(index + "https://g.cricdit.com/".length(), end);
+                            gName = finalWorkingText.substring(index + "https://t.me/".length(), end);
                         } else {
-                            gName = finalWorkingText.substring(index + "https://g.cricdit.com/".length());
+                            gName = finalWorkingText.substring(index + "https://t.me/".length());
                         }
                         new CommentPresenter().groupLinkInfo(gName, new BaseObserver<GroupInfoBean>() {
                             @Override
@@ -298,37 +298,28 @@ public class ExpandTextView extends androidx.appcompat.widget.AppCompatTextView
                                 super.onError(e);
                             }
                         });
-                    } else if (finalWorkingText.contains("https://u.cricdit.com/")) {
-                        int index = finalWorkingText.indexOf("https://u.cricdit.com/");
-                        int end = finalWorkingText.indexOf(" ", index);
-                        String userId;
-                        if (end != -1) {
-                            userId = finalWorkingText.substring(index + "https://g.cricdit.com/".length(), end);
-                        } else {
-                            userId = finalWorkingText.substring(index + "https://g.cricdit.com/".length());
-                        }
-//                        ARouter.getInstance().build(ARouterPath.PATH_CHAT_CHAT_ACTIVITY).withString(Constant.K_ID, userId)
-//                                .navigation();
-                        //跳转到个人聊天界面
-//                        Bundle args = new Bundle();
-//                        args.putLong("user_id", Long.parseLong(userId));
-//                        baseFragment.presentFragment(new ProfileActivity(args));
                     }
+//                    else if (finalWorkingText.contains("https://t.me/")) {
+//                        int index = finalWorkingText.indexOf("https://t.me/");
+//                        int end = finalWorkingText.indexOf(" ", index);
+//                        String userId;
+//                        if (end != -1) {
+//                            userId = finalWorkingText.substring(index + "https://t.me/".length(), end);
+//                        } else {
+//                            userId = finalWorkingText.substring(index + "https://t.me/".length());
+//                        }
+////                        ARouter.getInstance().build(ARouterPath.PATH_CHAT_CHAT_ACTIVITY).withString(Constant.K_ID, userId)
+////                                .navigation();
+//                        //跳转到个人聊天界面
+////                        Bundle args = new Bundle();
+////                        args.putLong("user_id", Long.parseLong(userId));
+////                        baseFragment.presentFragment(new ProfileActivity(args));
+//                    }
                 }
             };
 
-            if (workingText.contains("https://g.cricdit.com/")) {
-                int index = workingText.indexOf("https://g.cricdit.com/");
-                int end = workingText.indexOf(" ", index);
-                if (end != -1)
-                    style.setSpan(clickableSpan,
-                            index, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                else {
-                    style.setSpan(clickableSpan,
-                            index, workingText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                }
-            } else if (workingText.contains("https://u.cricdit.com/")) {
-                int index = workingText.indexOf("https://u.cricdit.com/");
+            if (workingText.contains("https://t.me/")) {
+                int index = workingText.indexOf("https://t.me/");
                 int end = workingText.indexOf(" ", index);
                 if (end != -1)
                     style.setSpan(clickableSpan,
@@ -338,20 +329,23 @@ public class ExpandTextView extends androidx.appcompat.widget.AppCompatTextView
                             index, workingText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                 }
             }
+//            else if (workingText.contains("https://u.cricdit.com/")) {
+//                int index = workingText.indexOf("https://u.cricdit.com/");
+//                int end = workingText.indexOf(" ", index);
+//                if (end != -1)
+//                    style.setSpan(clickableSpan,
+//                            index, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+//                else {
+//                    style.setSpan(clickableSpan,
+//                            index, workingText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+//                }
+//            }
             setText(style);
 
             //设置部分文字颜色
             ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.parseColor("#0000FF"));
-            if (workingText.contains("https://g.cricdit.com/")) {
-                int index = workingText.indexOf("https://g.cricdit.com/");
-                int end = workingText.indexOf(" ", index);
-                if (end != -1)
-                    style.setSpan(foregroundColorSpan, index, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                else {
-                    style.setSpan(foregroundColorSpan, index, workingText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                }
-            } else if (workingText.contains("https://u.cricdit.com/")) {
-                int index = workingText.indexOf("https://u.cricdit.com/");
+            if (workingText.contains("https://t.me/")) {
+                int index = workingText.indexOf("https://t.me/");
                 int end = workingText.indexOf(" ", index);
                 if (end != -1)
                     style.setSpan(foregroundColorSpan, index, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -359,6 +353,15 @@ public class ExpandTextView extends androidx.appcompat.widget.AppCompatTextView
                     style.setSpan(foregroundColorSpan, index, workingText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                 }
             }
+//            else if (workingText.contains("https://u.cricdit.com/")) {
+//                int index = workingText.indexOf("https://u.cricdit.com/");
+//                int end = workingText.indexOf(" ", index);
+//                if (end != -1)
+//                    style.setSpan(foregroundColorSpan, index, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+//                else {
+//                    style.setSpan(foregroundColorSpan, index, workingText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+//                }
+//            }
             //配置给TextView
             setMovementMethod(LinkMovementMethod.getInstance());
             setText(style);