Remove RxCache, main interface caching logic changes

gongyoyo · Nov 2, 2016 · 0dfd12b · 0dfd12b
1 parent 50812dd
commit 0dfd12b
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 247 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,7 +19,7 @@ android {
 
     defaultConfig {
         applicationId "com.hotbitmapgg.ohmybilibili"
-        minSdkVersion 21
+        minSdkVersion 19
         targetSdkVersion 24
         versionCode props.getAt("versionCode") as int
         versionName props['versionName']
@@ -93,8 +93,6 @@ dependencies {
     compile 'com.miguelcatalan:materialsearchview:1.4.0'
     compile 'com.bilibili:magicasakura:0.1.1@aar'
     compile 'jp.wasabeef:glide-transformations:2.0.1'
-    compile "com.github.VictorAlbertos.RxCache:runtime:1.6.4"
-    compile 'com.github.VictorAlbertos.Jolyglot:gson:0.0.3'
     compile 'com.jakewharton:butterknife:8.4.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
 }

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/BilibiliApp.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/BilibiliApp.java
@@ -7,7 +7,6 @@
 
 import com.bilibili.magicasakura.utils.ThemeUtils;
 import com.facebook.stetho.Stetho;
-import com.hotbitmapgg.ohmybilibili.rx.cache.Repository;
 import com.hotbitmapgg.ohmybilibili.utils.ThemeHelper;
 
 /**
@@ -21,8 +20,6 @@ public class BilibiliApp extends Application implements ThemeUtils.switchColor
 
     public static BilibiliApp mInstance;
 
-    private Repository repository;
-
     @Override
     public void onCreate()
     {
@@ -37,8 +34,6 @@ private void init()
     {
         // 初始化主题切换
         ThemeUtils.setSwitchColor(this);
-        //初始化全局RxCache
-        repository = Repository.init(getFilesDir());
         //初始化Stetho调试工具
         Stetho.initialize(
                 Stetho.newInitializerBuilder(this)
@@ -47,13 +42,6 @@ private void init()
                         .build());
     }
 
-    public Repository getRepository()
-    {
-
-        return repository;
-    }
-
-
     public static BilibiliApp getInstance()
     {
 

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/module/common/MainActivity.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/module/common/MainActivity.java
@@ -38,8 +38,7 @@
  * <p/>
  * MainActivity
  */
-public class MainActivity extends RxBaseActivity implements
-        NavigationView.OnNavigationItemSelectedListener
+public class MainActivity extends RxBaseActivity implements NavigationView.OnNavigationItemSelectedListener
 {
 
     @BindView(R.id.drawer_layout)
@@ -174,14 +173,12 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item)
 
             case R.id.item_download:
                 // 离线缓存
-                startActivity(new Intent(MainActivity.this,
-                        OffLineDownloadActivity.class));
+                startActivity(new Intent(MainActivity.this, OffLineDownloadActivity.class));
                 return true;
 
             case R.id.item_vip:
                 //大会员
-                startActivity(new Intent(MainActivity.this,
-                        VipActivity.class));
+                startActivity(new Intent(MainActivity.this, VipActivity.class));
                 return true;
 
             case R.id.item_favourite:

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/module/home/bangumi/HomeBangumiFragment.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/module/home/bangumi/HomeBangumiFragment.java
@@ -6,7 +6,6 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import com.hotbitmapgg.ohmybilibili.BilibiliApp;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.section.HomeBangumiBannerSection;
 import com.hotbitmapgg.ohmybilibili.adapter.section.HomeBangumiBobySection;
@@ -17,6 +16,7 @@
 import com.hotbitmapgg.ohmybilibili.base.RxLazyFragment;
 import com.hotbitmapgg.ohmybilibili.entity.bangumi.BangumiAppIndexInfo;
 import com.hotbitmapgg.ohmybilibili.entity.bangumi.BangumiRecommendInfo;
+import com.hotbitmapgg.ohmybilibili.network.RetrofitHelper;
 import com.hotbitmapgg.ohmybilibili.utils.SnackbarUtil;
 import com.hotbitmapgg.ohmybilibili.widget.CustomEmptyView;
 import com.hotbitmapgg.ohmybilibili.widget.banner.BannerEntity;
@@ -26,7 +26,6 @@
 import java.util.List;
 
 import butterknife.BindView;
-import io.rx_cache.Reply;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Func1;
@@ -160,32 +159,31 @@ private void clearData()
     protected void loadData()
     {
 
-        BilibiliApp.getInstance().getRepository()
-                .getBangumiAppIndex(mIsCacheRefresh)
+        RetrofitHelper.getBangumiAppIndexApi()
+                .getBangumiAppIndex()
                 .compose(bindToLifecycle())
-                .map(Reply::getData)
-                .flatMap(new Func1<BangumiAppIndexInfo,Observable<Reply<BangumiRecommendInfo>>>()
+                .flatMap(new Func1<BangumiAppIndexInfo,Observable<BangumiRecommendInfo>>()
                 {
 
                     @Override
-                    public Observable<Reply<BangumiRecommendInfo>> call(BangumiAppIndexInfo bangumiAppIndexInfo)
+                    public Observable<BangumiRecommendInfo> call(BangumiAppIndexInfo bangumiAppIndexInfo)
                     {
 
                         banners.addAll(bangumiAppIndexInfo.getResult().getAd().getHead());
                         bangumibobys.addAll(bangumiAppIndexInfo.getResult().getAd().getBody());
                         seasonNewBangumis.addAll(bangumiAppIndexInfo.getResult().getPrevious().getList());
                         season = bangumiAppIndexInfo.getResult().getPrevious().getSeason();
                         newBangumiSerials.addAll(bangumiAppIndexInfo.getResult().getSerializing());
-                        return BilibiliApp.getInstance().getRepository().getBangumiRecommended(mIsCacheRefresh);
+                        return RetrofitHelper.getBangumiRecommendedApi().getBangumiRecommended();
                     }
                 })
                 .compose(bindToLifecycle())
-                .map(bangumiRecommendReply -> bangumiRecommendReply.getData().getResult())
+                .map(BangumiRecommendInfo::getResult)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(bangumiDetailsRecommend -> {
+                .subscribe(resultBeans -> {
 
-                    bangumiRecommends.addAll(bangumiDetailsRecommend);
+                    bangumiRecommends.addAll(resultBeans);
                     finishTask();
                 }, throwable -> {
                     initEmptyView();

diff --git a/...src/main/java/com/hotbitmapgg/ohmybilibili/module/home/discover/HomeDiscoverFragment.java b/...src/main/java/com/hotbitmapgg/ohmybilibili/module/home/discover/HomeDiscoverFragment.java
@@ -9,13 +9,13 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.hotbitmapgg.ohmybilibili.BilibiliApp;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.base.RxLazyFragment;
 import com.hotbitmapgg.ohmybilibili.entity.discover.HotSearchTag;
 import com.hotbitmapgg.ohmybilibili.module.common.BrowserActivity;
 import com.hotbitmapgg.ohmybilibili.module.entry.GameCentreActivity;
 import com.hotbitmapgg.ohmybilibili.module.search.TotalStationSearchActivity;
+import com.hotbitmapgg.ohmybilibili.network.RetrofitHelper;
 import com.hotbitmapgg.ohmybilibili.utils.ConstantUtil;
 import com.zhy.view.flowlayout.FlowLayout;
 import com.zhy.view.flowlayout.TagAdapter;
@@ -81,11 +81,10 @@ public void finishCreateView(Bundle state)
     private void getTags()
     {
 
-        BilibiliApp.getInstance()
-                .getRepository()
-                .getHotSearchTags(false)
+       RetrofitHelper.getHotSearchTagsApi()
+                .getHotSearchTags()
                 .compose(bindToLifecycle())
-                .map(hotSearchTagReply -> hotSearchTagReply.getData().getList())
+                .map(HotSearchTag::getList)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(listBeans -> {

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/module/home/live/HomeLiveFragment.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/module/home/live/HomeLiveFragment.java
@@ -7,10 +7,10 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import com.hotbitmapgg.ohmybilibili.BilibiliApp;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.LiveAppIndexAdapter;
 import com.hotbitmapgg.ohmybilibili.base.RxLazyFragment;
+import com.hotbitmapgg.ohmybilibili.network.RetrofitHelper;
 import com.hotbitmapgg.ohmybilibili.utils.SnackbarUtil;
 import com.hotbitmapgg.ohmybilibili.widget.CustomEmptyView;
 
@@ -106,15 +106,14 @@ protected void initRefreshLayout()
     protected void loadData()
     {
 
-        BilibiliApp.getInstance()
-                .getRepository()
-                .getLiveAppIndex(mIsCacheRefresh)
+        RetrofitHelper.getLiveAppIndexApi()
+                .getLiveAppIndex()
                 .compose(bindToLifecycle())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(liveAppIndexInfoReply -> {
+                .subscribe(liveAppIndexInfo -> {
 
-                    mLiveAppIndexAdapter.setLiveInfo(liveAppIndexInfoReply.getData());
+                    mLiveAppIndexAdapter.setLiveInfo(liveAppIndexInfo);
                     finishTask();
                 }, throwable -> {
                     initEmptyView();

diff --git a/...main/java/com/hotbitmapgg/ohmybilibili/module/home/recommend/HomeRecommendedFragment.java b/...main/java/com/hotbitmapgg/ohmybilibili/module/home/recommend/HomeRecommendedFragment.java
@@ -7,7 +7,6 @@
 import android.text.TextUtils;
 import android.view.View;
 
-import com.hotbitmapgg.ohmybilibili.BilibiliApp;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.section.HomeRecommendActivityCenterSection;
 import com.hotbitmapgg.ohmybilibili.adapter.section.HomeRecommendBannerSection;
@@ -17,6 +16,7 @@
 import com.hotbitmapgg.ohmybilibili.base.RxLazyFragment;
 import com.hotbitmapgg.ohmybilibili.entity.recommend.RecommendBannerInfo;
 import com.hotbitmapgg.ohmybilibili.entity.recommend.RecommendInfo;
+import com.hotbitmapgg.ohmybilibili.network.RetrofitHelper;
 import com.hotbitmapgg.ohmybilibili.utils.ConstantUtil;
 import com.hotbitmapgg.ohmybilibili.utils.SnackbarUtil;
 import com.hotbitmapgg.ohmybilibili.widget.CustomEmptyView;
@@ -27,7 +27,6 @@
 import java.util.List;
 
 import butterknife.BindView;
-import io.rx_cache.Reply;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Func1;
@@ -139,24 +138,23 @@ protected void initRefreshLayout()
     protected void loadData()
     {
 
-        BilibiliApp.getInstance().getRepository()
-                .getRecommendedBannerInfo(mIsCacheRefresh)
+        RetrofitHelper.getHomeRecommendedApi()
+                .getRecommendedBannerInfo()
                 .compose(bindToLifecycle())
-                .map(recommendBannerInfoReply -> recommendBannerInfoReply.getData().getData())
-                .flatMap(new Func1<List<RecommendBannerInfo.DataBean>,Observable<Reply<RecommendInfo>>>()
+                .map(RecommendBannerInfo::getData)
+                .flatMap(new Func1<List<RecommendBannerInfo.DataBean>,Observable<RecommendInfo>>()
                 {
 
                     @Override
-                    public Observable<Reply<RecommendInfo>> call(List<RecommendBannerInfo.DataBean> dataBeans)
+                    public Observable<RecommendInfo> call(List<RecommendBannerInfo.DataBean> dataBeans)
                     {
 
                         recommendBanners.addAll(dataBeans);
-                        convertBanner();
-                        return BilibiliApp.getInstance().getRepository().getRecommendedInfo(mIsCacheRefresh);
+                        return RetrofitHelper.getHomeRecommendedApi().getRecommendedInfo();
                     }
                 })
                 .compose(bindToLifecycle())
-                .map(recommendInfoReply -> recommendInfoReply.getData().getResult())
+                .map(RecommendInfo::getResult)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(resultBeans -> {
@@ -186,6 +184,7 @@ protected void finishTask()
         mSwipeRefreshLayout.setRefreshing(false);
         mIsRefreshing = false;
         hideEmptyView();
+        convertBanner();
         mSectionedAdapter.addSection(new HomeRecommendBannerSection(banners));
 
         int size = results.size();

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/rx/cache/CacheProviders.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/rx/cache/CacheProviders.java