优化书籍详情

app/src/main/AndroidManifest.xml

@@ -57,7 +57,7 @@
             android:requestLegacyExternalStorage="true"
             android:networkSecurityConfig="@xml/network_security_config">
 
-        <activity android:name=".ui.home.Splash">
+        <activity android:name=".ui.activity.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -75,15 +75,15 @@
                     android:resource="@xml/file_paths"/>
         </provider>
 
-        <activity android:name=".ui.home.MainActivity"
+        <activity android:name=".ui.activity.MainActivity"
                   android:launchMode="singleTask"/>
         <activity
-                android:name=".ui.search.SearchBookActivity"
+                android:name=".ui.activity.SearchBookActivity"
                 android:windowSoftInputMode="stateVisible"/>
-        <activity android:name=".ui.bookinfo.BookDetailedActivity"/>
+        <activity android:name=".ui.activity.BookDetailedActivity"/>
 
         <activity
-                android:name=".ui.read.ReadActivity"
+                android:name=".ui.activity.ReadActivity"
                 android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
@@ -92,21 +92,21 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.font.FontsActivity"/>
+        <activity android:name=".ui.activity.FontsActivity"/>
 
-        <activity android:name=".ui.user.LoginActivity"/>
+        <activity android:name=".ui.activity.LoginActivity"/>
 
-        <activity android:name=".ui.user.RegisterActivity"/>
+        <activity android:name=".ui.activity.RegisterActivity"/>
 
-        <activity android:name=".ui.read.catalog.CatalogActivity"/>
+        <activity android:name=".ui.activity.CatalogActivity"/>
-        <activity android:name=".ui.about.AboutActivity"/>
+        <activity android:name=".ui.activity.AboutActivity"/>
 
 
-        <activity android:name=".ui.filesys.FileSystemActivity"/>
+        <activity android:name=".ui.activity.FileSystemActivity"/>
 
         <receiver android:name=".util.notification.NotificationClickReceiver"/>
-        <receiver android:name=".ui.home.bookcase.BookcasePresenter$cancelDownloadReceiver"/>
+        <receiver android:name=".ui.presenter.BookcasePresenter$cancelDownloadReceiver"/>
-        <receiver android:name=".ui.read.ReadPresenter$cancelDownloadReceiver"/>
+        <receiver android:name=".ui.presenter.ReadPresenter$cancelDownloadReceiver"/>
 
     </application>
 

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

@@ -1,13 +0,0 @@
-package xyz.fycz.myreader;
-
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-}

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

@@ -8,7 +8,6 @@ import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
@@ -25,7 +24,6 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
 import java.io.File;
-import java.io.IOException;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
 import java.util.concurrent.ExecutorService;
@@ -45,8 +43,7 @@ import xyz.fycz.myreader.creator.APPDownloadTip;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.entity.Setting;
 import xyz.fycz.myreader.entity.UpdateInfo;
-import xyz.fycz.myreader.ui.home.MainActivity;
+import xyz.fycz.myreader.ui.fragment.BookcaseFragment;
-import xyz.fycz.myreader.ui.home.bookcase.BookcaseFragment;
 import xyz.fycz.myreader.util.*;
 
 

app/src/main/java/xyz/fycz/myreader/base/adapter/BaseListAdapter.java

@@ -4,8 +4,6 @@ import android.os.Handler;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.recyclerview.widget.RecyclerView;
-import xyz.fycz.myreader.base.BaseViewHolder;
-import xyz.fycz.myreader.base.IViewHolder;
 
 import java.util.ArrayList;
 import java.util.Collections;

app/src/main/java/xyz/fycz/myreader/base/adapter/BaseViewHolder.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.base;
+package xyz.fycz.myreader.base.adapter;
 
 import android.view.View;
 import androidx.recyclerview.widget.RecyclerView;

app/src/main/java/xyz/fycz/myreader/base/adapter/IViewHolder.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.base;
+package xyz.fycz.myreader.base.adapter;
 
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/xyz/fycz/myreader/base/adapter/ViewHolderImpl.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.base;
+package xyz.fycz.myreader.base.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;

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

@@ -10,10 +10,10 @@ import java.io.File;
 
 public class APPCONST {
 
-    public static String publicKey = "fyds1.0";//服务端公钥
+    public static String publicKey = "";//服务端公钥
     public static String privateKey;//app私钥
     public final static String s = "11940364935628058505";
-    public static final String KEY = "readerByFengyue";
+    public static final String KEY = "";
 
     public static final String ALARM_SCHEDULE_MSG = "alarm_schedule_msg";
 

app/src/main/java/xyz/fycz/myreader/creator/APPDownloadTip.java

@@ -2,24 +2,19 @@ package xyz.fycz.myreader.creator;
 
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.Settings;
-import androidx.core.content.FileProvider;
 import android.view.View;
 import xyz.fycz.myreader.application.MyApplication;
 import xyz.fycz.myreader.base.BaseActivity;
 import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
-import xyz.fycz.myreader.ui.home.MainActivity;
+import xyz.fycz.myreader.ui.activity.MainActivity;
-import xyz.fycz.myreader.ui.home.bookcase.BookcaseFragment;
+import xyz.fycz.myreader.ui.fragment.BookcaseFragment;
-import xyz.fycz.myreader.util.StringHelper;
+import xyz.fycz.myreader.util.IOUtils;
 import xyz.fycz.myreader.util.TextHelper;
 import xyz.fycz.myreader.util.utils.FileUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
@@ -126,12 +121,7 @@ public class APPDownloadTip {
                                                         activity.finish();
                                                     }
                                                 }
