repair resource file for errors

朱显松
1 parent 08615c24
Showing 15 changed files with 239 additions and 84 deletions
.idea/modules.xml
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/libs/demo/App.java
app/src/main/java/com/cnlive/libs/demo/Java8Test.java
app/src/main/java/com/cnlive/libs/demo/RequestTest.java
app/src/main/java/com/cnlive/libs/demo/data/network/testapi/ApiRequest.java
app/src/main/java/com/cnlive/libs/demo/data/network/testapi/ApiService.java
app/src/main/java/com/cnlive/libs/demo/mvptest/frame/presenter/LaunchPresenter.java
cnlive/src/main/AndroidManifest.xml
cnlive/src/main/java/com/cnlive/libs/base/activity/MvpActivity.java
cnlive/src/main/java/com/cnlive/libs/base/activity/MvpBindingActivity.java
cnlive/src/main/java/com/cnlive/libs/base/fragment/MvpBindingFragment.java
cnlive/src/main/java/com/cnlive/libs/base/fragment/MvpFragment.java
cnlive/src/main/java/com/cnlive/libs/base/network/Subscriber.java
cnlive/src/main/res/values/strings.xml
@@ -3,11 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNLiveLibs.iml" filepath="$PROJECT_DIR$/CNLiveLibs.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNLiveLibs.iml" filepath="$PROJECT_DIR$/CNLiveLibs.iml" />
       <module fileurl="file://$PROJECT_DIR$/OPenCNLive_BaseLib.iml" filepath="$PROJECT_DIR$/OPenCNLive_BaseLib.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/cnlive/cnlive.iml" filepath="$PROJECT_DIR$/cnlive/cnlive.iml" />
       <module fileurl="file://$PROJECT_DIR$/cnlive/cnlive.iml" filepath="$PROJECT_DIR$/cnlive/cnlive.iml" />
     </modules>
   </component>
@@ -2,7 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cnlive.libs.demo">
+
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+package com.cnlive.libs.demo;
+
+import android.app.Application;
+
+/**
+ * Created by xiansong on 2017/8/22.
+ */
+
+public class App extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+}
@@ -27,5 +27,6 @@ public class Java8Test {
         stream(list).forEach(item -> Log.e("DemoView", "n item " + item));
         String str = stream(list).map(x -> x.toUpperCase()).collect(Collectors.joining(", "));
+        Log.e("DemoView", "n item " + str);
     }
 }
 package com.cnlive.libs.demo;
 import android.content.Context;
-import android.content.res.Resources;
-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.demo.data.model.AppInfo;
@@ -11,44 +9,38 @@ import com.cnlive.libs.demo.data.network.testapi.ApiRequest;
 import com.cnlive.libs.demo.data.network.testapi.ApiService;
 import io.reactivex.disposables.Disposable;
