1.MVP increases ViewState data persistence logic code

2.The network requests the SSL authentication to update the outdated method 3.Network loading optimization error handling logic 4.LogUtil can not get Debug status problem code adjustment

1.MVP increases ViewState data persistence logic code
2.The network requests the SSL authentication to update the outdated method 3.Network loading optimization error handling logic 4.LogUtil can not get Debug status problem code adjustment
朱显松
1 parent f199d5ab
Showing 18 changed files with 312 additions and 70 deletions
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/libs/demo/mvptest/frame/ILaunchView.java
app/src/main/java/com/cnlive/libs/demo/mvptest/frame/presenter/LaunchPresenter.java
app/src/main/java/com/cnlive/libs/demo/mvptest/frame/view/LaunchView.java
app/src/main/java/com/cnlive/libs/demo/mvptest/model/LaunchPage.java
app/src/main/java/com/cnlive/libs/demo/mvptest/ui/activity/LaunchActivity.java
cnlive/build.gradle
cnlive/src/main/java/com/cnlive/libs/base/data/network/RetrofitUtil.java
cnlive/src/main/java/com/cnlive/libs/base/data/network/Subscriber.java
cnlive/src/main/java/com/cnlive/libs/base/frame/activity/MvpViewStateActivity.java
cnlive/src/main/java/com/cnlive/libs/base/frame/activity/MvpViewStateBindingActivity.java
cnlive/src/main/java/com/cnlive/libs/base/frame/fragment/MvpBindingFragment.java
cnlive/src/main/java/com/cnlive/libs/base/frame/fragment/MvpFragment.java
cnlive/src/main/java/com/cnlive/libs/base/frame/fragment/MvpViewStateBindingFragment.java
cnlive/src/main/java/com/cnlive/libs/base/frame/fragment/MvpViewStateFragment.java
cnlive/src/main/java/com/cnlive/libs/base/frame/state/MvpViewState.java
cnlive/src/main/java/com/cnlive/libs/base/frame/view/MvpStateView.java
cnlive/src/main/java/com/cnlive/libs/base/util/LogUtil.java
@@ -24,6 +24,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+
     </application>
 </manifest>
 \ No newline at end of file
 package com.cnlive.libs.demo.mvptest.frame;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.cnlive.libs.base.frame.view.MvpStateView;
