replace the package structure ,add Mvp ViewState

朱显松
1 parent 7fb11524
Showing 24 changed files with 239 additions and 28 deletions
.idea/gradle.xml
app/src/main/java/com/cnlive/libs/demo/RequestTest.java
app/src/main/java/com/cnlive/libs/demo/data/model/BaseInfo.java
app/src/main/java/com/cnlive/libs/demo/data/network/testapi/ApiRequest.java
app/src/main/java/com/cnlive/libs/demo/mvptest/frame/presenter/LaunchPresenter.java
app/src/main/java/com/cnlive/libs/demo/mvptest/ui/activity/LaunchActivity.java
app/src/main/java/com/cnlive/libs/demo/viewstate/StateActivity.java
app/src/main/java/com/cnlive/libs/demo/viewstate/StatePresenter.java
app/src/main/java/com/cnlive/libs/demo/viewstate/StateView.java
app/src/main/java/com/cnlive/libs/demo/viewstate/ViewState.java
cnlive/src/main/java/com/cnlive/libs/base/model/IBaseInfo.java → cnlive/src/main/java/com/cnlive/libs/base/data/model/IBaseInfo.java
cnlive/src/main/java/com/cnlive/libs/base/network/ClientInterceptor.java → cnlive/src/main/java/com/cnlive/libs/base/data/network/ClientInterceptor.java
cnlive/src/main/java/com/cnlive/libs/base/network/NetworkUtil.java → cnlive/src/main/java/com/cnlive/libs/base/data/network/NetworkUtil.java
cnlive/src/main/java/com/cnlive/libs/base/network/RetrofitUtil.java → cnlive/src/main/java/com/cnlive/libs/base/data/network/RetrofitUtil.java
cnlive/src/main/java/com/cnlive/libs/base/network/Subscriber.java → cnlive/src/main/java/com/cnlive/libs/base/data/network/Subscriber.java
cnlive/src/main/java/com/cnlive/libs/base/network/Tls12SocketFactory.java → cnlive/src/main/java/com/cnlive/libs/base/data/network/Tls12SocketFactory.java
cnlive/src/main/java/com/cnlive/libs/base/network/TransformUtil.java → cnlive/src/main/java/com/cnlive/libs/base/data/network/TransformUtil.java
cnlive/src/main/java/com/cnlive/libs/base/util/ReflectUtil.java → cnlive/src/main/java/com/cnlive/libs/base/frame/ReflectUtil.java
cnlive/src/main/java/com/cnlive/libs/base/activity/MvpActivity.java → cnlive/src/main/java/com/cnlive/libs/base/frame/activity/MvpActivity.java
cnlive/src/main/java/com/cnlive/libs/base/activity/MvpBindingActivity.java → cnlive/src/main/java/com/cnlive/libs/base/frame/activity/MvpBindingActivity.java
@@ -10,8 +10,6 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/cnlive" />
-            <option value="$PROJECT_DIR$/testlib" />
-            <option value="$PROJECT_DIR$/testlib2" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
@@ -2,8 +2,8 @@ package com.cnlive.libs.demo;
  
 import android.content.Context;
  
-import com.cnlive.libs.base.network.RetrofitUtil;
-import com.cnlive.libs.base.network.Subscriber;
+import com.cnlive.libs.base.data.network.RetrofitUtil;
+import com.cnlive.libs.base.data.network.Subscriber;
 import com.cnlive.libs.demo.data.model.AppInfo;
 import com.cnlive.libs.demo.data.network.testapi.ApiRequest;
 import com.cnlive.libs.demo.data.network.testapi.ApiService;
 package com.cnlive.libs.demo.data.model;
  
-import com.cnlive.libs.base.model.IBaseInfo;
+import com.cnlive.libs.base.data.model.IBaseInfo;
 import com.cnlive.libs.demo.RequestTest;
  
  
 package com.cnlive.libs.demo.data.network.testapi;
  
  
-import com.cnlive.libs.base.model.IBaseInfo;
-import com.cnlive.libs.base.network.RetrofitUtil;
-import com.cnlive.libs.base.network.Subscriber;
+import com.cnlive.libs.base.data.model.IBaseInfo;
+import com.cnlive.libs.base.data.network.RetrofitUtil;
+import com.cnlive.libs.base.data.network.Subscriber;
 import com.cnlive.libs.demo.Config;
  
 import io.reactivex.Observable;