-import okhttp3.RequestBody;
 public class RequestTest {
     //---- Api Config Start ---
     public static final String success_code = "200";
-    private static final String success_message = Resources.getSystem().getString(com.cnlive.libs.base.R.string.load_success_message);
+    private static final String success_message = "数据加载成功";
     private static final String custom_error = "401";
-    private static final String custom_response_message = Resources.getSystem().getString(com.cnlive.libs.base.R.string.custom_response_message);
+    private static final String custom_response_message = "自定义事件";
     static {
         RetrofitUtil.setDebug(com.cnlive.libs.demo.Config.debug);
     }
-    private static final Subscriber.CustomLoadResponse customLoadResponse = new Subscriber.CustomLoadResponse() {
-        @Override
-        public void onCustomEvent(String code, IBaseInfo pageData) {
-            switch (code) {
-                case custom_error:
-                    //Custom Error Event
-                    break;
-            }
+    private static final Subscriber.CustomLoadResponse customLoadResponse = (code, message, pageData) -> {
+        switch (code) {
+            case custom_error:
+                //Custom Error Event
+                break;
         }
     };
-    private static final Subscriber.Config subscriberBuild = Subscriber.newConfig()
+    public static final Subscriber.Config subscriberBuild = Subscriber.newConfig()
             .putCustomResponse(custom_error, custom_response_message)
             .putInfo(Subscriber.Config.response_success, success_code, success_message)
             .setCustomLoadResponse(customLoadResponse);
     //---- Api Config End ---
     public void test(Context context) {
-        RequestBody requestBody = ApiRequest.getRequestJsonBody("");
-
-        Disposable subscription = ApiRequest.subscribe(
-                ApiRequest.getService(ApiService.class).appInfo(com.cnlive.libs.demo.Config.APP_ID),
+        Disposable disposable = ApiRequest.subscribe(
+                ApiRequest.service(ApiService.class).appInfo(Config.APP_ID),
                 new Subscriber<AppInfo>(context, subscriberBuild) {
                     @Override
                     public void onStart() {
@@ -60,13 +52,13 @@ public class RequestTest {
                         switch (code) {
                             case success_code:
                                 break;
-                            case Config.default_error_code:
+                            case Subscriber.Config.default_error_code:
                                 break;
-                            case Config.default_failure_code:
+                            case Subscriber.Config.default_failure_code:
                                 break;
-                            case Config.default_unknown_error_code:
+                            case Subscriber.Config.default_unknown_error_code:
                                 break;
-                            case Config.default_no_network_code:
+                            case Subscriber.Config.default_no_network_code:
                                 break;
                         }
                     }
@@ -75,9 +67,10 @@ public class RequestTest {
                     public void onCompleted(String code, String message, AppInfo data) {
                     }
-                }
-        );
+                });
-        subscription.dispose();
+        disposable.dispose();
     }
+
+
 }
@@ -14,19 +14,23 @@ import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import retrofit2.adapter.rxjava2.Result;
+import static com.cnlive.libs.demo.data.network.testapi.ApiService.URL_DEBUG;
+import static com.cnlive.libs.demo.data.network.testapi.ApiService.URL_RELEASE;
+
 public class ApiRequest {
-    private static final String BASE_URL_DEBUG = "https://ymzx.asia-cloud.com/api/";
-    private static final String BASE_URL_RELEASE = "https://ymzx.asia-cloud.com/api/";
+    private static <T> String getUrl(Class<T> clazz) {
+        String url = "";
+
+        if (clazz == ApiService.class) url = Config.debug ? URL_DEBUG : URL_RELEASE;
-    private static String getBaseUrl() {
-        return Config.debug ? BASE_URL_DEBUG : BASE_URL_RELEASE;
+        return url;
     }
-    public static <T> T getService(Class<T> clazz) {
-        return RetrofitUtil.getRestAPI(getBaseUrl(), clazz);
+    public static <T> T service(Class<T> clazz) {
+        return RetrofitUtil.getRestAPI(getUrl(clazz), clazz);
     }
     public static <T extends IBaseInfo> Disposable subscribe(Observable<Result<T>> observable, Subscriber<T> subscriber) {
@@ -39,4 +43,5 @@ public class ApiRequest {
     public static RequestBody getRequestJsonBody(String content) {
         return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), content);
     }
+
 }
@@ -9,8 +9,8 @@ import retrofit2.http.GET;
 import retrofit2.http.Query;
 public interface ApiService {
-
-    //--应用程序--
+     String URL_DEBUG = "https://ymzx.asia-cloud.com/api/";
+     String URL_RELEASE = "https://ymzx.asia-cloud.com/api/";
     /**
      * 获取应用程序信息
@@ -2,14 +2,21 @@ package com.cnlive.libs.demo.mvptest.frame.presenter;
 import android.content.Context;
+import com.cnlive.libs.base.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.data.model.AppInfo;
+import com.cnlive.libs.demo.data.network.testapi.ApiRequest;
+import com.cnlive.libs.demo.data.network.testapi.ApiService;
 import com.cnlive.libs.demo.mvptest.frame.ILaunchView;
 import com.cnlive.libs.demo.mvptest.frame.view.LaunchView;
 import com.hannesdorfmann.mosby.mvp.MvpBasePresenter;
 import io.reactivex.disposables.Disposable;
+import static com.cnlive.libs.demo.RequestTest.subscriberBuild;
+
 public class LaunchPresenter extends MvpBasePresenter<LaunchView> {
     private TimerUtil timerUtil; //计时工具类
@@ -21,8 +28,27 @@ public class LaunchPresenter extends MvpBasePresenter&lt;LaunchView&gt; {
     public void initData(Context context) {
         if (subscription != null) subscription.dispose();
-        ILaunchView view = getView();
-        if (view != null) view.onLoadDataComplete(null);
+        subscription = ApiRequest.subscribe(
+                ApiRequest.service(ApiService.class).appInfo(Config.APP_ID),
+                new Subscriber<AppInfo>(context, subscriberBuild) {
+                    @Override
+                    public void onCompleted(String code, String message, AppInfo data) {
+                        ILaunchView view = getView();
+                        if (view != null) view.onLoadDataComplete(null);
+                    }
+
+                    @Override
+                    public void onError(String code, String message) {
+                        ILaunchView view = getView();
+                        if (view != null) view.onLoadDataError(code, message);
+                    }
+
+                    @Override
+                    public void onStart() {
+                        ILaunchView view = getView();
+                        if (view != null) view.onLoadDataStart();
+                    }
+                });
     }
     /**
@@ -2,6 +2,9 @@
     package="com.cnlive.libs.base">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application android:allowBackup="true" android:label="@string/app_name"
         android:supportsRtl="true">
+package com.cnlive.libs.base.activity;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import com.cnlive.libs.base.util.ReflectUtil;
+import com.hannesdorfmann.mosby.mvp.MvpPresenter;
+import com.hannesdorfmann.mosby.mvp.MvpView;
+
+/**
+ * MVP Databinding Base Activity
+ * @param <V> MVP View {@link MvpView}
+ * @param <P> MVP Presenter {@link MvpPresenter}
+ */
+public abstract class MvpActivity<V extends MvpView, P extends MvpPresenter<V>> extends com.hannesdorfmann.mosby.mvp.MvpActivity<V, P> {
+
+    public V view;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(getLayoutId());
+    }
+
+    protected abstract int 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 V getMvpView() {
+        if (view == null) view = createView();
+        return view;
+    }
+
+}
@@ -27,13 +27,13 @@ public abstract class MvpBindingActivity&lt;V extends MvpView, P extends MvpPresent
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, getLayoutId());
-        ReflectUtil.invoke(binding, "setData", getLayoutData());
+        ReflectUtil.invoke(binding, "setData", getViewData());
     }
     protected abstract int getLayoutId();
-    protected D getLayoutData() {
-        return data = ReflectUtil.instance(2, this);
+    protected D initLayoutData() {
+        return ReflectUtil.instance(2, this);
     }
     @NonNull
@@ -54,4 +54,9 @@ public abstract class MvpBindingActivity&lt;V extends MvpView, P extends MvpPresent
         return view;
     }
+    @NonNull
+    public D getViewData() {
+        if(data == null) data = initLayoutData();
+        return data;
+    }
 }
@@ -31,14 +31,14 @@ public abstract class MvpBindingFragment&lt;V extends MvpView, P extends MvpPresent
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, getLayoutId(), container, false);
-        ReflectUtil.invoke(binding, "setData", getLayoutData());
+        ReflectUtil.invoke(binding, "setData", getViewData());
         return binding.getRoot();
     }
     protected abstract int getLayoutId();