-                                            }, new DialogInterface.OnClickListener() {
+                                            }, (dialog, which) -> activity.installProcess(newFile, isForceUpdate));
-                                                @Override
-                                                public void onClick(DialogInterface dialog, int which) {
-                                                    activity.installProcess(newFile, isForceUpdate);
-                                                }
-                                            });
                                     activity.installProcess(newFile, isForceUpdate);
                                 }else {
                                     appFile.delete();
@@ -151,20 +141,7 @@ public class APPDownloadTip {
                             if (con != null) {
                                 con.disconnect();
                             }
-                            if (is != null) {
+                            IOUtils.close(is, fos);
-                                try {
-                                    is.close();
-                                } catch (IOException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                            if (fos != null) {
-                                try {
-                                    fos.close();
-                                } catch (IOException e) {
-                                    e.printStackTrace();
-                                }
-                            }
                         }
                     }
                 });

app/src/main/java/xyz/fycz/myreader/creator/ChangeSourceDialog.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
 import xyz.fycz.myreader.callback.ResultCallback;
-import xyz.fycz.myreader.crawler.*;
+import xyz.fycz.myreader.webapi.crawler.*;
 import xyz.fycz.myreader.entity.SearchBookBean;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.mulvalmap.ConcurrentMultiValueMap;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.about;
+package xyz.fycz.myreader.ui.activity;
 
 import android.os.Bundle;
 import android.widget.LinearLayout;
@@ -6,9 +6,9 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import com.google.android.material.tabs.TabLayout;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.base.BaseActivity;
+import xyz.fycz.myreader.ui.presenter.AboutPresenter;
 
 /**
  * @author fengyue
@@ -35,7 +35,7 @@ public class AboutActivity extends BaseActivity {
     @BindView(R.id.vw_disclaimer)
     CardView vmDisclaimer;
 
-    private AboutPresent mAboutPresent;
+    private AboutPresenter mAboutPresenter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -43,8 +43,8 @@ public class AboutActivity extends BaseActivity {
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
         setStatusBar(R.color.sys_line);
-        mAboutPresent = new AboutPresent(this);
+        mAboutPresenter = new AboutPresenter(this);
-        mAboutPresent.start();
+        mAboutPresenter.start();
     }
 
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.bookinfo;
+package xyz.fycz.myreader.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -22,12 +22,11 @@ import com.bumptech.glide.request.RequestOptions;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.application.MyApplication;
 import xyz.fycz.myreader.base.BaseActivity2;
-import xyz.fycz.myreader.base.adapter.BaseListAdapter;
 import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
-import xyz.fycz.myreader.crawler.BookInfoCrawler;
+import xyz.fycz.myreader.webapi.crawler.BookInfoCrawler;
-import xyz.fycz.myreader.crawler.ReadCrawler;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawler;
-import xyz.fycz.myreader.crawler.ReadCrawlerUtil;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
 import xyz.fycz.myreader.creator.ChangeSourceDialog;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.enums.BookSource;
@@ -35,9 +34,7 @@ import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.greendao.service.BookService;
 import xyz.fycz.myreader.greendao.service.ChapterService;
-import xyz.fycz.myreader.ui.read.ReadActivity;
+import xyz.fycz.myreader.ui.adapter.DetailCatalogAdapter;
-import xyz.fycz.myreader.ui.read.catalog.CatalogActivity;
-import xyz.fycz.myreader.ui.read.catalog.ChapterTitleAdapter;
 import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.util.TextHelper;
 import xyz.fycz.myreader.util.utils.NetworkUtils;

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

@@ -1,9 +1,8 @@
-package xyz.fycz.myreader.ui.read.catalog;
+package xyz.fycz.myreader.ui.activity;
 
 import android.os.Bundle;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
@@ -11,6 +10,7 @@ import butterknife.ButterKnife;
 import com.google.android.material.tabs.TabLayout;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.base.BaseActivity;
+import xyz.fycz.myreader.ui.presenter.CatalogActivityPresenter;
 
 /**
  * @author fengyue

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.filesys;
+package xyz.fycz.myreader.ui.activity;
 
 
 import android.widget.Button;
@@ -13,6 +13,9 @@ import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.enums.BookSource;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.service.BookService;
+import xyz.fycz.myreader.ui.fragment.BaseFileFragment;
+import xyz.fycz.myreader.ui.fragment.FileCategoryFragment;
+import xyz.fycz.myreader.ui.fragment.LocalBookFragment;
 import xyz.fycz.myreader.util.TextHelper;
 
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.font;
+package xyz.fycz.myreader.ui.activity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -15,6 +15,7 @@ import xyz.fycz.myreader.base.BaseActivity;
 import butterknife.ButterKnife;
 import butterknife.BindView;
 import xyz.fycz.myreader.common.APPCONST;
+import xyz.fycz.myreader.ui.presenter.FontsPresenter;
 
 import static xyz.fycz.myreader.util.UriFileUtil.getPath;
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.user;
+package xyz.fycz.myreader.ui.activity;
 
 /**
  * @author fengyue
@@ -18,6 +18,7 @@ import butterknife.ButterKnife;
 import com.google.android.material.textfield.TextInputLayout;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.base.BaseActivity;
+import xyz.fycz.myreader.ui.presenter.LoginPresenter;
 import xyz.fycz.myreader.util.utils.StringUtils;
 
 

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

@@ -1,8 +1,6 @@
-package xyz.fycz.myreader.ui.home;
+package xyz.fycz.myreader.ui.activity;
 
 
-import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -24,7 +22,7 @@ import xyz.fycz.myreader.base.BaseActivity;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.custom.CircleImageView;
-import xyz.fycz.myreader.ui.filesys.FileSystemActivity;
+import xyz.fycz.myreader.ui.presenter.MainPresenter;
 import xyz.fycz.myreader.util.TextHelper;
 
 import butterknife.BindView;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.read;
+package xyz.fycz.myreader.ui.activity;
 
 
 import android.content.DialogInterface;
@@ -20,6 +20,7 @@ import xyz.fycz.myreader.application.SysManager;
 import xyz.fycz.myreader.base.BaseActivity;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.creator.DialogCreator;
+import xyz.fycz.myreader.ui.presenter.ReadPresenter;
 import xyz.fycz.myreader.widget.page.PageView;
 
 public class ReadActivity extends BaseActivity {

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.user;
+package xyz.fycz.myreader.ui.activity;
 
 /**
  * @author fengyue
@@ -7,17 +7,13 @@ package xyz.fycz.myreader.ui.user;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import com.google.android.material.textfield.TextInputLayout;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.base.BaseActivity;
+import xyz.fycz.myreader.ui.presenter.RegisterPresenter;
 
 
 @SuppressLint("Registered")

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

@@ -1,9 +1,7 @@
-package xyz.fycz.myreader.ui.search;
+package xyz.fycz.myreader.ui.activity;
 
 
-import android.content.Context;
 import android.os.Bundle;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -14,6 +12,7 @@ import butterknife.ButterKnife;
 import butterknife.BindView;
 import me.gujun.android.taggroup.TagGroup;
 import xyz.fycz.myreader.custom.DragSortGridView;
+import xyz.fycz.myreader.ui.presenter.SearchBookPrensenter;
 
 public class SearchBookActivity extends BaseActivity {
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home;
+package xyz.fycz.myreader.ui.activity;
 
 import android.Manifest;
 import android.content.Intent;
@@ -11,11 +11,11 @@ import androidx.core.app.ActivityCompat;
 import android.view.Window;
 import android.view.WindowManager;
 import xyz.fycz.myreader.R;
-import xyz.fycz.myreader.util.PermissionHelper;
+import xyz.fycz.myreader.ui.activity.MainActivity;
 import xyz.fycz.myreader.util.PermissionsChecker;
 import xyz.fycz.myreader.util.TextHelper;
 
-public class Splash extends AppCompatActivity {
+public class SplashActivity extends AppCompatActivity {
     /*************Constant**********/
     private static final int WAIT_INTERVAL = 1000;
     private static final int PERMISSIONS_REQUEST_STORAGE = 1;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.read.catalog.bookmark;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookstore;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.os.Handler;