@@ -2,7 +2,7 @@ package com.cnlive.libs.demo.mvptest.frame.presenter;
  
 import android.content.Context;
  
-import com.cnlive.libs.base.network.Subscriber;
+import com.cnlive.libs.base.data.network.Subscriber;
 import com.cnlive.libs.base.util.LogUtil;
 import com.cnlive.libs.base.util.TimerUtil;
 import com.cnlive.libs.demo.Config;
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
  
-import com.cnlive.libs.base.activity.MvpBindingActivity;
+import com.cnlive.libs.base.frame.activity.MvpBindingActivity;
 import com.cnlive.libs.demo.R;
 import com.cnlive.libs.demo.databinding.ActivityLaunchBinding;
 import com.cnlive.libs.demo.mvptest.frame.presenter.LaunchPresenter;
+package com.cnlive.libs.demo.viewstate;
+
+import android.support.annotation.NonNull;
+
+import com.hannesdorfmann.mosby3.mvp.viewstate.MvpViewStateActivity;
+
+/**
+ * Created by xiansong on 2017/8/25.
+ */
+
+public class StateActivity extends MvpViewStateActivity<StateView,StatePresenter,ViewState>{
+    @NonNull
+    @Override
+    public StatePresenter createPresenter() {
+        return new StatePresenter();
+    }
+
+    @NonNull
+    @Override
+    public ViewState createViewState() {
+        return new ViewState();
+    }
+
+    @Override
+    public void onNewViewStateInstance() {
+        //TODO Presenter 加载数据 - View 更新 - ViewState 保存
+        getPresenter().loadData();
+    }
+}
+package com.cnlive.libs.demo.viewstate;
+
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+/**
+ * Created by xiansong on 2017/8/25.
+ */
+
+public class StatePresenter extends MvpBasePresenter<StateView> {
+
+    public void loadData(){
+        getView().setData(null);
+    }
+
+    public void start(){
+        if(getView()!=null)
+            getView().startUploadView();
+    }
+
+    public void pause(){
+        if(getView()!=null)
+            getView().pauseUploadView();
+    }
+}
+package com.cnlive.libs.demo.viewstate;
+
+import android.os.Parcelable;
+
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+
+/**
+ * Created by xiansong on 2017/8/25.
+ */
+
+public class StateView implements MvpView {
+
+    StateActivity activity;
+
+    public StateView(StateActivity activity){
+        this.activity = activity;
+    }
+
+    public void setData(Parcelable data){
+        activity.getViewState().setData(data);
+    }
+
+    public void startUploadView(){
+
+    }
+
+    public void pauseUploadView(){
+
+    }
+}
+package com.cnlive.libs.demo.viewstate;
+
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+import com.hannesdorfmann.mosby3.mvp.viewstate.RestorableViewState;
+
+/**
+ * Created by xiansong on 2017/8/25.
+ */
+
+public class ViewState implements RestorableViewState<StateView> {
+
+    private static final String key_data = "state-data";
+
+    public Parcelable data;
+
+    @Override
+    public void saveInstanceState(@NonNull Bundle out) {
+        out.putParcelable(key_data, data);
+    }
+
+    @Override
+    public RestorableViewState<StateView> restoreInstanceState(Bundle in) {
+        if (in == null) return null;
+
+        data = in.getParcelable(key_data);
+        return this;
+    }
+
+
+    @Override
+    public void apply(StateView view, boolean retained) {
+        view.setData(data);
+    }
+
+    public void setData(Parcelable data) {
+        this.data = data;
+    }
+}
-package com.cnlive.libs.base.model;
+package com.cnlive.libs.base.data.model;
  
  
 import java.io.Serializable;
-package com.cnlive.libs.base.network;
+package com.cnlive.libs.base.data.network;
  
  
 import android.content.Context;
-package com.cnlive.libs.base.network;
+package com.cnlive.libs.base.data.network;
  
 import android.content.Context;
 import android.net.ConnectivityManager;
-package com.cnlive.libs.base.network;
+package com.cnlive.libs.base.data.network;
  
  
 import android.content.Context;
