Add AOP AutoRestore

Zweihui · Jul 19, 2018 · dad8c43 · dad8c43
1 parent a355fb0
commit dad8c43
Show file tree

Hide file tree

Showing 39 changed files with 1,645 additions and 122 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,5 @@
 import com.zwh.plugin.AspectjPlugin
+import com.zwh.plugin.SaveStatePlugin
 
 apply plugin: 'com.android.application'
 apply from: 'tinkerpatch.gradle'
@@ -33,6 +34,11 @@ android {
         testInstrumentationRunner rootProject.ext.dependencies["androidJUnitRunner"]
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [BUGLY_APP_CHANNEL_VALUE: "other"]
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [ serializer : "gson" ]
+            }
+        }
     }
 
     packagingOptions {
@@ -188,5 +194,6 @@ dependencies {
 }
 
 apply plugin: AspectjPlugin
+apply plugin: SaveStatePlugin
 apply plugin: 'com.android.application'
 apply plugin: 'org.greenrobot.greendao'
diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/activity/AuthorDetailActivity.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/activity/AuthorDetailActivity.java
@@ -14,6 +14,7 @@
 import com.apt.TRouter;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.UiUtils;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.apt.Extra;
 import com.zwh.annotation.apt.Router;
 import com.zwh.annotation.aspect.CheckLogin;
@@ -55,6 +56,7 @@
 public class AuthorDetailActivity extends BaseActivity<AuthorDetailPresenter> implements AuthorDetailContract.View {
 
     @Extra(Constants.AUTHOR_ID)
+    @AutoRestore
     public int authorId;
     @BindView(R.id.toolbar)
     Toolbar mToolbar;
@@ -86,18 +88,10 @@ public int initView(Bundle savedInstanceState) {
 
     @Override
     public void initData(Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
-            authorId = savedInstanceState.getInt(Constants.AUTHOR_ID);
-        }
         mPresenter.getAuthorTabs(authorId);
         mPresenter.getShareInfo(authorId);
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(Constants.AUTHOR_ID, authorId);
-        super.onSaveInstanceState(outState);
-    }
 
     @Override
     protected void initToolBar() {

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/activity/CategoryActivity.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/activity/CategoryActivity.java
@@ -15,6 +15,7 @@
 
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.http.imageloader.glide.ImageConfigImpl;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.apt.Extra;
 import com.zwh.annotation.apt.Router;
 import com.zwh.mvparms.eyepetizer.R;
@@ -51,6 +52,7 @@ public class CategoryActivity extends BaseActivity{
     NestedScrollView mNestedScrollView;
 
     @Extra(Constants.CATEGORY_DATA)
+    @AutoRestore
     public ArrayList<Category> list;
 
     @Extra(Constants.CATEGORY_DATA_POSITION)
@@ -62,12 +64,6 @@ public void setupActivityComponent(AppComponent appComponent) {
 
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putParcelableArrayList(Constants.CATEGORY_DATA,list);
-        super.onSaveInstanceState(outState);
-    }
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -78,17 +74,14 @@ protected boolean isDisplayHomeAsUpEnabled() {
         return true;
     }
 
+
     @Override
     public int initView(Bundle savedInstanceState) {
         return R.layout.activity_home;
     }
 
     @Override
     public void initData(Bundle savedInstanceState) {
-        if (savedInstanceState != null){
-            list = savedInstanceState.getParcelableArrayList(Constants.CATEGORY_DATA);
-            finish();
-        }
         mFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/activity/VideoDetailActivity.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/activity/VideoDetailActivity.java
@@ -31,6 +31,7 @@
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoPlayer;
 import com.tbruyelle.rxpermissions2.RxPermissions;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.apt.Extra;
 import com.zwh.annotation.apt.Router;
 import com.zwh.annotation.apt.SceneTransition;
@@ -97,6 +98,7 @@ public class VideoDetailActivity extends BaseActivity<VideoDetailPresenter> impl
     @BindView(R.id.rl_screen)
     FrameLayout rlScreen;
     @Extra(Constants.VIDEO_INFO)
+    @AutoRestore
     public VideoListInfo.Video videoInfo;
     @SceneTransition(Constants.TRANSLATE_VIEW)
     @BindView(R.id.detail_player)
@@ -169,9 +171,6 @@ public int initView(Bundle savedInstanceState) {
 
     @Override
     public void initData(Bundle savedInstanceState) {
-        if (savedInstanceState != null){
-            videoInfo = (VideoListInfo.Video) savedInstanceState.getSerializable(Constants.VIDEO_INFO);
-        }
         initMedia();
         if (videoInfo.getData().getConsumption() !=null ){
             initRecyclerView();

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AttentionFragment.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AttentionFragment.java
@@ -19,6 +19,7 @@
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.StringUtils;
 import com.jess.arms.utils.UiUtils;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.aspect.SingleClick;
 import com.zwh.mvparms.eyepetizer.R;
 import com.zwh.mvparms.eyepetizer.app.EventBusTags;
@@ -56,7 +57,8 @@ public class AttentionFragment extends BaseLazyLoadFragment<AttentionPresenter>
     private BaseQuickAdapter adapter;
     private List<AttentionInfo.ItemListBeanX> data = new ArrayList<>();
     private List<MyAttentionEntity> authors = new ArrayList<>();
-    private String type = "";
+    @AutoRestore
+    public String type = "";
 
     public static AttentionFragment newInstance(Category category) {
         Bundle arguments = new Bundle();
@@ -66,11 +68,6 @@ public static AttentionFragment newInstance(Category category) {
         return fragment;
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString("type", type);
-    }
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorAlbumFragment.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorAlbumFragment.java
@@ -15,6 +15,7 @@
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.jess.arms.base.BaseLazyLoadFragment;
 import com.jess.arms.di.component.AppComponent;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.aspect.SingleClick;
 import com.zwh.mvparms.eyepetizer.R;
 import com.zwh.mvparms.eyepetizer.app.constants.Constants;
@@ -45,7 +46,8 @@ public class AuthorAlbumFragment extends BaseLazyLoadFragment<AuthorDetailPresen
     private AuthorAlbumAdapter adapter;
     private List<AuthorAlbumInfo.Album> data = new ArrayList<>();
     private View footView;
-    private int id;
+    @AutoRestore
+    public int id;
 
 
     public static AuthorAlbumFragment newInstance(int id) {
@@ -66,11 +68,7 @@ public void onSaveInstanceState(Bundle outState) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (savedInstanceState != null) {
-            id = savedInstanceState.getInt(Constants.AUTHOR_ID);
-        }else {
-            id = (int) getArguments().get(Constants.AUTHOR_ID);
-        }
+        id = (int) getArguments().get(Constants.AUTHOR_ID);
     }
 
     @Override

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorDynamicFragment.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorDynamicFragment.java
@@ -16,6 +16,7 @@
 import com.google.gson.Gson;
 import com.jess.arms.base.BaseLazyLoadFragment;
 import com.jess.arms.di.component.AppComponent;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.aspect.SingleClick;
 import com.zwh.mvparms.eyepetizer.R;
 import com.zwh.mvparms.eyepetizer.app.constants.Constants;
@@ -48,8 +49,8 @@ public class AuthorDynamicFragment extends BaseLazyLoadFragment<AuthorDetailPres
     private List<AuthorDynamicInfo.Dynamic> data = new ArrayList<>();
     private View footView;
     AppComponent appComponent ;
-
-    private int id;
+    @AutoRestore
+    public int id;
 
 
     public static AuthorDynamicFragment newInstance(int id) {
@@ -60,21 +61,10 @@ public static AuthorDynamicFragment newInstance(int id) {
         return fragment;
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(Constants.AUTHOR_ID, id);
-        getArguments().putBundle(Constants.AUTHOR_ID, outState);
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (savedInstanceState != null) {
-            id = savedInstanceState.getInt(Constants.AUTHOR_ID);
-        }else {
-            id = (int) getArguments().get(Constants.AUTHOR_ID);
-        }
+        id = (int) getArguments().get(Constants.AUTHOR_ID);
     }
 
     @Override

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorIndexFragment.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorIndexFragment.java
@@ -19,6 +19,7 @@
 import com.jess.arms.base.BaseLazyLoadFragment;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.http.imageloader.glide.ImageConfigImpl;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.aspect.SingleClick;
 import com.zwh.mvparms.eyepetizer.R;
 import com.zwh.mvparms.eyepetizer.app.EventBusTags;
@@ -58,8 +59,8 @@ public class AuthorIndexFragment extends BaseLazyLoadFragment<AuthorDetailPresen
     private List<AuthorIndexInfo.ItemListBeanX> data = new ArrayList<>();
     private AppComponent appComponent;
     private View headView;
-
-    private int id;
+    @AutoRestore
+    public int id;
 
 
     public static AuthorIndexFragment newInstance(int id) {
@@ -70,21 +71,10 @@ public static AuthorIndexFragment newInstance(int id) {
         return fragment;
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(Constants.AUTHOR_ID, id);
-        getArguments().putBundle(Constants.AUTHOR_ID, outState);
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (savedInstanceState != null) {
-            id = savedInstanceState.getInt(Constants.AUTHOR_ID);
-        }else {
-            id = (int) getArguments().get(Constants.AUTHOR_ID);
-        }
+        id = (int) getArguments().get(Constants.AUTHOR_ID);
     }
 
     @Override

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorVideoFragment.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/AuthorVideoFragment.java
@@ -15,6 +15,7 @@
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.jess.arms.base.BaseLazyLoadFragment;
 import com.jess.arms.di.component.AppComponent;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.aspect.SingleClick;
 import com.zwh.mvparms.eyepetizer.R;
 import com.zwh.mvparms.eyepetizer.app.constants.Constants;
@@ -46,8 +47,8 @@ public class AuthorVideoFragment extends BaseLazyLoadFragment<AuthorDetailPresen
     private List<VideoListInfo.Video> data = new ArrayList<>();
     private View footView;
 
-
-    private int id;
+    @AutoRestore
+    public int id;
 
 
     public static AuthorVideoFragment newInstance(int id) {
@@ -58,21 +59,10 @@ public static AuthorVideoFragment newInstance(int id) {
         return fragment;
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(Constants.AUTHOR_ID, id);
-        getArguments().putBundle(Constants.AUTHOR_ID, outState);
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (savedInstanceState != null) {
-            id = savedInstanceState.getInt(Constants.AUTHOR_ID);
-        }else {
-            id = (int) getArguments().get(Constants.AUTHOR_ID);
-        }
+        id = (int) getArguments().get(Constants.AUTHOR_ID);
     }
 
     @Override

diff --git a/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/CacheFragment.java b/app/src/main/java/com/zwh/mvparms/eyepetizer/mvp/ui/fragment/CacheFragment.java
@@ -27,6 +27,7 @@
 import com.liulishuo.filedownloader.FileDownloader;
 import com.liulishuo.filedownloader.model.FileDownloadStatus;
 import com.tbruyelle.rxpermissions2.RxPermissions;
+import com.zwh.annotation.apt.AutoRestore;
 import com.zwh.annotation.aspect.SingleClick;
 import com.zwh.mvparms.eyepetizer.R;
 import com.zwh.mvparms.eyepetizer.app.EventBusTags;
@@ -67,7 +68,8 @@ public class CacheFragment extends BaseFragment {
     private SwipeRefreshLayout mSwipeRefresh;
     private CacheAdapter adapter;
     private List<VideoDownLoadInfo> data = new ArrayList<>();
-    private String type;
+    @AutoRestore
+    public String type;
     private Gson mGson;
     private int currentPosition;
     private int changePosition;
@@ -84,19 +86,10 @@ public static CacheFragment newInstance(String type) {
     }
 
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString("type", type);
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         type = (String) getArguments().get(Constants.TYPE);
-        if (savedInstanceState != null) {
-            type = savedInstanceState.getString("type");
-        }
     }
 
     @Override