feat(location): add onPresenterCircle method

xujiaji · Oct 12, 2018 · 9de45fb · 9de45fb
1 parent 4a947d8
commit 9de45fb
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![banner](display/banner.png)
-[![GitHub release](https://img.shields.io/badge/size-12%20kb-green.svg)](https://github.com/xujiaji/XMVP/releases) [![GitHub release](https://img.shields.io/badge/bintray-1.2.2-brightgreen.svg)](https://bintray.com/xujiaji/maven/xmvp/1.2.2) 
+[![GitHub release](https://img.shields.io/badge/size-12%20kb-green.svg)](https://github.com/xujiaji/XMVP/releases) [![GitHub release](https://img.shields.io/badge/bintray-1.2.3-brightgreen.svg)](https://bintray.com/xujiaji/maven/xmvp/1.2.3) 
 
 # XMVP
 This is a mvp framework to help you easily achieve mvp structure.
@@ -8,6 +8,8 @@ This is a mvp framework to help you easily achieve mvp structure.
 
 ## Update
 ```
+> v1.2.3 add onPresenterCircle method
+
 > v1.2.2 Fragment lazy load data, and add cycle function in View. Fix some bug.
 
 > v1.1.5 Can not create Presenter after fixing obfuscation
@@ -34,7 +36,7 @@ This is a mvp framework to help you easily achieve mvp structure.
 ### First, Add xmvp dependency
 ```
 dependencies {
-    compile 'com.github.xujiaji:xmvp:1.2.2'
+    compile 'com.github.xujiaji:xmvp:1.2.3'
 }
 ```
 or

diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ ext {
     siteUrl = 'https://github.com/xujiaji/XMVP'
     gitUrl = 'https://github.com/xujiaji/XMVP.git'
 
-    libraryVersion = '1.2.2'
+    libraryVersion = '1.2.3'
 
     developerId = 'xujiaji'
     developerName = 'xujiaji'

diff --git a/xmvp/src/main/java/io/xujiaji/xmvp/view/base/XBaseActivity.java b/xmvp/src/main/java/io/xujiaji/xmvp/view/base/XBaseActivity.java
@@ -30,11 +30,12 @@
  * 项目中Activity的基类 <br />
  * base Activity class
  */
-public abstract class XBaseActivity<T extends XBasePresenter> extends AppCompatActivity implements XActivityCycle {
+public abstract class XBaseActivity<T extends XBasePresenter> extends AppCompatActivity implements XActivityCycle<T> {
     protected T presenter;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        onBeforeCreateCircle();
         try{
             presenter = GenericHelper.newPresenter(this);
             if (presenter != null) {
@@ -44,7 +45,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             e.printStackTrace();
         }
 
-        onBeforeCreateCircle();
+        onPresenterCircle(presenter);
         super.onCreate(savedInstanceState);
 
         beforeSetContentView();
@@ -97,6 +98,11 @@ public void onBeforeCreateCircle() {
 
     }
 
+    @Override
+    public void onPresenterCircle(T presenter) {
+
+    }
+
     /**
      * 处理上个页面传递过来的值 <br />
      * Handle passed the previous page intent when first enter the page

diff --git a/xmvp/src/main/java/io/xujiaji/xmvp/view/base/XBaseFragment.java b/xmvp/src/main/java/io/xujiaji/xmvp/view/base/XBaseFragment.java
@@ -33,7 +33,7 @@
  * 项目中Fragment的基类 <br /> base Fragment class <br />
  * 部分代码参照(reference)：https://github.com/xmagicj/LazyFragment/blob/master/app/src/main/java/com/xmagicj/android/lazyfragment/BaseFragment.java
  */
-public abstract class XBaseFragment<T extends XBasePresenter> extends Fragment implements XFragViewCycle {
+public abstract class XBaseFragment<T extends XBasePresenter> extends Fragment implements XFragViewCycle<T> {
 
     protected T presenter;
 
@@ -84,6 +84,7 @@ public void onAttach(Context context) {
             e.printStackTrace();
         }
 
+        onPresenterCircle(presenter);
     }
 
     @Override
@@ -167,6 +168,11 @@ public void onInvisible() {
     @Override
     public void onBeforeCreateCircle() { }
 
+    @Override
+    public void onPresenterCircle(T presenter) {
+
+    }
+
     @Override
     public void onBundleHandle(@NonNull Bundle savedInstanceState) { }
 

diff --git a/xmvp/src/main/java/io/xujiaji/xmvp/view/base/v4/XBaseFragment.java b/xmvp/src/main/java/io/xujiaji/xmvp/view/base/v4/XBaseFragment.java
@@ -19,7 +19,7 @@
  * 项目中Fragment的基类 <br /> base Fragment class <br />
  * 部分代码参照(reference)：https://github.com/xmagicj/LazyFragment/blob/master/app/src/main/java/com/xmagicj/android/lazyfragment/BaseFragment.java
  */
-public abstract class XBaseFragment<T extends XBasePresenter> extends Fragment implements XFragViewCycle {
+public abstract class XBaseFragment<T extends XBasePresenter> extends Fragment implements XFragViewCycle<T> {
 
     protected T presenter;
 
@@ -70,6 +70,7 @@ public void onAttach(Context context) {
             e.printStackTrace();
         }
 
+        onPresenterCircle(presenter);
     }
 
     @Override
@@ -153,6 +154,11 @@ public void onInvisible() {
     @Override
     public void onBeforeCreateCircle() { }
 
+    @Override
+    public void onPresenterCircle(T presenter) {
+
+    }
+
     @Override
     public void onBundleHandle(@NonNull Bundle savedInstanceState) { }
 

diff --git a/xmvp/src/main/java/io/xujiaji/xmvp/view/interfaces/XActivityCycle.java b/xmvp/src/main/java/io/xujiaji/xmvp/view/interfaces/XActivityCycle.java
@@ -19,12 +19,14 @@
 import android.content.Intent;
 import android.support.annotation.NonNull;
 
+import io.xujiaji.xmvp.presenters.XBasePresenter;
+
 /**
  * author: xujiaji
  * created on: 2018/9/11 15:05
  * description: 定义Activity View相关周期 <br /> Define Activity View related Cycle
  */
-public interface XActivityCycle extends XViewCycle {
+public interface XActivityCycle<T extends XBasePresenter> extends XViewCycle<T> {
     /**
      * 处理上个页面传递过来的数据 <br /> Handle the data passed from the previous page
      */

diff --git a/xmvp/src/main/java/io/xujiaji/xmvp/view/interfaces/XFragViewCycle.java b/xmvp/src/main/java/io/xujiaji/xmvp/view/interfaces/XFragViewCycle.java
@@ -20,12 +20,14 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
+import io.xujiaji.xmvp.presenters.XBasePresenter;
+
 /**
  * author: xujiaji
  * created on: 2018/9/4 10:57
  * description: 定义Fragment View相关周期 <br /> Define Fragment View related Cycle
  */
-public interface XFragViewCycle extends XViewCycle {
+public interface XFragViewCycle<T extends XBasePresenter> extends XViewCycle<T> {
 
     /**
      * 处理{@link Fragment#getArguments()} 的值，如果有才会调用  <br /> Handle the value of {@link Fragment#getArguments()} , if it is there, it will be called

diff --git a/xmvp/src/main/java/io/xujiaji/xmvp/view/interfaces/XViewCycle.java b/xmvp/src/main/java/io/xujiaji/xmvp/view/interfaces/XViewCycle.java
@@ -19,18 +19,22 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
+import io.xujiaji.xmvp.presenters.XBasePresenter;
+
 /**
  * author: xujiaji
  * created on: 2018/9/4 10:57
  * description: 定义View相关周期 <br /> Define View related Cycle
  */
-public interface XViewCycle {
+public interface XViewCycle<T extends XBasePresenter> {
 
     /**
      * 在 super {@link android.app.Activity#onCreate(Bundle)}之前被调用              <br />  will be called before super class {@link android.app.Activity#onCreate(Bundle)} called
      */
     void onBeforeCreateCircle();
 
+    void onPresenterCircle(T presenter);
+
     /**
      * 在 super {@link android.app.Activity#onCreate(Bundle)}之前被调用，并且有Bundle <br />  will be called before super class {@link android.app.Activity#onCreate(Bundle)} called
      * @param savedInstanceState 该参数不可能为null                                  <br /> this parameter cannot be null