-package com.cnlive.libs.base.network;
+package com.cnlive.libs.base.data.network;
  
 import android.content.Context;
 import android.support.annotation.IntDef;
 import android.text.TextUtils;
  
 import com.cnlive.libs.base.R;
-import com.cnlive.libs.base.model.IBaseInfo;
+import com.cnlive.libs.base.data.model.IBaseInfo;
 import com.cnlive.libs.base.util.LogUtil;
  
 import java.lang.annotation.Retention;
-package com.cnlive.libs.base.network;
+package com.cnlive.libs.base.data.network;
  
 import java.io.IOException;
 import java.net.InetAddress;
-package com.cnlive.libs.base.network;
+package com.cnlive.libs.base.data.network;
  
 import com.google.gson.Gson;
  
-package com.cnlive.libs.base.util;
+package com.cnlive.libs.base.frame;
  
  
+import com.cnlive.libs.base.util.LogUtil;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
-package com.cnlive.libs.base.activity;
+package com.cnlive.libs.base.frame.activity;
  
 import android.os.Bundle;
 import android.support.annotation.NonNull;
  
-import com.cnlive.libs.base.util.ReflectUtil;
+import com.cnlive.libs.base.frame.ReflectUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
-package com.cnlive.libs.base.activity;
+package com.cnlive.libs.base.frame.activity;
  
 import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
  
-import com.cnlive.libs.base.util.ReflectUtil;
+import com.cnlive.libs.base.frame.ReflectUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
@@ -34,7 +34,7 @@ public abstract class MvpBindingActivity&lt;V extends MvpView, P extends MvpPresent
  
     @NonNull
     public D getViewData() {
-        if(data == null) data = initLayoutData();
+        if (data == null) data = initLayoutData();
         return data;
     }
 }
+package com.cnlive.libs.base.frame.activity;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import com.cnlive.libs.base.frame.ReflectUtil;
+import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.hannesdorfmann.mosby3.mvp.viewstate.ViewState;
+
+/**
+ * Created by xiansong on 2017/8/25.
+ */
+
+public abstract class MvpViewStateActivity<V extends MvpView, P extends MvpPresenter<V>, VS extends ViewState<V>> extends com.hannesdorfmann.mosby3.mvp.viewstate.MvpViewStateActivity<V, P, VS> {
+
+    public V view;
+
+    protected abstract int getLayoutId();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(getLayoutId());
+    }
+
+    @NonNull
+    public V createView() {
+        return ReflectUtil.instance(0, this.getClass(), this);
+    }
+
+    @NonNull
+    @Override
+    public P createPresenter() {
+        return ReflectUtil.instance(1, this);
+    }
+
+    @NonNull
+    @Override
+    public VS createViewState() {
+        return ReflectUtil.instance(2, this);
+    }
+
+    @NonNull
+    @Override
+    public V getMvpView() {
+        if (view == null) view = createView();
+        return view;
+    }
+}
+package com.cnlive.libs.base.frame.activity;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import com.cnlive.libs.base.frame.ReflectUtil;
+import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.hannesdorfmann.mosby3.mvp.viewstate.ViewState;
+
+/**
+ * Created by xiansong on 2017/8/25.
+ */
+
+public abstract class MvpViewStateBindingActivity<V extends MvpView, P extends MvpPresenter<V>, VS extends ViewState<V>, D, T extends ViewDataBinding> extends MvpViewStateActivity<V, P, VS> {
+    public T binding;
+    public D data;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, getLayoutId());
+        ReflectUtil.invoke(binding, "setData", getViewData());
+    }
+
+    protected D initLayoutData() {
+        return ReflectUtil.instance(2, this);
+    }
+
+    @NonNull
+    public D getViewData() {
+        if(data == null) data = initLayoutData();
+        return data;
+    }
+}
-package com.cnlive.libs.base.fragment;
+package com.cnlive.libs.base.frame.fragment;
  
 import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
@@ -9,7 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
  
-import com.cnlive.libs.base.util.ReflectUtil;
+import com.cnlive.libs.base.frame.ReflectUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
-package com.cnlive.libs.base.fragment;
+package com.cnlive.libs.base.frame.fragment;
  
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -7,7 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
  
-import com.cnlive.libs.base.util.ReflectUtil;
+import com.cnlive.libs.base.frame.ReflectUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpView;