优化

app/src/androidTest/java/xyz/fycz/myreader/ExampleInstrumentedTest.java

@@ -15,16 +15,13 @@ import org.junit.runner.RunWith;
 
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.common.URLCONST;
-import xyz.fycz.myreader.model.source.MatcherAnalyzer;
 import xyz.fycz.myreader.util.utils.GsonUtils;
-import xyz.fycz.myreader.util.utils.OkHttpUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 
 import static org.junit.Assert.assertEquals;
 

app/src/main/java/xyz/fycz/myreader/ActivityManage.java

@@ -1,14 +1,8 @@
 package xyz.fycz.myreader;
 
-import android.app.Activity;
 import androidx.appcompat.app.AppCompatActivity;
-
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
-/**
- * Created by zhao on 2016/4/16.
- */
 public class ActivityManage {
 
     private static ArrayList<AppCompatActivity> activities = new ArrayList<>();

app/src/main/java/xyz/fycz/myreader/application/App.java

@@ -53,7 +53,7 @@ import xyz.fycz.myreader.ui.activity.MainActivity;
 import xyz.fycz.myreader.ui.dialog.APPDownloadTip;
 import xyz.fycz.myreader.ui.dialog.DialogCreator;
 import xyz.fycz.myreader.ui.fragment.BookcaseFragment;
-import xyz.fycz.myreader.util.SSLSocketClient;
+import xyz.fycz.myreader.util.help.SSLSocketClient;
 import xyz.fycz.myreader.util.SharedPreUtils;
 import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.util.ToastUtils;
@@ -427,7 +427,7 @@ public class App extends Application {
                 .setCancelable(!isForceUpdate)
                 .setDownloadUrl(url)
                 .setContentHtml(true)
-                .setDebug(true)
+                .setDebug(App.isDebug())
                 .build();
 
         updateDialog.showUpdateDialog(activity);

app/src/main/java/xyz/fycz/myreader/common/URLCONST.java

@@ -2,10 +2,6 @@ package xyz.fycz.myreader.common;
 
 public class URLCONST {
 
-    // 命名空间
-    public static String nameSpace_FY = "https://novel.fycz.xyz";
-
-    public static boolean isRSA = false;
 
     public static String APP_DIR_UR = "https://www.lanzous.com/b00ngso7e";
 

app/src/main/java/xyz/fycz/myreader/entity/bookstore/BookType.java

@@ -1,10 +1,5 @@
 package xyz.fycz.myreader.entity.bookstore;
 
-/**
- * @author zhao
- * @description: 书城小说分类
- * @date :2020/4/13 11:46
- */
 public class BookType {
 
     private String typeName;//分类名称

app/src/main/java/xyz/fycz/myreader/enums/Font.java

@@ -4,10 +4,10 @@ public enum Font {
 
     默认字体( "默认字体"),
     本地字体( "默认字体"),
-    方正楷体( "https://fycz.lanzous.com/ilLFMe6kefe"),
-    方正行楷( "https://fycz.lanzous.com/imFvne6keji"),
-    经典宋体("https://fycz.lanzous.com/idhI5e6keqf"),
-    方正硬笔行书("https://fycz.lanzous.com/ilVh6ep9xja"),
+    方正楷体( "https://fycz.lanzousi.com/ilLFMe6kefe"),
+    方正行楷( "https://fycz.lanzousi.com/imFvne6keji"),
+    经典宋体("https://fycz.lanzousi.com/idhI5e6keqf"),
+    方正硬笔行书("https://fycz.lanzousi.com/ilVh6ep9xja"),
     包图小白体("https://fycz.lanzoui.com/i5qgAicrirc"),
     仓耳非白W02("https://fycz.lanzoui.com/iHwRnicriuf"),
     仓耳舒圆体W02("https://fycz.lanzoui.com/i3GVPicrj3e"),
@@ -24,8 +24,8 @@ public enum Font {
     演示悠然小楷("https://fycz.lanzoui.com/ikKq7icrmrg"),
     杨任东竹石体("https://fycz.lanzoui.com/iiWdVicrnbg"),
     站酷仓耳渔阳体("https://fycz.lanzoui.com/if5weicrnje"),
-    迷你隶书( "https://fycz.lanzous.com/ihaXVe6kekj"),
-    方正黄草("https://fycz.lanzous.com/iQg67e6keed");
+    迷你隶书( "https://fycz.lanzousi.com/ihaXVe6kekj"),
+    方正黄草("https://fycz.lanzousi.com/iQg67e6keed");
 
     public String downloadPath;
 

app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeRule.java

@@ -1,33 +1,8 @@
 package xyz.fycz.myreader.model.analyzeRule;
 
-import android.annotation.SuppressLint;
-
 import androidx.annotation.Keep;
 
-import com.google.gson.Gson;
-
-import org.jsoup.nodes.Entities;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.script.SimpleBindings;
-
-import xyz.fycz.myreader.util.StringHelper;
-import xyz.fycz.myreader.util.utils.JsExtensions;
-import xyz.fycz.myreader.util.utils.NetworkUtils;
-import xyz.fycz.myreader.util.utils.StringUtils;
-
-import static android.text.TextUtils.isEmpty;
-import static xyz.fycz.myreader.common.APPCONST.EXP_PATTERN;
-import static xyz.fycz.myreader.common.APPCONST.JS_PATTERN;
-import static xyz.fycz.myreader.common.APPCONST.MAP_STRING;
-import static xyz.fycz.myreader.common.APPCONST.SCRIPT_ENGINE;
-import static xyz.fycz.myreader.util.utils.NetworkUtils.headerPattern;
+import xyz.fycz.myreader.util.help.JsExtensions;
 
 
 /**

app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeUrl.java

@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
 import javax.script.SimpleBindings;
 
 import xyz.fycz.myreader.util.StringHelper;
-import xyz.fycz.myreader.util.utils.JsExtensions;
+import xyz.fycz.myreader.util.help.JsExtensions;
 import xyz.fycz.myreader.util.utils.NetworkUtils;
 import xyz.fycz.myreader.util.utils.StringUtils;
 import xyz.fycz.myreader.util.utils.UrlEncoderUtils;

app/src/main/java/xyz/fycz/myreader/model/backup/UserService.java

@@ -4,7 +4,7 @@ import io.reactivex.annotations.NonNull;
 import xyz.fycz.myreader.application.App;
 import xyz.fycz.myreader.model.storage.Backup;
 import xyz.fycz.myreader.model.storage.Restore;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.util.*;

app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java

@@ -37,8 +37,6 @@ import java.util.List;
 
 import cn.bingoogolapple.qrcode.zxing.QRCodeEncoder;
 import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.ObservableSource;
 import io.reactivex.Single;
 import io.reactivex.SingleOnSubscribe;
@@ -80,7 +78,6 @@ import xyz.fycz.myreader.util.utils.NetworkUtils;
 import xyz.fycz.myreader.util.utils.RxUtils;
 import xyz.fycz.myreader.util.utils.StringUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
 import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
 import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler;
 import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler;

app/src/main/java/xyz/fycz/myreader/ui/activity/BookstoreActivity.java

@@ -34,7 +34,7 @@ import xyz.fycz.myreader.ui.dialog.SourceExchangeDialog;
 import xyz.fycz.myreader.util.SharedPreUtils;
 import xyz.fycz.myreader.util.ToastUtils;
 import xyz.fycz.myreader.webapi.BookStoreApi;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.webapi.crawler.base.FindCrawler;
 import xyz.fycz.myreader.webapi.crawler.find.QiDianMobileRank;
 

app/src/main/java/xyz/fycz/myreader/ui/activity/LoginActivity.java

@@ -2,7 +2,6 @@ package xyz.fycz.myreader.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
@@ -31,7 +30,7 @@ import xyz.fycz.myreader.util.ToastUtils;
 import xyz.fycz.myreader.util.utils.NetworkUtils;
 import xyz.fycz.myreader.util.utils.ProgressUtils;
 import xyz.fycz.myreader.util.utils.StringUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 
 /**
  * @author fengyue

app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java

@@ -47,11 +47,6 @@ import java.util.List;
 import java.util.Locale;
 
 import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.functions.Function;
 import xyz.fycz.myreader.ActivityManage;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.application.App;
@@ -101,7 +96,7 @@ import xyz.fycz.myreader.util.utils.ScreenUtils;
 import xyz.fycz.myreader.util.utils.StringUtils;
 import xyz.fycz.myreader.util.utils.SystemBarUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
 import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler;
 import xyz.fycz.myreader.widget.BubblePopupView;

app/src/main/java/xyz/fycz/myreader/ui/activity/RegisterActivity.java

@@ -1,7 +1,6 @@
 package xyz.fycz.myreader.ui.activity;
 
 import android.annotation.SuppressLint;
-import android.app.ProgressDialog;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Message;
@@ -24,7 +23,7 @@ import xyz.fycz.myreader.util.CodeUtil;
 import xyz.fycz.myreader.util.ToastUtils;
 import xyz.fycz.myreader.util.utils.ProgressUtils;
 import xyz.fycz.myreader.util.utils.StringUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 
 /**
  * @author fengyue

app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java

@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.application.App;
 import xyz.fycz.myreader.application.SysManager;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.entity.Setting;

app/src/main/java/xyz/fycz/myreader/ui/dialog/APPDownloadTip.java

@@ -10,7 +10,7 @@ import android.view.View;
 import androidx.appcompat.app.AppCompatActivity;
 
 import xyz.fycz.myreader.application.App;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.ui.activity.MainActivity;
 import xyz.fycz.myreader.ui.fragment.BookcaseFragment;

app/src/main/java/xyz/fycz/myreader/ui/dialog/UpdateDialog.java

@@ -41,7 +41,7 @@ import xyz.fycz.myreader.application.App;
 import xyz.fycz.myreader.databinding.FragmentUpdateBinding;
 import xyz.fycz.myreader.util.ToastUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 
 
 public class UpdateDialog extends Fragment {

app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java

@@ -14,11 +14,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
-import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 import io.reactivex.Single;
 import io.reactivex.SingleOnSubscribe;
@@ -33,9 +31,7 @@ import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.databinding.FragmentMineBinding;
 import xyz.fycz.myreader.entity.Setting;
 import xyz.fycz.myreader.greendao.entity.Book;
-import xyz.fycz.myreader.greendao.entity.rule.BookSource;
 import xyz.fycz.myreader.greendao.service.BookService;
-import xyz.fycz.myreader.model.source.BookSourceManager;
 import xyz.fycz.myreader.model.backup.UserService;
 import xyz.fycz.myreader.model.storage.Backup;
 import xyz.fycz.myreader.model.storage.BackupRestoreUi;
@@ -46,15 +42,13 @@ import xyz.fycz.myreader.ui.activity.AdSettingActivity;
 import xyz.fycz.myreader.ui.activity.BookSourceActivity;
 import xyz.fycz.myreader.ui.activity.DonateActivity;
 import xyz.fycz.myreader.ui.activity.FeedbackActivity;
-import xyz.fycz.myreader.ui.activity.LoginActivity;
 import xyz.fycz.myreader.ui.activity.MoreSettingActivity;
-import xyz.fycz.myreader.ui.activity.SourceEditActivity;
 import xyz.fycz.myreader.ui.dialog.DialogCreator;
 import xyz.fycz.myreader.ui.dialog.MyAlertDialog;
 import xyz.fycz.myreader.util.SharedPreUtils;
 import xyz.fycz.myreader.util.ToastUtils;
 import xyz.fycz.myreader.util.utils.NetworkUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 
 import static android.app.Activity.RESULT_OK;
 

app/src/main/java/xyz/fycz/myreader/ui/presenter/BookcasePresenter.java

@@ -36,7 +36,7 @@ import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.base.observer.MyObserver;
 import xyz.fycz.myreader.ui.dialog.BookGroupDialog;
 import xyz.fycz.myreader.util.utils.RxUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.ui.dialog.MyAlertDialog;
 import xyz.fycz.myreader.greendao.entity.BookGroup;

app/src/main/java/xyz/fycz/myreader/ui/presenter/CatalogPresenter.java

@@ -11,7 +11,6 @@ import xyz.fycz.myreader.application.App;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.base.observer.MyObserver;
 import xyz.fycz.myreader.util.utils.RxUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.ui.activity.CatalogActivity;
 import xyz.fycz.myreader.util.ToastUtils;

app/src/main/java/xyz/fycz/myreader/util/help/JsExtensions.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.util.utils;
+package xyz.fycz.myreader.util.help;
 
 
 import org.jsoup.Connection;
@@ -9,7 +9,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import xyz.fycz.myreader.util.SSLSocketClient;
+import xyz.fycz.myreader.util.help.SSLSocketClient;
+import xyz.fycz.myreader.util.utils.StringUtils;
 
 @SuppressWarnings({"unused", "WeakerAccess"})
 public interface JsExtensions {

app/src/main/java/xyz/fycz/myreader/util/help/SSLSocketClient.java

@@ -1,30 +1,11 @@
-package xyz.fycz.myreader.util;
+package xyz.fycz.myreader.util.help;
 
 import android.annotation.SuppressLint;
-import android.graphics.Bitmap;
-import android.util.Base64;
 import android.util.Log;
 
-import com.google.gson.Gson;
-import okhttp3.*;
-import xyz.fycz.myreader.R;
-import xyz.fycz.myreader.application.App;
-import xyz.fycz.myreader.webapi.callback.HttpCallback;
-import xyz.fycz.myreader.webapi.callback.JsonCallback;
-import xyz.fycz.myreader.webapi.callback.URLConnectionCallback;
-import xyz.fycz.myreader.common.APPCONST;
-import xyz.fycz.myreader.common.URLCONST;
-import xyz.fycz.myreader.entity.JsonModel;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
@@ -32,7 +13,8 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
-import static java.lang.String.valueOf;
+import okhttp3.Interceptor;
+import okhttp3.Request;
 
 
 public class SSLSocketClient {

app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java

@@ -126,7 +126,7 @@ public class AdUtils {
             DdSdkHelper.init("1234", "216", "51716a16fbdf50905704b6575b1b3b60",
                     "142364", "35ce0efe5f3cc960b116db227498e238",
                     "8167", "85bd159309c3da1b",
-                    App.getApplication(), true);
+                    App.getApplication(), App.isDebug());
         }
     }
 }

app/src/main/java/xyz/fycz/myreader/util/utils/OkHttpUtils.java

@@ -17,9 +17,9 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static xyz.fycz.myreader.util.SSLSocketClient.createSSLSocketFactory;
-import static xyz.fycz.myreader.util.SSLSocketClient.createTrustAllManager;
-import static xyz.fycz.myreader.util.SSLSocketClient.getHeaderInterceptor;
+import static xyz.fycz.myreader.util.help.SSLSocketClient.createSSLSocketFactory;
+import static xyz.fycz.myreader.util.help.SSLSocketClient.createTrustAllManager;
+import static xyz.fycz.myreader.util.help.SSLSocketClient.getHeaderInterceptor;
 
 public class OkHttpUtils {
 

app/src/main/java/xyz/fycz/myreader/util/webdav/WebDav.kt

@@ -4,7 +4,6 @@ import xyz.fycz.myreader.util.webdav.http.Handler
 import xyz.fycz.myreader.util.webdav.http.HttpAuth
 import okhttp3.*
 import org.jsoup.Jsoup
-import xyz.fycz.myreader.util.SSLSocketClient
 import xyz.fycz.myreader.util.utils.OkHttpUtils
 import java.io.File
 import java.io.IOException

app/src/main/java/xyz/fycz/myreader/webapi/BookStoreApi.java

@@ -6,14 +6,12 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 import io.reactivex.Single;
-import io.reactivex.SingleEmitter;
 import io.reactivex.SingleOnSubscribe;
 import xyz.fycz.myreader.base.observer.MySingleObserver;
 import xyz.fycz.myreader.entity.bookstore.BookType;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.util.utils.OkHttpUtils;
 import xyz.fycz.myreader.util.utils.RxUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
 import xyz.fycz.myreader.webapi.crawler.base.FindCrawler;
 
 public class BookStoreApi {

app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java

@@ -5,10 +5,8 @@ import java.util.List;
 import java.util.Map;
 
 import io.reactivex.Observable;
-import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
-import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.entity.SearchBookBean;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.Chapter;
@@ -16,10 +14,8 @@ import xyz.fycz.myreader.model.mulvalmap.ConcurrentMultiValueMap;
 import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.util.utils.NetworkUtils;
 import xyz.fycz.myreader.util.utils.OkHttpUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
 import xyz.fycz.myreader.webapi.crawler.base.BookInfoCrawler;
 import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler;
-import xyz.fycz.myreader.webapi.crawler.read.FYReadCrawler;
 import xyz.fycz.myreader.webapi.crawler.read.TianLaiReadCrawler;
 
 

app/src/main/java/xyz/fycz/myreader/webapi/LanZousApi.java

@@ -19,7 +19,6 @@ import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.util.utils.OkHttpUtils;
 import xyz.fycz.myreader.util.utils.RxUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
 
 /**
  * @author fengyue

app/src/main/java/xyz/fycz/myreader/webapi/ResultCallback.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.webapi.callback;
+package xyz.fycz.myreader.webapi;
 
 
 public interface ResultCallback {

app/src/main/java/xyz/fycz/myreader/webapi/callback/HttpCallback.java

@@ -1,15 +0,0 @@
-package xyz.fycz.myreader.webapi.callback;
-
-import android.graphics.Bitmap;
-
-import java.io.InputStream;
-
-/**
- * Created by zhao on 2016/4/16.
- */
-public interface HttpCallback {
-    void onFinish(String response);
-    void onFinish(InputStream in);
-    void onFinish(Bitmap bm);
-    void onError(Exception e);
-}

app/src/main/java/xyz/fycz/myreader/webapi/callback/JsonCallback.java

@@ -1,16 +0,0 @@
-package xyz.fycz.myreader.webapi.callback;
-
-
-import xyz.fycz.myreader.entity.JsonModel;
-
-/**
- * Created by zhao on 2016/10/25.
- */
-
-public interface JsonCallback {
-
-    void onFinish(JsonModel jsonModel);
-
-    void onError(Exception e);
-
-}

app/src/main/java/xyz/fycz/myreader/webapi/callback/URLConnectionCallback.java

@@ -1,9 +0,0 @@
-package xyz.fycz.myreader.webapi.callback;
-
-/**
- * Created by zhao on 2016/4/16.
- */
-public interface URLConnectionCallback {
-    void onFinish(boolean checked);
-
-}

app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/QiDianMobileRank.java

@@ -14,7 +14,7 @@ import xyz.fycz.myreader.application.App;
 import xyz.fycz.myreader.base.observer.MySingleObserver;
 import xyz.fycz.myreader.util.utils.OkHttpUtils;
 import xyz.fycz.myreader.util.utils.RxUtils;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.entity.bookstore.BookType;
 import xyz.fycz.myreader.entity.bookstore.QDBook;
 import xyz.fycz.myreader.entity.bookstore.RankBook;
@@ -23,7 +23,6 @@ import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.util.IOUtils;
 import xyz.fycz.myreader.util.SharedPreUtils;
 import xyz.fycz.myreader.util.StringHelper;
-import xyz.fycz.myreader.webapi.CommonApi;
 import xyz.fycz.myreader.webapi.crawler.base.FindCrawler;
 
 import java.io.BufferedReader;

app/src/main/java/xyz/fycz/myreader/widget/page/LocalPageLoader.java

@@ -3,7 +3,7 @@ package xyz.fycz.myreader.widget.page;
 import android.util.Log;
 import io.reactivex.*;
 import io.reactivex.disposables.Disposable;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
+import xyz.fycz.myreader.webapi.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.entity.Setting;
 import xyz.fycz.myreader.greendao.entity.Book;

app/src/main/java/xyz/fycz/myreader/widget/page/NetPageLoader.java

@@ -23,7 +23,6 @@ import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.util.utils.FileUtils;
 import xyz.fycz.myreader.util.utils.RxUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
-import xyz.fycz.myreader.webapi.callback.ResultCallback;
 import xyz.fycz.myreader.webapi.crawler.base.ReadCrawler;
 
 public class NetPageLoader extends PageLoader {