-    protected D getLayoutData() {
-        return data = ReflectUtil.instance(2, this);
+    protected D initLayoutData() {
+        return ReflectUtil.instance(2, this);
     }
     @NonNull
@@ -60,4 +60,9 @@ public abstract class MvpBindingFragment&lt;V extends MvpView, P extends MvpPresent
     }
+    @NonNull
+    public D getViewData() {
+        if(data == null) data = initLayoutData();
+        return data;
+    }
 }
 \ No newline at end of file
+package com.cnlive.libs.base.fragment;
+
+import android.os.Bundle;
+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.util.ReflectUtil;
+import com.hannesdorfmann.mosby.mvp.MvpPresenter;
+import com.hannesdorfmann.mosby.mvp.MvpView;
+
+/**
+ * MVP Databinding Base Fragment
+ *
+ * @param <V> MVP View {@link MvpView}
+ * @param <P> MVP Presenter {@link MvpPresenter}
+ */
+public abstract class MvpFragment<V extends MvpView, P extends MvpPresenter<V>> extends com.hannesdorfmann.mosby.mvp.MvpFragment<V, P> {
+
+    public V view;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(getLayoutId(), container, false);
+    }
+
+    protected abstract int 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 V getMvpView() {
+        if (view == null) view = createView();
+        return view;
+    }
+
+}
 \ No newline at end of file
 package com.cnlive.libs.base.network;
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.annotation.IntDef;
+import android.text.TextUtils;
 import com.cnlive.libs.base.R;
 import com.cnlive.libs.base.model.IBaseInfo;