+import com.cnlive.libs.demo.data.model.AppInfo;
+import com.cnlive.libs.demo.mvptest.model.LaunchPage;
-public interface ILaunchView extends MvpView {
+public interface ILaunchView extends MvpStateView<LaunchPage> {
     /**
      * 开始加载页面数据
      */
@@ -11,13 +13,15 @@ public interface ILaunchView extends MvpView {
     /**
      * 完成数据加载
+     *
      * @param data 页面数据
      */
-    void onLoadDataComplete(Object data);
+    void onLoadDataComplete(AppInfo data);
     /**
      * 错误的加载
-     * @param code 页面错误码
+     *
+     * @param code    页面错误码
      * @param message 页面错误信息
      */
     void onLoadDataError(String code, String message);
@@ -28,13 +32,10 @@ public interface ILaunchView extends MvpView {
     void onTimerFinish();
     /**
-     *  计时器剩余时间通知
+     * 计时器剩余时间通知
+     *
      * @param time 剩余时间
      */
     void onTimerInterval(long time);
-    /**
-     * 启动主程序
-     */
-    void startMainPage();
 }
 \ No newline at end of file
 package com.cnlive.libs.demo.mvptest.frame.presenter;
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 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;
+import com.cnlive.libs.demo.MainActivity;
 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;
@@ -34,7 +37,7 @@ public class LaunchPresenter extends MvpBasePresenter&lt;LaunchView&gt; {
                     @Override
                     public void onCompleted(String code, String message, AppInfo data) {
                         ILaunchView view = getView();
-                        if (view != null) view.onLoadDataComplete(null);
+                        if (view != null) view.onLoadDataComplete(data);
                     }
                     @Override
@@ -63,7 +66,6 @@ public class LaunchPresenter extends MvpBasePresenter&lt;LaunchView&gt; {
         timerUtil.setTotalTime(totalTime);//设置毫秒数
         timerUtil.setIntervalTime(1000);//设置间隔数
         timerUtil.start();
-
         timerUtil.setTimerLiener(new TimerUtil.TimeListener() {
             @Override
             public void onFinish() {
@@ -80,11 +82,11 @@ public class LaunchPresenter extends MvpBasePresenter&lt;LaunchView&gt; {
         });
     }
-    public void startMainPage() {
-        if (getView() == null) return;
+    public void startMainPage(Activity activity) {
         if (timerUtil != null) timerUtil.cancel();
         if (subscription != null) subscription.dispose();
-        getView().startMainPage();
+        activity.startActivity(new Intent(activity, MainActivity.class));
+        activity.finish();
     }
     /**
 package com.cnlive.libs.demo.mvptest.frame.view;
-import android.content.Intent;
 import android.view.View;
-import com.cnlive.libs.demo.MainActivity;
+import com.cnlive.libs.demo.data.model.AppInfo;
 import com.cnlive.libs.demo.mvptest.frame.ILaunchView;
+import com.cnlive.libs.demo.mvptest.model.LaunchPage;
 import com.cnlive.libs.demo.mvptest.ui.activity.LaunchActivity;
@@ -23,11 +23,16 @@ public class LaunchView implements ILaunchView {
     }
     @Override
-    public void onLoadDataComplete(Object data) {
+    public void onLoadDataComplete(AppInfo data) {
         loadEnd();
     }
     @Override
+    public void onRestoreDataComplete(LaunchPage data) {
+        activity.binding.setData(data);
+    }
+
+    @Override
     public void onLoadDataError(String code, String message) {
         loadEnd();
     }
@@ -40,13 +45,7 @@ public class LaunchView implements ILaunchView {
     @Override
     public void onTimerFinish() {
         activity.binding.getData().setTime(0);
-        startMainPage();
-    }
-
-    @Override
-    public void startMainPage() {
-        activity.startActivity(new Intent(activity, MainActivity.class));
-        activity.finish();
+        activity.getPresenter().startMainPage(activity);
     }
     @Override
@@ -2,12 +2,13 @@ package com.cnlive.libs.demo.mvptest.model;
 import android.databinding.BaseObservable;
 import android.databinding.Bindable;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.view.View;
 import com.cnlive.libs.demo.BR;
-
-public class LaunchPage extends BaseObservable {
+public class LaunchPage extends BaseObservable implements Parcelable {
     private long time = -1;
     private int timing = View.GONE;
     private int loading = View.GONE;
@@ -42,4 +43,33 @@ public class LaunchPage extends BaseObservable {
         this.loading = loading;
         notifyPropertyChanged(BR.loading);
     }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeLong(this.time);
+        parcel.writeInt(this.timing);
+        parcel.writeInt(this.loading);
+    }
+
+
+    public static final Creator<LaunchPage> CREATOR = new Creator<LaunchPage>() {
+        @Override
+        public LaunchPage createFromParcel(Parcel in) {
+            LaunchPage target = new LaunchPage();
+            target.time = in.readLong();
+            target.timing = in.readInt();
+            target.loading = in.readInt();
+            return target;
+        }
+
+        @Override
+        public LaunchPage[] newArray(int size) {
+            return new LaunchPage[size];
+        }
+    };
 }
@@ -5,14 +5,14 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import com.cnlive.libs.base.frame.activity.MvpBindingActivity;
+import com.cnlive.libs.base.frame.activity.MvpViewStateBindingActivity;
 import com.cnlive.libs.demo.R;
 import com.cnlive.libs.demo.databinding.ActivityLaunchBinding;
 import com.cnlive.libs.demo.mvptest.frame.presenter.LaunchPresenter;
 import com.cnlive.libs.demo.mvptest.frame.view.LaunchView;
 import com.cnlive.libs.demo.mvptest.model.LaunchPage;
-public class LaunchActivity extends MvpBindingActivity<LaunchView, LaunchPresenter, LaunchPage, ActivityLaunchBinding> {
+public class LaunchActivity extends MvpViewStateBindingActivity<LaunchView, LaunchPresenter, LaunchPage, ActivityLaunchBinding> {
     @Override
     protected int getLayoutId() {
@@ -22,13 +22,11 @@ public class LaunchActivity extends MvpBindingActivity&lt;LaunchView, LaunchPresent
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        initData();
     }
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        initData();
     }
     @Override
@@ -37,16 +35,17 @@ public class LaunchActivity extends MvpBindingActivity&lt;LaunchView, LaunchPresent
         getPresenter().destroy();
     }
-    private void initData() {
-        getPresenter().initData(this);
-    }
-
     public void onClick(View view){
         switch (view.getId()){
             case R.id.click:
-                getPresenter().startMainPage();
+                getViewData().setTime(2);
+                startActivity(new Intent(this,LaunchActivity.class));
                 break;
         }
     }
+    @Override
+    public void onNewViewStateInstance() {
+        getPresenter().initData(this);
+    }
 }
@@ -3,7 +3,7 @@ apply plugin: &#39;maven&#39;
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.1"
     defaultConfig {
         minSdkVersion 16
@@ -3,13 +3,17 @@ package com.cnlive.libs.base.data.network;
 import android.content.Context;
-
 import com.cnlive.libs.base.util.LogUtil;
+import java.security.KeyStore;
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
@@ -42,10 +46,19 @@ public class RetrofitUtil {
         OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient().newBuilder();
         try {
+            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+                    TrustManagerFactory.getDefaultAlgorithm());
+            trustManagerFactory.init((KeyStore) null);
+            TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+            if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager))
+                throw new IllegalStateException("Unexpected default trust managers:" + Arrays.toString(trustManagers));
+            X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
+
             SSLContext sslContext = SSLContext.getInstance("TLS");
-            sslContext.init(null, null, null);
+            sslContext.init(null, new TrustManager[]{trustManager}, null);
             SSLSocketFactory socketFactory = new Tls12SocketFactory(sslContext.getSocketFactory());
-            okHttpClientBuilder.sslSocketFactory(socketFactory);
+
+            okHttpClientBuilder.sslSocketFactory(socketFactory, trustManager);
         } catch (Exception e) {
             LogUtil.e(TAG, "RetrofitUtil", e);
         }
@@ -22,7 +22,10 @@ import retrofit2.adapter.rxjava2.Result;
 public abstract class Subscriber<T extends IBaseInfo> {
+    private static final String TAG = "NetLoader";
+
     private Response<T> response;
+    private Throwable response_error;
     private Context context;
     private Config config;
@@ -47,7 +50,7 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
         config.load_failure_message = reloadString(config.load_failure_message, R.string.load_failure_message);
         config.load_error_message = reloadString(config.load_error_message, R.string.load_error_message);
         config.no_network_message = reloadString(config.no_network_message, R.string.no_network_message);
-        config.unknown_error_message = reloadString(config.no_network_message, R.string.no_network_message);
+        config.unknown_error_message = reloadString(config.no_network_message, R.string.unknown_error_message);
     }
     public static Config newConfig() {
@@ -57,18 +60,21 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
     public Consumer<Result<T>> next = new Consumer<Result<T>>() {
         @Override
         public void accept(Result<T> data) throws Exception {
-            response = data == null ? null : data.response();
+            if (data == null) return;
+            if (data.isError()) response_error = data.error();
+            else response = data.response();
         }
     };
     public Consumer<Throwable> error = new Consumer<Throwable>() {
         @Override
         public void accept(Throwable e) throws Exception {
-            LogUtil.d("NetLoader", "onError ", e);
+            LogUtil.d(TAG, "onError ", e);
             if (context != null && !NetworkUtil.isConnectInternet(context))
                 onNetworkNoConnected();
-            else
+            else {
                 onError(config.load_error_code, e != null ? e.getMessage() : config.load_error_message);
+            }
         }
     };
@@ -77,7 +83,10 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
         public void run() throws Exception {
             if (response == null) {
                 if (!NetworkUtil.isConnectInternet(context)) onNetworkNoConnected();
-                else onError(config.unknown_error_code, config.unknown_error_message);
+                else if (response_error != null) {
+                    onError(config.load_error_code, config.load_error_message);
+                    LogUtil.d(TAG, "onError ", response_error);
+                } else onError(config.unknown_error_code, config.unknown_error_message);
             } else {
                 T pageData = response.body();
@@ -87,7 +96,8 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
                     if (config.customLoadResponse != null && config.custom_map.containsKey(pageData.getCode()))
                         config.customLoadResponse.onCustomEvent(pageData.getCode(), pageData.getMessage(), pageData);
                     else onError(pageData.getCode(), pageData.getMessage());
-                else if (context != null && !NetworkUtil.isConnectInternet(context)) onNetworkNoConnected();
+                else if (context != null && !NetworkUtil.isConnectInternet(context))
+                    onNetworkNoConnected();
                 else onError(config.load_failure_code, config.load_failure_message);
             }
         }
 package com.cnlive.libs.base.frame.activity;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import com.cnlive.libs.base.frame.ReflectUtil;
+import com.cnlive.libs.base.frame.state.MvpViewState;
+import com.cnlive.libs.base.frame.view.MvpStateView;
 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 abstract class MvpViewStateActivity<V extends MvpStateView<D>, P extends MvpPresenter<V>, D extends Parcelable> extends com.hannesdorfmann.mosby3.mvp.viewstate.MvpViewStateActivity<V, P, MvpViewState<V, D>> {
     public V view;
+    public MvpViewState<V, D> viewState;
     protected abstract int getLayoutId();
@@ -35,10 +37,24 @@ public abstract class MvpViewStateActivity&lt;V extends MvpView, P extends MvpPrese
         return ReflectUtil.instance(1, this);
     }
+    protected D initLayoutData() {
+        return ReflectUtil.instance(2, this);
+    }
+
+    protected MvpViewState<V, D> initViewState() {
+        return new MvpViewState<>(initLayoutData());
+    }
+
     @NonNull
     @Override
-    public VS createViewState() {
-        return ReflectUtil.instance(2, this);
+    public MvpViewState<V, D> createViewState() {
+        if (viewState == null) viewState = initViewState();
+        return viewState;
+    }
+
+    @NonNull
+    public D getViewData() {
+        return getViewState().getViewData();
     }
     @NonNull
@@ -3,35 +3,33 @@ package com.cnlive.libs.base.frame.activity;
 import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import com.cnlive.libs.base.frame.ReflectUtil;
+import com.cnlive.libs.base.frame.state.MvpViewState;
+import com.cnlive.libs.base.frame.view.MvpStateView;
 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 abstract class MvpViewStateBindingActivity<V extends MvpStateView<D>, P extends MvpPresenter<V>, D extends Parcelable, T extends ViewDataBinding> extends MvpViewStateActivity<V, P, D> {
+
     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;
+    @Override
+    public MvpViewState<V, D> createViewState() {
+        super.createViewState();
+        ReflectUtil.invoke(binding, "setData", viewState.getViewData());
+        return viewState;
     }
 }
@@ -15,6 +15,7 @@ import com.hannesdorfmann.mosby3.mvp.MvpView;
 /**
  * MVP Databinding Base Fragment
+ *
  * @param <V> MVP View {@link MvpView}
  * @param <P> MVP Presenter {@link MvpPresenter}
  * @param <D> Databind Page Data
@@ -39,7 +40,7 @@ public abstract class MvpBindingFragment&lt;V extends MvpView, P extends MvpPresent
     @NonNull
     public D getViewData() {
-        if(data == null) data = initLayoutData();
+        if (data == null) data = initLayoutData();
         return data;
     }
 }
 \ No newline at end of file
@@ -29,7 +29,6 @@ public abstract class MvpFragment&lt;V extends MvpView, P extends MvpPresenter&lt;V&gt;&gt; 
     protected abstract int getLayoutId();
-
     @NonNull
     public V createView() {
         return ReflectUtil.instance(0, this.getClass(), this);
+package com.cnlive.libs.base.frame.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.cnlive.libs.base.frame.ReflectUtil;
+import com.cnlive.libs.base.frame.state.MvpViewState;
+import com.cnlive.libs.base.frame.view.MvpStateView;
+import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
+
+/**
+ * Created by xiansong on 2017/8/29.
+ */
+
+public abstract class MvpViewStateBindingFragment<V extends MvpStateView<D>, P extends MvpPresenter<V>, D extends Parcelable, T extends ViewDataBinding> extends MvpViewStateFragment<V, P, D> {
+    public T binding;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, getLayoutId(), container, false);
+        ReflectUtil.invoke(binding, "setData", getViewData());
+        return binding.getRoot();
+    }
+
+    @NonNull
+    @Override
+    public MvpViewState<V, D> createViewState() {
+        super.createViewState();
+        ReflectUtil.invoke(binding, "setData", viewState.getViewData());
+        return viewState;
+    }
+}
+package com.cnlive.libs.base.frame.fragment;
+
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.cnlive.libs.base.frame.ReflectUtil;
+import com.cnlive.libs.base.frame.state.MvpViewState;
+import com.cnlive.libs.base.frame.view.MvpStateView;
+import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
+
+/**
+ * Created by xiansong on 2017/8/29.
+ */
+
+public abstract class MvpViewStateFragment<V extends MvpStateView<D>, P extends MvpPresenter<V>, D extends Parcelable> extends com.hannesdorfmann.mosby3.mvp.viewstate.MvpViewStateFragment<V, P, MvpViewState<V, D>> {
+
+    public V view;
+    public MvpViewState<V, D> viewState;
+
+    protected abstract int getLayoutId();
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(getLayoutId(), container, false);
+    }
+
+    @NonNull
+    public V createView() {
+        return ReflectUtil.instance(0, this.getClass(), this);
+    }
+
+    @NonNull
+    @Override
+    public P createPresenter() {
+        return ReflectUtil.instance(1, this);
+    }
+
+    protected D initLayoutData() {
+        return ReflectUtil.instance(2, this);
+    }
+
+    protected MvpViewState<V, D> initViewState() {
+        return new MvpViewState<>(initLayoutData());
+    }
+
+    @NonNull
+    @Override
+    public MvpViewState<V, D> createViewState() {
+        if (viewState == null) viewState = initViewState();
+        return viewState;
+    }
+
+    @NonNull
+    public D getViewData() {
+        return getViewState().getViewData();
+    }
+
+    @NonNull
+    @Override
+    public V getMvpView() {
+        if (view == null) view = createView();
+        return view;
+    }
+}
 \ No newline at end of file
+package com.cnlive.libs.base.frame.state;
+
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+import com.cnlive.libs.base.frame.view.MvpStateView;
+import com.hannesdorfmann.mosby3.mvp.viewstate.RestorableViewState;
+
+/**
+ * Created by xiansong on 2017/8/28.
+ */
+
+public class MvpViewState<V extends MvpStateView<D>, D extends Parcelable> implements RestorableViewState<V> {
+
+    private static final String key_data = "state-data";
+
+    protected D data;
+
+    public MvpViewState(D data) {
+        this.data = data;
+    }
+
+    @NonNull
+    public D getViewData() {
+        return data;
+    }
+
+    @Override
+    public void saveInstanceState(@NonNull Bundle out) {
+        out.putParcelable(key_data, data);
+    }
+
+    @Override
+    public RestorableViewState<V> restoreInstanceState(Bundle in) {
+        if (in == null) return null;
+        data = in.getParcelable(key_data);
+        return this;
+    }
+
+    @Override
+    public void apply(V view, boolean retained) {
+        view.onRestoreDataComplete(data);
+    }
+
+
+}
+package com.cnlive.libs.base.frame.view;
+
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+
+/**
+ * Created by xiansong on 2017/8/28.
+ */
+
+public interface MvpStateView<D> extends MvpView {
+    void onRestoreDataComplete(D data);
+}
@@ -2,26 +2,30 @@ package com.cnlive.libs.base.util;
 import android.util.Log;
-import com.cnlive.libs.base.BuildConfig;
-
 /**
  * Log output tool
  */
 public class LogUtil {
+    private static boolean ENABLED = true;
+
+    public static void setDebug(boolean debug){
+        LogUtil.ENABLED = debug;
+    }
+
     public static void e(String tag, String msg) {
-        if (BuildConfig.DEBUG) Log.e(tag, msg);
+        if (ENABLED) Log.e(tag, msg);
     }
     public static void e(String tag, String msg, Throwable tr) {
-        if (BuildConfig.DEBUG) Log.e(tag, msg, tr);
+        if (ENABLED) Log.e(tag, msg, tr);
     }
     public static void d(String tag, String msg) {
-        if (BuildConfig.DEBUG) Log.d(tag, msg);
+        if (ENABLED) Log.d(tag, msg);
     }
     public static void d(String tag, String msg, Throwable tr) {
-        if (BuildConfig.DEBUG) Log.d(tag, msg, tr);
+        if (ENABLED) Log.d(tag, msg, tr);
     }
 }