过滤垃圾评论 相关

app/src/main/java/ceui/lisa/helper/CommentFilter.java

@@ -2,6 +2,7 @@
 
 import android.text.TextUtils;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,33 +11,70 @@
 import java.util.stream.Collectors;
 
 import ceui.lisa.activities.Shaft;
+import ceui.lisa.http.NullCtrl;
+import ceui.lisa.http.Retro;
 import ceui.lisa.models.CommentsBean;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.ResponseBody;
 
 public class CommentFilter {
 
-    private static final List<CommentFilterRule> rules = getRules();
+    private static List<CommentFilterRule> rules = new ArrayList<>();
+
+    static {
+        updateRules();
+    }
 
     public static boolean judge(CommentsBean commentsBean) {
         return rules.stream()
                 .anyMatch(rule -> rule.judge(commentsBean.getComment()));
     }
 
-    public static List<CommentFilterRule> getRules() {
-        List<CommentFilterRule> rules = new ArrayList<>();
+    private static void updateRules() {
+        updateRulesFromLocal();
+        updateRulesFromRemote();
+    }
+
+    private static void updateRulesFromLocal() {
         try {
             InputStream inputStream = Shaft.getContext().getAssets().open("comment.filter.rule.txt");
             byte[] buffer = new byte[inputStream.available()];
             inputStream.read(buffer);
             inputStream.close();
             String content = new String(buffer);
-            return Arrays.stream(content.split("\\r?\\n", -1))
+            rules = Arrays.stream(content.split("\\r?\\n", -1))
                     .filter(string -> !TextUtils.isEmpty(string))
                     .map(CommentFilterRule::new)
                     .collect(Collectors.toList());
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return rules;
+    }
+
+    private static void updateRulesFromRemote() {
+
+        Retro.getResourceApi().getCommentFilterRule()
+                .subscribeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new NullCtrl<ResponseBody>() {
+                    @Override
+                    public void success(ResponseBody responseBody) {
+                        try {
+                            String content = responseBody.string();
+                            if (TextUtils.isEmpty(content)) {
+                                return;
+                            }
+
+                            rules = Arrays.stream(content.split("\\r?\\n", -1))
+                                    .filter(string -> !TextUtils.isEmpty(string))
+                                    .map(CommentFilterRule::new)
+                                    .collect(Collectors.toList());
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
     }
 
     private static class CommentFilterRule {

app/src/main/java/ceui/lisa/http/ResourceApi.java

@@ -0,0 +1,14 @@
+package ceui.lisa.http;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+
+public interface ResourceApi {
+    String JSDELIVR_BASE_URL = "https://cdn.jsdelivr.net/";
+//    String JSDELIVR_BASE_URL = "https://raw.githubusercontent.com/";
+
+    @GET("gh/CeuiLiSA/Pixiv-Shaft/app/src/main/assets/comment.filter.rule.txt")
+//    @GET("CeuiLiSA/Pixiv-Shaft/master/app/src/main/assets/comment.filter.rule.txt")
+    Observable<ResponseBody> getCommentFilterRule();
+}

app/src/main/java/ceui/lisa/http/Retro.java

@@ -5,7 +5,6 @@
 import com.blankj.utilcode.util.DeviceUtils;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.safframework.http.interceptor.LoggingInterceptor;
 
 import java.security.cert.X509Certificate;
 import java.util.Collections;
@@ -23,6 +22,7 @@
 
 import static ceui.lisa.http.AccountApi.ACCOUNT_BASE_URL;
 import static ceui.lisa.http.AppApi.API_BASE_URL;
+import static ceui.lisa.http.ResourceApi.JSDELIVR_BASE_URL;
 import static ceui.lisa.http.SignApi.SIGN_API;
 
 public class Retro {
@@ -39,6 +39,10 @@ public static AccountApi getAccountApi() {
         return buildRetrofit(ACCOUNT_BASE_URL).create(AccountApi.class);
     }
 
+    public static ResourceApi getResourceApi(){
+        return buildPlainRetrofit(JSDELIVR_BASE_URL).create(ResourceApi.class);
+    }
+
     private static Request.Builder addHeader(Request.Builder before) {
         PixivHeaders pixivHeaders = new PixivHeaders();
         String osVersion = DeviceUtils.getSDKVersionName();
@@ -73,6 +77,16 @@ private static Retrofit buildRetrofit(String baseUrl) {
                 .build();
     }
 
+    private static Retrofit buildPlainRetrofit(String baseUrl){
+        OkHttpClient.Builder builder = getLogClient();
+        OkHttpClient client = builder.build();
+        return new Retrofit.Builder()
+                .client(client)
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .baseUrl(baseUrl)
+                .build();
+    }
+
     public static <T> T create(String baseUrl, final Class<T> service) {
         Gson gson = new GsonBuilder().setLenient().create();
         Retrofit retrofit = new Retrofit.Builder()

app/src/main/java/ceui/lisa/utils/Settings.java

@@ -150,7 +150,7 @@ public void setCurrentProgress(long currentProgress) {
 
     private int downloadWay = 0; //0传统模式，保存到Pictures目录下。    1 SAF模式保存到自选目录下
 
-    private boolean filterComment = true;
+    private boolean filterComment = false; // 过滤垃圾评论，默认不开启
 
     public String getAppLanguage() {
         if(!TextUtils.isEmpty(appLanguage)){