@@ -16,7 +16,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.callback.ResultCallback;
-import xyz.fycz.myreader.crawler.BiQuGeReadCrawler;
+import xyz.fycz.myreader.webapi.crawler.BiQuGeReadCrawler;
 import xyz.fycz.myreader.enums.BookSource;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.util.StringHelper;
@@ -57,7 +57,7 @@ public class BookStoreBookAdapter extends RecyclerView.Adapter<BookStoreBookAdap
     });
 
 
-   BookStoreBookAdapter(Context context, List<Book> datas) {
+   public BookStoreBookAdapter(Context context, List<Book> datas) {
         mInflater = LayoutInflater.from(context);
         mDatas = datas;
         mContext = context;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookstore;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -27,7 +27,7 @@ public class BookStoreBookTypeAdapter extends RecyclerView.Adapter<BookStoreBook
     private int selectPos = 0;
 
 
-    BookStoreBookTypeAdapter(Context context, List<BookType> datas) {
+    public BookStoreBookTypeAdapter(Context context, List<BookType> datas) {
         mInflater = LayoutInflater.from(context);
         mDatas = datas;
         mContext = context;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookcase;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -27,6 +27,7 @@ import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.greendao.service.BookService;
 import xyz.fycz.myreader.greendao.service.ChapterService;
+import xyz.fycz.myreader.ui.presenter.BookcasePresenter;
 import xyz.fycz.myreader.util.TextHelper;
 import xyz.fycz.myreader.util.utils.FileUtils;
 import xyz.fycz.myreader.util.utils.NetworkUtils;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookcase;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -23,8 +23,9 @@ import xyz.fycz.myreader.application.MyApplication;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.greendao.entity.Book;
-import xyz.fycz.myreader.ui.bookinfo.BookDetailedActivity;
+import xyz.fycz.myreader.ui.activity.BookDetailedActivity;
-import xyz.fycz.myreader.ui.read.ReadActivity;
+import xyz.fycz.myreader.ui.activity.ReadActivity;
+import xyz.fycz.myreader.ui.presenter.BookcasePresenter;
 import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.util.TextHelper;
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookcase;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -22,7 +22,8 @@ import xyz.fycz.myreader.application.MyApplication;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.greendao.entity.Book;
-import xyz.fycz.myreader.ui.read.ReadActivity;
+import xyz.fycz.myreader.ui.activity.ReadActivity;
+import xyz.fycz.myreader.ui.presenter.BookcasePresenter;
 import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.util.TextHelper;
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.read.catalog;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;

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

@@ -1,8 +1,9 @@
-package xyz.fycz.myreader.ui.bookinfo;
+package xyz.fycz.myreader.ui.adapter;
 
-import xyz.fycz.myreader.base.IViewHolder;
+import xyz.fycz.myreader.base.adapter.IViewHolder;
 import xyz.fycz.myreader.base.adapter.BaseListAdapter;
 import xyz.fycz.myreader.greendao.entity.Chapter;
+import xyz.fycz.myreader.ui.adapter.holder.CatalogHolder;
 
 /**
  * @author fengyue

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

@@ -1,9 +1,10 @@
-package xyz.fycz.myreader.ui.filesys;
+package xyz.fycz.myreader.ui.adapter;
 
 
 import xyz.fycz.myreader.base.adapter.BaseListAdapter;
-import xyz.fycz.myreader.base.IViewHolder;
+import xyz.fycz.myreader.base.adapter.IViewHolder;
 import xyz.fycz.myreader.greendao.service.BookService;
+import xyz.fycz.myreader.ui.adapter.holder.FileHolder;
 
 import java.io.File;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.font;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -33,6 +33,7 @@ import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.entity.Setting;
 import xyz.fycz.myreader.enums.Font;
+import xyz.fycz.myreader.ui.activity.FontsActivity;
 import xyz.fycz.myreader.util.TextHelper;
 import xyz.fycz.myreader.util.utils.FileUtils;
 import xyz.fycz.myreader.util.utils.NetworkUtils;

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

@@ -1,12 +1,10 @@
-package xyz.fycz.myreader.ui.search;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.os.Handler;
-import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -17,9 +15,9 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.callback.ResultCallback;
-import xyz.fycz.myreader.crawler.BookInfoCrawler;
+import xyz.fycz.myreader.webapi.crawler.BookInfoCrawler;
-import xyz.fycz.myreader.crawler.ReadCrawler;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawler;
-import xyz.fycz.myreader.crawler.ReadCrawlerUtil;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
 import xyz.fycz.myreader.custom.DragAdapter;
 import xyz.fycz.myreader.entity.SearchBookBean;
 import xyz.fycz.myreader.enums.BookSource;
@@ -31,7 +29,6 @@ import xyz.fycz.myreader.webapi.CommonApi;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 
 /**

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.search;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.search;
+package xyz.fycz.myreader.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;

app/src/main/java/xyz/fycz/myreader/ui/adapter/holder/CatalogHolder.java

@@ -1,13 +1,11 @@
-package xyz.fycz.myreader.ui.bookinfo;
+package xyz.fycz.myreader.ui.adapter.holder;
 
 import android.widget.TextView;
 import xyz.fycz.myreader.R;
-import xyz.fycz.myreader.base.ViewHolderImpl;
+import xyz.fycz.myreader.base.adapter.ViewHolderImpl;
 import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.greendao.service.ChapterService;
 
-import java.io.File;
-
 /**
  * @author fengyue
  * @date 2020/8/17 15:07

app/src/main/java/xyz/fycz/myreader/ui/adapter/holder/FileHolder.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.filesys;
+package xyz.fycz.myreader.ui.adapter.holder;
 
 import android.view.View;
 import android.widget.CheckBox;
@@ -6,7 +6,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import xyz.fycz.myreader.R;
-import xyz.fycz.myreader.base.ViewHolderImpl;
+import xyz.fycz.myreader.base.adapter.ViewHolderImpl;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.greendao.service.BookService;
 import xyz.fycz.myreader.util.utils.FileUtils;

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

@@ -1,8 +1,9 @@
-package xyz.fycz.myreader.ui.filesys;
+package xyz.fycz.myreader.ui.fragment;
 
 
 
 import xyz.fycz.myreader.base.BaseFragment;
+import xyz.fycz.myreader.ui.adapter.FileSystemAdapter;
 
 import java.io.File;
 import java.util.List;

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

@@ -1,16 +1,16 @@
-package xyz.fycz.myreader.ui.read.catalog.bookmark;
+package xyz.fycz.myreader.ui.fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
 import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import xyz.fycz.myreader.R;
+import xyz.fycz.myreader.ui.presenter.BookMarkPresenter;
 
 /**
  * A simple {@link Fragment} subclass.

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookstore;
+package xyz.fycz.myreader.ui.fragment;
 
 
 import android.os.Bundle;
@@ -12,6 +12,7 @@ import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import xyz.fycz.myreader.R;
+import xyz.fycz.myreader.ui.presenter.BookStorePresenter;
 
 /**
  * A simple {@link Fragment} subclass.

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookcase;
+package xyz.fycz.myreader.ui.fragment;
 
 
 import android.os.Build;
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebView;
 import android.widget.LinearLayout;
 
 import android.widget.ProgressBar;
@@ -20,6 +19,7 @@ import xyz.fycz.myreader.custom.DragSortGridView;
 import butterknife.ButterKnife;
 import butterknife.BindView;
 import butterknife.Unbinder;
+import xyz.fycz.myreader.ui.presenter.BookcasePresenter;
 
 /**
  * A simple {@link Fragment} subclass.

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.read.catalog;
+package xyz.fycz.myreader.ui.fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -13,6 +13,7 @@ import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import xyz.fycz.myreader.R;
+import xyz.fycz.myreader.ui.presenter.CatalogPresenter;
 
 /**
  * A simple {@link Fragment} subclass.

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.filesys;
+package xyz.fycz.myreader.ui.fragment;
 
 import android.os.Bundle;
 import android.os.Environment;
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.greendao.service.BookService;
+import xyz.fycz.myreader.ui.adapter.FileSystemAdapter;
 import xyz.fycz.myreader.util.FileStack;
 import xyz.fycz.myreader.util.utils.FileUtils;
 import xyz.fycz.myreader.widget.DividerItemDecoration;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.filesys;
+package xyz.fycz.myreader.ui.fragment;
 
 import android.media.MediaScannerConnection;
 import android.os.Bundle;
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.greendao.service.BookService;
+import xyz.fycz.myreader.ui.adapter.FileSystemAdapter;
 import xyz.fycz.myreader.util.media.MediaStoreHelper;
 import xyz.fycz.myreader.widget.DividerItemDecoration;
 import xyz.fycz.myreader.widget.RefreshLayout;

app/src/main/java/xyz/fycz/myreader/ui/home/bbs/BBSFragment.java

@@ -1,30 +0,0 @@
-package xyz.fycz.myreader.ui.home.bbs;
-
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-import xyz.fycz.myreader.R;
-
-/**
- * A simple {@link Fragment} subclass.
- */
-public class BBSFragment extends Fragment {
-
-
-    public BBSFragment() {
-        // Required empty public constructor
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_bbs, container, false);
-    }
-
-}

app/src/main/java/xyz/fycz/myreader/ui/home/bbs/BBSPrensenter.java

@@ -1,15 +0,0 @@
-package xyz.fycz.myreader.ui.home.bbs;
-
-import xyz.fycz.myreader.base.BasePresenter;
-
-/**
- * Created by zhao on 2017/7/25.
- */
-
-public class BBSPrensenter implements BasePresenter {
-
-    @Override
-    public void start() {
-
-    }
-}

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.about;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.annotation.SuppressLint;
 import android.content.ClipData;
@@ -10,6 +10,7 @@ import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.application.MyApplication;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.creator.DialogCreator;
+import xyz.fycz.myreader.ui.activity.AboutActivity;
 import xyz.fycz.myreader.util.ShareUtils;
 import xyz.fycz.myreader.util.SharedPreUtils;
 import xyz.fycz.myreader.util.TextHelper;
@@ -18,11 +19,11 @@ import xyz.fycz.myreader.util.TextHelper;
  * @author fengyue
  * @date 2020/7/31 11:39
  */
-public class AboutPresent implements BasePresenter {
+public class AboutPresenter implements BasePresenter {
 
     private AboutActivity mAboutActivity;
 
-    public AboutPresent(AboutActivity mAboutActivity) {
+    public AboutPresenter(AboutActivity mAboutActivity) {
         this.mAboutActivity = mAboutActivity;
     }
 

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

@@ -1,10 +1,7 @@
-package xyz.fycz.myreader.ui.read.catalog.bookmark;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.app.Activity;
 import android.content.Intent;
-import androidx.core.view.GravityCompat;
-import android.view.View;
-import android.widget.AdapterView;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.application.SysManager;
 import xyz.fycz.myreader.base.BasePresenter;
@@ -12,6 +9,8 @@ import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.BookMark;
 import xyz.fycz.myreader.greendao.service.BookMarkService;
+import xyz.fycz.myreader.ui.adapter.BookMarkAdapter;
+import xyz.fycz.myreader.ui.fragment.BookMarkFragment;
 
 import java.util.ArrayList;
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.home.bookstore;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -15,8 +15,11 @@ import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.entity.bookstore.BookType;
 import xyz.fycz.myreader.greendao.entity.Book;
-import xyz.fycz.myreader.ui.bookinfo.BookDetailedActivity;
+import xyz.fycz.myreader.ui.activity.BookDetailedActivity;
-import xyz.fycz.myreader.ui.home.MainActivity;
+import xyz.fycz.myreader.ui.activity.MainActivity;
+import xyz.fycz.myreader.ui.adapter.BookStoreBookAdapter;
+import xyz.fycz.myreader.ui.adapter.BookStoreBookTypeAdapter;
+import xyz.fycz.myreader.ui.fragment.BookStoreFragment;
 import xyz.fycz.myreader.util.TextHelper;
 import xyz.fycz.myreader.webapi.BookStoreApi;
 
@@ -65,7 +68,7 @@ public class BookStorePresenter implements BasePresenter {
         }
     };
 
-     BookStorePresenter(BookStoreFragment bookStoreFragment){
+     public BookStorePresenter(BookStoreFragment bookStoreFragment){
          mBookStoreFragment = bookStoreFragment;
          mMainActivity = ((MainActivity) (mBookStoreFragment.getActivity()));
     }

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

@@ -1,9 +1,8 @@
-package xyz.fycz.myreader.ui.home.bookcase;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.*;
 import android.graphics.BitmapFactory;
@@ -17,7 +16,6 @@ import android.widget.PopupMenu;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
-import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 
 import java.io.File;
@@ -37,8 +35,8 @@ import xyz.fycz.myreader.backup.UserService;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
-import xyz.fycz.myreader.crawler.ReadCrawler;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawler;
-import xyz.fycz.myreader.crawler.ReadCrawlerUtil;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.custom.DragSortGridView;
 import xyz.fycz.myreader.entity.Setting;
@@ -48,13 +46,16 @@ import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.greendao.service.BookService;
 import xyz.fycz.myreader.greendao.service.ChapterService;
-import xyz.fycz.myreader.ui.about.AboutActivity;
+import xyz.fycz.myreader.ui.activity.AboutActivity;
-import xyz.fycz.myreader.ui.filesys.FileSystemActivity;
+import xyz.fycz.myreader.ui.activity.FileSystemActivity;
-import xyz.fycz.myreader.ui.home.MainActivity;
+import xyz.fycz.myreader.ui.activity.MainActivity;
-import xyz.fycz.myreader.ui.search.SearchBookActivity;
+import xyz.fycz.myreader.ui.activity.SearchBookActivity;
-import xyz.fycz.myreader.ui.user.LoginActivity;
+import xyz.fycz.myreader.ui.activity.LoginActivity;
+import xyz.fycz.myreader.ui.adapter.BookcaseAdapter;
+import xyz.fycz.myreader.ui.adapter.BookcaseDetailedAdapter;
+import xyz.fycz.myreader.ui.adapter.BookcaseDragAdapter;
+import xyz.fycz.myreader.ui.fragment.BookcaseFragment;
 import xyz.fycz.myreader.util.*;
-import xyz.fycz.myreader.util.notification.NotificationClickReceiver;
 import xyz.fycz.myreader.util.notification.NotificationUtil;
 import xyz.fycz.myreader.util.utils.NetworkUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
@@ -131,7 +132,6 @@ public class BookcasePresenter implements BasePresenter {
                 case 4:
                     showErrorLoadingBooks();
                     if (MyApplication.isApkInDebug(mMainActivity)) {
-                        MyApplication.runOnUiThread(() -> mBookcaseAdapter.notifyDataSetChanged());
                         downloadAll(false);
                     }
                     break;
@@ -259,7 +259,7 @@ public class BookcasePresenter implements BasePresenter {
     }
 
 
-    protected void init() {
+    public void init() {
         initBook();
         if (mBooks.size() == 0) {
             mBookcaseFragment.getGvBook().setVisibility(View.GONE);

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.read.catalog;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.content.Context;
 import android.text.Editable;
@@ -11,7 +11,9 @@ import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.application.SysManager;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.entity.Setting;
-import xyz.fycz.myreader.ui.read.catalog.bookmark.BookMarkFragment;
+import xyz.fycz.myreader.ui.activity.CatalogActivity;
+import xyz.fycz.myreader.ui.fragment.CatalogFragment;
+import xyz.fycz.myreader.ui.fragment.BookMarkFragment;
 
 import java.util.ArrayList;
 

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

@@ -1,19 +1,20 @@
-package xyz.fycz.myreader.ui.read.catalog;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.view.View;
-import android.widget.AdapterView;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.application.MyApplication;
 import xyz.fycz.myreader.application.SysManager;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
-import xyz.fycz.myreader.crawler.ReadCrawlerUtil;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.greendao.service.ChapterService;
+import xyz.fycz.myreader.ui.adapter.ChapterTitleAdapter;
+import xyz.fycz.myreader.ui.fragment.CatalogFragment;
 import xyz.fycz.myreader.util.TextHelper;
 import xyz.fycz.myreader.webapi.CommonApi;
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.font;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.annotation.SuppressLint;
 import android.os.Handler;
@@ -9,6 +9,8 @@ import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.enums.Font;
+import xyz.fycz.myreader.ui.activity.FontsActivity;
+import xyz.fycz.myreader.ui.adapter.FontsAdapter;
 import xyz.fycz.myreader.util.IOUtils;
 import xyz.fycz.myreader.util.TextHelper;
 import xyz.fycz.myreader.util.utils.FileUtils;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.user;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -12,7 +12,8 @@ import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.creator.DialogCreator;
-import xyz.fycz.myreader.ui.font.FontsActivity;
+import xyz.fycz.myreader.ui.activity.LoginActivity;
+import xyz.fycz.myreader.ui.activity.RegisterActivity;
 import xyz.fycz.myreader.util.CodeUtil;
 import xyz.fycz.myreader.util.CyptoUtils;
 import xyz.fycz.myreader.util.TextHelper;

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

@@ -1,10 +1,8 @@
-package xyz.fycz.myreader.ui.home;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.content.DialogInterface;
 import android.content.Intent;
 
-import android.view.View;
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentPagerAdapter;
 import xyz.fycz.myreader.application.MyApplication;
@@ -13,13 +11,10 @@ import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.entity.Setting;
-import xyz.fycz.myreader.ui.home.bbs.BBSFragment;
+import xyz.fycz.myreader.ui.activity.MainActivity;
-import xyz.fycz.myreader.ui.home.bookcase.BookcaseFragment;
+import xyz.fycz.myreader.ui.fragment.BookcaseFragment;
-import xyz.fycz.myreader.ui.home.bookcase.BookcasePresenter;
+import xyz.fycz.myreader.ui.activity.SearchBookActivity;
-import xyz.fycz.myreader.ui.home.bookstore.BookStoreFragment;
+import xyz.fycz.myreader.ui.activity.LoginActivity;
-import xyz.fycz.myreader.ui.search.SearchBookActivity;
-import xyz.fycz.myreader.ui.user.LoginActivity;
-import xyz.fycz.myreader.util.AppInfoUtils;
 import xyz.fycz.myreader.util.TextHelper;
 
 import java.io.File;

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.read;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
@@ -21,7 +21,6 @@ import androidx.appcompat.app.AlertDialog;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import xyz.fycz.myreader.R;
@@ -31,8 +30,8 @@ import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.common.URLCONST;
-import xyz.fycz.myreader.crawler.ReadCrawler;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawler;
-import xyz.fycz.myreader.crawler.ReadCrawlerUtil;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
 import xyz.fycz.myreader.creator.DialogCreator;
 import xyz.fycz.myreader.entity.Setting;
 import xyz.fycz.myreader.enums.BookSource;
@@ -44,9 +43,9 @@ import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.greendao.service.BookMarkService;
 import xyz.fycz.myreader.greendao.service.BookService;
 import xyz.fycz.myreader.greendao.service.ChapterService;
-import xyz.fycz.myreader.ui.font.FontsActivity;
+import xyz.fycz.myreader.ui.activity.FontsActivity;
-import xyz.fycz.myreader.ui.home.bookcase.BookcasePresenter;
+import xyz.fycz.myreader.ui.activity.ReadActivity;
-import xyz.fycz.myreader.ui.read.catalog.CatalogActivity;
+import xyz.fycz.myreader.ui.activity.CatalogActivity;
 import xyz.fycz.myreader.util.BrightUtil;
 import xyz.fycz.myreader.util.ScreenHelper;
 import xyz.fycz.myreader.util.StringHelper;
@@ -264,7 +263,7 @@ public class ReadPresenter implements BasePresenter {
     /**
      * 保存最后阅读章节的进度
      */
-    protected void saveLastChapterReadPosition() {
+    public void saveLastChapterReadPosition() {
         if (!StringHelper.isEmpty(mBook.getId()) && mPageLoader.getPageStatus() == PageLoader.STATUS_FINISH) {
             mBook.setLastReadPosition(mPageLoader.getPagePos());
             mBook.setHisttoryChapterNum(mPageLoader.getChapterPos());
@@ -1201,7 +1200,7 @@ public class ReadPresenter implements BasePresenter {
     /**
      * ReadActivity调用
      */
-    protected void deleteBook() {
+    public void deleteBook() {
         mBookService.deleteBookById(mBook.getId());
     }
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.user;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -9,26 +9,15 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
-import xyz.fycz.myreader.application.MyApplication;
 import xyz.fycz.myreader.backup.UserService;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.callback.ResultCallback;
-import xyz.fycz.myreader.common.APPCONST;
-import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.creator.DialogCreator;
-import xyz.fycz.myreader.util.AppInfoUtils;
+import xyz.fycz.myreader.ui.activity.RegisterActivity;
 import xyz.fycz.myreader.util.CodeUtil;
-import xyz.fycz.myreader.util.CyptoUtils;
 import xyz.fycz.myreader.util.TextHelper;
-import xyz.fycz.myreader.util.utils.NetworkUtils;
 import xyz.fycz.myreader.util.utils.StringUtils;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.ui.search;
+package xyz.fycz.myreader.ui.presenter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -14,10 +14,10 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 
 import xyz.fycz.myreader.application.MyApplication;
-import xyz.fycz.myreader.crawler.*;
+import xyz.fycz.myreader.webapi.crawler.*;
 import xyz.fycz.myreader.entity.SearchBookBean;
 import xyz.fycz.myreader.mulvalmap.ConcurrentMultiValueMap;
-import xyz.fycz.myreader.ui.bookinfo.BookDetailedActivity;
+import xyz.fycz.myreader.ui.activity.BookDetailedActivity;
 import xyz.fycz.myreader.R;
 import xyz.fycz.myreader.base.BasePresenter;
 import xyz.fycz.myreader.callback.ResultCallback;
@@ -25,6 +25,9 @@ import xyz.fycz.myreader.common.APPCONST;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.SearchHistory;
 import xyz.fycz.myreader.greendao.service.SearchHistoryService;
+import xyz.fycz.myreader.ui.activity.SearchBookActivity;
+import xyz.fycz.myreader.ui.adapter.SearchBookAdapter;
+import xyz.fycz.myreader.ui.adapter.SearchHistoryAdapter;
 import xyz.fycz.myreader.util.StringHelper;
 import xyz.fycz.myreader.webapi.CommonApi;
 
@@ -93,7 +96,7 @@ public class SearchBookPrensenter implements BasePresenter {
     @Override
     public void start() {
         mSearchBookActivity.getTvTitleText().setText("搜索");
-        mSearchBookActivity.etSearchKey.requestFocus();//get the focus
+        mSearchBookActivity.getEtSearchKey().requestFocus();//get the focus
         //enter事件
         mSearchBookActivity.getEtSearchKey().setOnEditorActionListener((textView, i, keyEvent) -> {
             if (i == EditorInfo.IME_ACTION_UNSPECIFIED) {

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

@@ -2,7 +2,7 @@ package xyz.fycz.myreader.webapi;
 
 
 import xyz.fycz.myreader.callback.ResultCallback;
-import xyz.fycz.myreader.crawler.BiQuGeReadCrawler;
+import xyz.fycz.myreader.webapi.crawler.BiQuGeReadCrawler;
 
 /**
  * Created by zhao on 2017/7/24.

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

@@ -1,7 +1,7 @@
 package xyz.fycz.myreader.webapi;
 
 import xyz.fycz.myreader.common.URLCONST;
-import xyz.fycz.myreader.crawler.*;
+import xyz.fycz.myreader.webapi.crawler.*;
 import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.greendao.entity.Book;
 

app/src/main/java/xyz/fycz/myreader/webapi/crawler/BiQuGe44ReadCrawler.java

@@ -1,11 +1,10 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import android.text.Html;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
-import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.entity.SearchBookBean;
 import xyz.fycz.myreader.enums.BookSource;
 import xyz.fycz.myreader.greendao.entity.Book;
@@ -14,11 +13,6 @@ import xyz.fycz.myreader.mulvalmap.ConcurrentMultiValueMap;
 import xyz.fycz.myreader.util.StringHelper;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import static xyz.fycz.myreader.webapi.BaseApi.getCommonReturnHtmlStringApi;
-
 
 
 public class BiQuGe44ReadCrawler implements ReadCrawler, BookInfoCrawler{

app/src/main/java/xyz/fycz/myreader/webapi/crawler/BiQuGeReadCrawler.java

@@ -1,11 +1,10 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import android.text.Html;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
-import xyz.fycz.myreader.callback.ResultCallback;
 import xyz.fycz.myreader.entity.SearchBookBean;
 import xyz.fycz.myreader.entity.bookstore.BookType;
 import xyz.fycz.myreader.enums.BookSource;
@@ -13,7 +12,6 @@ import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.mulvalmap.ConcurrentMultiValueMap;
 import xyz.fycz.myreader.util.StringHelper;
-import xyz.fycz.myreader.webapi.CommonApi;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/xyz/fycz/myreader/webapi/crawler/BookInfoCrawler.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import xyz.fycz.myreader.greendao.entity.Book;
 

app/src/main/java/xyz/fycz/myreader/webapi/crawler/FYReadCrawler.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import android.text.Html;
 

app/src/main/java/xyz/fycz/myreader/webapi/crawler/PinShuReadCrawler.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import android.text.Html;
 import org.jsoup.Jsoup;

app/src/main/java/xyz/fycz/myreader/webapi/crawler/PinShuReadCrawler2.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import android.text.Html;
 import org.jsoup.Jsoup;

app/src/main/java/xyz/fycz/myreader/webapi/crawler/QiDianRankList.java

@@ -1,13 +1,11 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import xyz.fycz.myreader.entity.bookstore.BookType;
-import xyz.fycz.myreader.enums.BookSource;
 import xyz.fycz.myreader.greendao.entity.Book;
-import xyz.fycz.myreader.util.StringHelper;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/xyz/fycz/myreader/webapi/crawler/ReadCrawler.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import xyz.fycz.myreader.entity.SearchBookBean;
 import xyz.fycz.myreader.greendao.entity.Book;

app/src/main/java/xyz/fycz/myreader/webapi/crawler/ReadCrawlerUtil.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 
 import java.util.ResourceBundle;

app/src/main/java/xyz/fycz/myreader/webapi/crawler/TianLaiReadCrawler.java

@@ -1,4 +1,4 @@
-package xyz.fycz.myreader.crawler;
+package xyz.fycz.myreader.webapi.crawler;
 
 import android.text.Html;
 

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

@@ -7,8 +7,7 @@ import xyz.fycz.myreader.entity.Setting;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.entity.Chapter;
 import xyz.fycz.myreader.greendao.service.ChapterService;
-import xyz.fycz.myreader.util.StringHelper;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawler;
-import xyz.fycz.myreader.crawler.ReadCrawler;
 import xyz.fycz.myreader.util.utils.FileUtils;
 import xyz.fycz.myreader.webapi.CommonApi;
 

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

@@ -11,7 +11,7 @@ import android.view.ViewConfiguration;
 import xyz.fycz.myreader.entity.Setting;
 import xyz.fycz.myreader.greendao.entity.Book;
 import xyz.fycz.myreader.greendao.service.ChapterService;
-import xyz.fycz.myreader.crawler.ReadCrawler;
+import xyz.fycz.myreader.webapi.crawler.ReadCrawler;
 import xyz.fycz.myreader.widget.animation.*;
 
 /**

app/src/main/res/layout/activity_about.xml

@@ -5,7 +5,7 @@
               android:fitsSystemWindows="true"
               xmlns:tools="http://schemas.android.com/tools"
               android:orientation="vertical"
-              tools:context=".ui.about.AboutActivity">
+              tools:context=".ui.activity.AboutActivity">
 
     <include layout="@layout/title_base"/>
 

app/src/main/res/layout/activity_catalog.xml

@@ -6,7 +6,7 @@
               android:layout_height="match_parent"
               android:fitsSystemWindows="true"
               android:orientation="vertical"
-              tools:context="xyz.fycz.myreader.ui.read.catalog.CatalogActivity">
+              tools:context="xyz.fycz.myreader.ui.activity.CatalogActivity">
 
     <RelativeLayout
             android:id="@+id/rl_common_title"

app/src/main/res/layout/activity_fonts.xml

@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:fitsSystemWindows="true"
     android:background="@color/sys_bg2"
-    tools:context="xyz.fycz.myreader.ui.font.FontsActivity">
+    tools:context="xyz.fycz.myreader.ui.activity.FontsActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/activity_main.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    tools:context="xyz.fycz.myreader.ui.home.MainActivity">
+    tools:context="xyz.fycz.myreader.ui.activity.MainActivity">
 
     <RelativeLayout
         android:id="@+id/rl_common_title"

app/src/main/res/layout/activity_read_more_setting.xml

@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:fitsSystemWindows="true"
     android:background="@color/sys_bg2"
-    tools:context="xyz.fycz.myreader.ui.font.FontsActivity">
+    tools:context="xyz.fycz.myreader.ui.activity.FontsActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/activity_read_new.xml

@@ -6,7 +6,7 @@
         android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
         android:fitsSystemWindows="true"
         android:id="@+id/read_activity_new"
-        tools:context="xyz.fycz.myreader.ui.read.ReadActivity">
+        tools:context="xyz.fycz.myreader.ui.activity.ReadActivity">
 
     <RelativeLayout
             android:layout_width="match_parent"

app/src/main/res/layout/activity_search_book.xml

@@ -6,7 +6,7 @@
                 android:layout_height="match_parent"
                 android:background="@color/sys_bg2"
                 android:fitsSystemWindows="true"
-                tools:context="xyz.fycz.myreader.ui.search.SearchBookActivity">
+                tools:context="xyz.fycz.myreader.ui.activity.SearchBookActivity">
 
 
     <LinearLayout

app/src/main/res/layout/fragment_book_store.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="horizontal"
-    tools:context="xyz.fycz.myreader.ui.home.bookstore.BookStoreFragment">
+    tools:context="xyz.fycz.myreader.ui.fragment.BookStoreFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_type_list"

app/src/main/res/layout/fragment_bookcase.xml

@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
-        tools:context="xyz.fycz.myreader.ui.home.bookcase.BookcaseFragment">
+        tools:context="xyz.fycz.myreader.ui.fragment.BookcaseFragment">
     <com.scwang.smartrefresh.header.MaterialHeader
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>

app/src/main/res/layout/fragment_bookmark.xml

@@ -3,7 +3,7 @@
                 android:id="@+id/rl_bookmark"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:context="xyz.fycz.myreader.ui.read.catalog.bookmark.BookMarkFragment">
+                tools:context="xyz.fycz.myreader.ui.fragment.BookMarkFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <ListView

app/src/main/res/layout/fragment_catalog.xml

@@ -3,7 +3,7 @@
                 android:id="@+id/rl_catalog"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
-                tools:context="xyz.fycz.myreader.ui.read.catalog.CatalogFragment">
+                tools:context="xyz.fycz.myreader.ui.fragment.CatalogFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <ListView

app/src/main/resources/bookcrawler.properties

@@ -1,5 +1,5 @@
-tianlai=xyz.fycz.myreader.crawler.TianLaiReadCrawler
+tianlai=xyz.fycz.myreader.webapi.crawler.TianLaiReadCrawler
-fynovel=xyz.fycz.myreader.crawler.FYReadCrawler
+fynovel=xyz.fycz.myreader.webapi.crawler.FYReadCrawler
-biquge44=xyz.fycz.myreader.crawler.BiQuGe44ReadCrawler
+biquge44=xyz.fycz.myreader.webapi.crawler.BiQuGe44ReadCrawler
-biquge=xyz.fycz.myreader.crawler.BiQuGeReadCrawler
+biquge=xyz.fycz.myreader.webapi.crawler.BiQuGeReadCrawler
-pinshu=xyz.fycz.myreader.crawler.PinShuReadCrawler
+pinshu=xyz.fycz.myreader.webapi.crawler.PinShuReadCrawler