@@ -22,18 +22,32 @@ import retrofit2.adapter.rxjava2.Result;
 public abstract class Subscriber<T extends IBaseInfo> {
-    private T pageData;
+    private Response<T> response;
     private Context context;
     private Config config;
-    public Subscriber(Context context) {
+    public Subscriber(@NonNull Context context) {
         this.context = context;
         this.config = new Config();
+        init();
     }
-    public Subscriber(Context context, Config config) {
+    public Subscriber(@NonNull Context context, @NonNull Config config) {
         this.context = context;
         this.config = config;
+        init();
+    }
+
+    private String reloadString(String str, int defRes) {
+        return TextUtils.isEmpty(str) ? context.getString(defRes) : str;
+    }
+
+    private void init() {
+        config.load_success_message = reloadString(config.load_success_message, R.string.load_success_message);
+        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);
     }
     public static Config newConfig() {
@@ -43,10 +57,7 @@ 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<T> response = data.response();
-            if (response != null) pageData = response.body();
-            else if (!NetworkUtil.isConnectInternet(context)) onNetworkNoConnected();
-            else onError(config.load_failure_code, config.load_failure_message);
+            response = data == null ? null : data.response();
         }
     };
@@ -64,21 +75,20 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
     public Action complete = new Action() {
         @Override
         public void run() throws Exception {
-            if (pageData != null && config.load_success_code.equals(pageData.getCode())) {
-                onCompleted(config.load_success_code, config.load_success_message, pageData);
-            } else if (pageData != null) {
-                if (config.custom_map.containsKey(pageData.getCode())) {
-                    onError(pageData.getCode(), config.custom_map.get(pageData.getCode()));
-
-                    if (config.customLoadResponse != null)
-                        config.customLoadResponse.onCustomEvent(pageData.getCode(), pageData);
-                } else {
-                    onError(pageData.getCode(), pageData.getMessage());
-                }
-            } else {
-                if (context != null && !NetworkUtil.isConnectInternet(context))
-                    onNetworkNoConnected();
+            if (response == null) {
+                if (!NetworkUtil.isConnectInternet(context)) onNetworkNoConnected();
                 else onError(config.unknown_error_code, config.unknown_error_message);
+            } else {
+                T pageData = response.body();
+
+                if (pageData != null && config.load_success_code.equals(pageData.getCode()))
+                    onCompleted(config.load_success_code, config.load_success_message, pageData);
+                else if (pageData != null)
+                    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 onError(config.load_failure_code, config.load_failure_message);
             }
         }
     };
@@ -102,7 +112,7 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
     }
     public interface CustomLoadResponse {
-        void onCustomEvent(String code, IBaseInfo pageData);
+        void onCustomEvent(String code, String message, IBaseInfo pageData);
     }
     public static class Config {
@@ -125,19 +135,19 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
         public static final String default_unknown_error_code = "-4";
         private String load_success_code = default_success_code;
-        private String load_success_message = Resources.getSystem().getString(R.string.load_success_message);
+        private String load_success_message;
         private String load_failure_code = default_failure_code;
-        private String load_failure_message = Resources.getSystem().getString(R.string.load_failure_message);
+        private String load_failure_message;
         private String load_error_code = default_error_code;
-        private String load_error_message = Resources.getSystem().getString(R.string.load_error_message);
+        private String load_error_message;
         private String no_network_code = default_no_network_code;
-        private String no_network_message = Resources.getSystem().getString(R.string.no_network_message);
+        private String no_network_message;
         private String unknown_error_code = default_unknown_error_code;
-        private String unknown_error_message = Resources.getSystem().getString(R.string.no_network_message);
+        private String unknown_error_message;
         /**
          * Custom event map , value{code : message}
@@ -183,24 +193,24 @@ public abstract class Subscriber&lt;T extends IBaseInfo&gt; {
         public Config removeInfo(@RESPONSE_TYPE int type) {
             switch (type) {
                 case response_success:
-                    this.load_success_code = "0";
-                    this.load_success_message = Resources.getSystem().getString(R.string.load_success_message);
+                    this.load_success_code = default_success_code;
+                    this.load_success_message = null;
                     break;
                 case response_failure:
-                    this.load_failure_code = "-1";
-                    this.load_failure_message = Resources.getSystem().getString(R.string.load_failure_message);
+                    this.load_failure_code = default_failure_code;
+                    this.load_failure_message = null;
                     break;
                 case response_error:
-                    this.load_error_code = "-2";
-                    this.load_error_message = Resources.getSystem().getString(R.string.load_error_message);
+                    this.load_error_code = default_error_code;
+                    this.load_error_message = null;
                     break;
                 case response_no_network:
-                    this.no_network_code = "-3";
-                    this.no_network_message = Resources.getSystem().getString(R.string.no_network_message);
+                    this.no_network_code = default_no_network_code;
+                    this.no_network_message = null;
                     break;
                 case response_unknown:
-                    this.unknown_error_code = "-4";
-                    this.unknown_error_message = Resources.getSystem().getString(R.string.no_network_message);
+                    this.unknown_error_code = default_unknown_error_code;
+                    this.unknown_error_message = null;
                     break;
             }
             return this;
@@ -6,6 +6,4 @@
     <string name="load_error_message">数据加载错误</string>
     <string name="no_network_message">未检测到网络</string>
     <string name="unknown_error_message">未知错误</string>
-
-    <string name="custom_response_message">自定义响应</string>
 </resources>