From e5a5f104d9f37b5118990964aae2eebd6f1252d9 Mon Sep 17 00:00:00 2001 From: fengyuecanzhu <1021300691@qq.com> Date: Thu, 13 May 2021 17:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myreader/ExampleInstrumentedTest.java | 5 +--- .../xyz/fycz/myreader/ActivityManage.java | 6 ----- .../xyz/fycz/myreader/application/App.java | 4 +-- .../xyz/fycz/myreader/common/URLCONST.java | 4 --- .../myreader/entity/bookstore/BookType.java | 5 ---- .../java/xyz/fycz/myreader/enums/Font.java | 12 ++++----- .../model/analyzeRule/AnalyzeRule.java | 27 +------------------ .../model/analyzeRule/AnalyzeUrl.java | 2 +- .../myreader/model/backup/UserService.java | 2 +- .../ui/activity/BookDetailedActivity.java | 3 --- .../ui/activity/BookstoreActivity.java | 2 +- .../myreader/ui/activity/LoginActivity.java | 3 +-- .../myreader/ui/activity/ReadActivity.java | 7 +---- .../ui/activity/RegisterActivity.java | 3 +-- .../myreader/ui/adapter/FontsAdapter.java | 2 +- .../myreader/ui/dialog/APPDownloadTip.java | 2 +- .../fycz/myreader/ui/dialog/UpdateDialog.java | 2 +- .../myreader/ui/fragment/MineFragment.java | 8 +----- .../ui/presenter/BookcasePresenter.java | 2 +- .../ui/presenter/CatalogPresenter.java | 1 - .../util/{utils => help}/JsExtensions.java | 5 ++-- .../util/{ => help}/SSLSocketClient.java | 24 +++-------------- .../xyz/fycz/myreader/util/utils/AdUtils.java | 2 +- .../fycz/myreader/util/utils/OkHttpUtils.java | 6 ++--- .../xyz/fycz/myreader/util/webdav/WebDav.kt | 1 - .../fycz/myreader/webapi/BookStoreApi.java | 2 -- .../xyz/fycz/myreader/webapi/CommonApi.java | 4 --- .../xyz/fycz/myreader/webapi/LanZousApi.java | 1 - .../webapi/{callback => }/ResultCallback.java | 2 +- .../webapi/callback/HttpCallback.java | 15 ----------- .../webapi/callback/JsonCallback.java | 16 ----------- .../callback/URLConnectionCallback.java | 9 ------- .../webapi/crawler/find/QiDianMobileRank.java | 3 +-- .../myreader/widget/page/LocalPageLoader.java | 2 +- .../myreader/widget/page/NetPageLoader.java | 1 - 35 files changed, 34 insertions(+), 161 deletions(-) rename app/src/main/java/xyz/fycz/myreader/util/{utils => help}/JsExtensions.java (94%) rename app/src/main/java/xyz/fycz/myreader/util/{ => help}/SSLSocketClient.java (82%) rename app/src/main/java/xyz/fycz/myreader/webapi/{callback => }/ResultCallback.java (72%) delete mode 100644 app/src/main/java/xyz/fycz/myreader/webapi/callback/HttpCallback.java delete mode 100644 app/src/main/java/xyz/fycz/myreader/webapi/callback/JsonCallback.java delete mode 100644 app/src/main/java/xyz/fycz/myreader/webapi/callback/URLConnectionCallback.java diff --git a/app/src/androidTest/java/xyz/fycz/myreader/ExampleInstrumentedTest.java b/app/src/androidTest/java/xyz/fycz/myreader/ExampleInstrumentedTest.java index ad2bc3a..53d6445 100644 --- a/app/src/androidTest/java/xyz/fycz/myreader/ExampleInstrumentedTest.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ActivityManage.java b/app/src/main/java/xyz/fycz/myreader/ActivityManage.java index b7f0ad3..7a8b7fd 100644 --- a/app/src/main/java/xyz/fycz/myreader/ActivityManage.java +++ b/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 activities = new ArrayList<>(); diff --git a/app/src/main/java/xyz/fycz/myreader/application/App.java b/app/src/main/java/xyz/fycz/myreader/application/App.java index b5ecb92..3010287 100644 --- a/app/src/main/java/xyz/fycz/myreader/application/App.java +++ b/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); diff --git a/app/src/main/java/xyz/fycz/myreader/common/URLCONST.java b/app/src/main/java/xyz/fycz/myreader/common/URLCONST.java index c5e9190..2aeacbd 100644 --- a/app/src/main/java/xyz/fycz/myreader/common/URLCONST.java +++ b/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"; diff --git a/app/src/main/java/xyz/fycz/myreader/entity/bookstore/BookType.java b/app/src/main/java/xyz/fycz/myreader/entity/bookstore/BookType.java index 34075e5..98d1d5a 100644 --- a/app/src/main/java/xyz/fycz/myreader/entity/bookstore/BookType.java +++ b/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;//分类名称 diff --git a/app/src/main/java/xyz/fycz/myreader/enums/Font.java b/app/src/main/java/xyz/fycz/myreader/enums/Font.java index a705791..b33c1c1 100644 --- a/app/src/main/java/xyz/fycz/myreader/enums/Font.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeRule.java b/app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeRule.java index 8e52049..9b3a2a0 100644 --- a/app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeRule.java +++ b/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; /** diff --git a/app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeUrl.java b/app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeUrl.java index eedf161..65e1eed 100644 --- a/app/src/main/java/xyz/fycz/myreader/model/analyzeRule/AnalyzeUrl.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/model/backup/UserService.java b/app/src/main/java/xyz/fycz/myreader/model/backup/UserService.java index 44774b1..d3cee63 100644 --- a/app/src/main/java/xyz/fycz/myreader/model/backup/UserService.java +++ b/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.*; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java index 691872f..f520944 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookstoreActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/BookstoreActivity.java index 94b1833..640ad3e 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookstoreActivity.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/LoginActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/LoginActivity.java index febe739..8145fcf 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/LoginActivity.java +++ b/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 diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java index 73e595e..c90b950 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/RegisterActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/RegisterActivity.java index 77c3c74..55111f7 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/RegisterActivity.java +++ b/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 diff --git a/app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java b/app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java index efa9fc7..7e76ad8 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/dialog/APPDownloadTip.java b/app/src/main/java/xyz/fycz/myreader/ui/dialog/APPDownloadTip.java index bac97c7..41fa5c1 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/dialog/APPDownloadTip.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/dialog/UpdateDialog.java b/app/src/main/java/xyz/fycz/myreader/ui/dialog/UpdateDialog.java index 22f1aca..a6246de 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/dialog/UpdateDialog.java +++ b/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 { diff --git a/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java b/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java index 8c852d6..16f14fe 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/presenter/BookcasePresenter.java b/app/src/main/java/xyz/fycz/myreader/ui/presenter/BookcasePresenter.java index ef8ae9b..f71a8cd 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/presenter/BookcasePresenter.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/presenter/CatalogPresenter.java b/app/src/main/java/xyz/fycz/myreader/ui/presenter/CatalogPresenter.java index 2438a75..e2ae11f 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/presenter/CatalogPresenter.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/util/utils/JsExtensions.java b/app/src/main/java/xyz/fycz/myreader/util/help/JsExtensions.java similarity index 94% rename from app/src/main/java/xyz/fycz/myreader/util/utils/JsExtensions.java rename to app/src/main/java/xyz/fycz/myreader/util/help/JsExtensions.java index 6377867..ecf2125 100644 --- a/app/src/main/java/xyz/fycz/myreader/util/utils/JsExtensions.java +++ b/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 { diff --git a/app/src/main/java/xyz/fycz/myreader/util/SSLSocketClient.java b/app/src/main/java/xyz/fycz/myreader/util/help/SSLSocketClient.java similarity index 82% rename from app/src/main/java/xyz/fycz/myreader/util/SSLSocketClient.java rename to app/src/main/java/xyz/fycz/myreader/util/help/SSLSocketClient.java index 5e93411..f36ea2a 100644 --- a/app/src/main/java/xyz/fycz/myreader/util/SSLSocketClient.java +++ b/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 { diff --git a/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java b/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java index 25e8d93..456713e 100644 --- a/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java +++ b/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()); } } } diff --git a/app/src/main/java/xyz/fycz/myreader/util/utils/OkHttpUtils.java b/app/src/main/java/xyz/fycz/myreader/util/utils/OkHttpUtils.java index e09d96a..e0964c7 100644 --- a/app/src/main/java/xyz/fycz/myreader/util/utils/OkHttpUtils.java +++ b/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 { diff --git a/app/src/main/java/xyz/fycz/myreader/util/webdav/WebDav.kt b/app/src/main/java/xyz/fycz/myreader/util/webdav/WebDav.kt index f1ae186..310bd7c 100644 --- a/app/src/main/java/xyz/fycz/myreader/util/webdav/WebDav.kt +++ b/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 diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/BookStoreApi.java b/app/src/main/java/xyz/fycz/myreader/webapi/BookStoreApi.java index ecd41d7..73bc653 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/BookStoreApi.java +++ b/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 { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java b/app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java index 361a4cf..2b71de3 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/CommonApi.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/LanZousApi.java b/app/src/main/java/xyz/fycz/myreader/webapi/LanZousApi.java index 3ed6ed7..ec473ff 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/LanZousApi.java +++ b/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 diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/callback/ResultCallback.java b/app/src/main/java/xyz/fycz/myreader/webapi/ResultCallback.java similarity index 72% rename from app/src/main/java/xyz/fycz/myreader/webapi/callback/ResultCallback.java rename to app/src/main/java/xyz/fycz/myreader/webapi/ResultCallback.java index ab289c1..19e604e 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/callback/ResultCallback.java +++ b/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 { diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/callback/HttpCallback.java b/app/src/main/java/xyz/fycz/myreader/webapi/callback/HttpCallback.java deleted file mode 100644 index d2fc77b..0000000 --- a/app/src/main/java/xyz/fycz/myreader/webapi/callback/HttpCallback.java +++ /dev/null @@ -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); -} diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/callback/JsonCallback.java b/app/src/main/java/xyz/fycz/myreader/webapi/callback/JsonCallback.java deleted file mode 100644 index 0c98c91..0000000 --- a/app/src/main/java/xyz/fycz/myreader/webapi/callback/JsonCallback.java +++ /dev/null @@ -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); - -} diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/callback/URLConnectionCallback.java b/app/src/main/java/xyz/fycz/myreader/webapi/callback/URLConnectionCallback.java deleted file mode 100644 index 8e08c31..0000000 --- a/app/src/main/java/xyz/fycz/myreader/webapi/callback/URLConnectionCallback.java +++ /dev/null @@ -1,9 +0,0 @@ -package xyz.fycz.myreader.webapi.callback; - -/** - * Created by zhao on 2016/4/16. - */ -public interface URLConnectionCallback { - void onFinish(boolean checked); - -} diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/QiDianMobileRank.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/QiDianMobileRank.java index 51592c4..5b41638 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/find/QiDianMobileRank.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/widget/page/LocalPageLoader.java b/app/src/main/java/xyz/fycz/myreader/widget/page/LocalPageLoader.java index 3743d34..79f4d6d 100644 --- a/app/src/main/java/xyz/fycz/myreader/widget/page/LocalPageLoader.java +++ b/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; diff --git a/app/src/main/java/xyz/fycz/myreader/widget/page/NetPageLoader.java b/app/src/main/java/xyz/fycz/myreader/widget/page/NetPageLoader.java index 211e128..7c54001 100644 --- a/app/src/main/java/xyz/fycz/myreader/widget/page/NetPageLoader.java +++ b/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 {