删除Home模块的BaseStatusActivity,所有Activity 统一继承自Wrapper中的 BaseStatusActivity;修改网络异常的提示语

RvClient/src/main/java/com/xxfc/rv/wxapi/WXPayEntryActivity.java

@@ -11,10 +11,10 @@ import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseReq;

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseActivity.java

@@ -9,6 +9,7 @@ import android.view.Window;
 
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.base.utils.tools.android.NetworkUtil;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.dialog.LoadingDialog;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
@@ -80,6 +81,10 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
 
     @Override
     public void onShowError(String errorMsg, int errorType) {
+        if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
+            showToast("网络异常，请检查您的网络");
+            return;
+        }
         if (!TextUtils.isEmpty(errorMsg)) {
             showToast(errorMsg);
         }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseStatusActivity.java

@@ -8,8 +8,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.alibaba.fastjson.JSON;
+import com.base.utils.tools.android.NetworkUtil;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
-import com.frame.rv.config.RvFrameConstant;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
@@ -32,26 +32,25 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
 
     protected boolean isLoading = false;//是否是第一次加载
 
+    protected boolean isShowLoadingError = true;
+
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
         isLoading = true;
     }
 
-
     @Override
     public void onShowError(String errorMsg, int errorType) {
         super.onShowError(errorMsg, errorType);
         if (isLoading == true) {
-            switch (errorType) {
-                case RvFrameConstant.ERROR_TYPE_NET:
-                    if (frameLayout != null && frameLayout.getChildCount() > 0) {
-                        View netView = frameLayout.getChildAt(1);
-                        if (netView == null) {
-                            frameLayout.addView(getNetErrorView(-1, ""), 1);
-                        }
-                    }
-                    break;
-            }
+//            if (!NetworkUtil.isNetworkAvailable(getApplicationContext()) && isShowLoadingError) {
+//                if (frameLayout != null && frameLayout.getChildCount() > 0) {
+//                    View netView = frameLayout.getChildAt(1);
+//                    if (netView == null) {
+//                        frameLayout.addView(getNetErrorView(-1, ""), 1);
+//                    }
+//                }
+//            }
         }
     }
 
@@ -119,7 +118,7 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
     protected View getNetErrorView(final int imageId, final String empty) {
         return getHelperView(null, R.layout.common_net_error, new OnViewHolder() {
             @Override
-            public void helper(ViewHolder helper) {
+            public void helper(final ViewHolder helper) {
                 if (imageId != -1) {
                     helper.setImageResource(R.id.iv_flag, imageId);
                 }
@@ -140,7 +139,7 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
     }
 
 
-    protected  BeanUserInfo.UserInfo getUserInfo(){
+    protected BeanUserInfo.UserInfo getUserInfo() {
         BeanUserInfo.UserInfo userInfo = null;
         String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
         if (!TextUtil.isEmpty(spStringCode)) {

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java

@@ -45,6 +45,7 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                 T bean = new Gson().fromJson(result, baseBean);
                 switch (bean.status) {
                     case RvFrameConstant.HTTP_STATE_SUCCESS:
+                        baseView.onBeforeSuccess();
                         baseView.onShowResult(position, bean);
                         break;
                     case RvFrameConstant.HTTP_STATE_OTHER_LOGIN:
@@ -70,10 +71,14 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
             } catch (Exception e) {
                 e.printStackTrace();
             }
+        } else {
+            if (response != null && response.code() == 404) {
+                baseView.onShowError("请求的地址不存在", position);
             } else {
                 baseView.onShowError("服务器链接失败", response.code());
             }
         }
+    }
 
     @Override
     public void onError(Throwable e) {

RvWrapper/src/main/res/layout/common_net_error.xml

@@ -4,27 +4,31 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/colorWrite"
-    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:gravity="center"
         android:orientation="vertical">
 
         <ImageView
             android:id="@+id/iv_flag"
-        android:layout_width="345px"
-        android:layout_height="345px"
-        android:layout_centerHorizontal="true"
+            android:layout_width="@dimen/size_200"
+            android:layout_height="@dimen/size_200"
             android:src="@drawable/network_outage_while" />
 
         <TextView
             android:id="@+id/tv_loading"
-        android:layout_width="200px"
-        android:layout_height="60px"
-        android:layout_below="@id/iv_flag"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20px"
+            android:layout_width="@dimen/size_100"
+            android:layout_height="@dimen/size_30"
             android:background="@drawable/shape_border_gray"
             android:gravity="center"
             android:text="@string/loading_data"
             android:textColor="#ffcd00"
             android:textSize="38px" />
 
+    </LinearLayout>
+
 </RelativeLayout>

module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java

@@ -5,12 +5,14 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Intent;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
@@ -159,6 +161,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
 //        webSettings.setSavePassword(false);
         // 支持缩放
         webSettings.setSupportZoom(true);
+
         // 设置 UserAgent 属性
         webSettings.setUserAgentString("");
         // 允许加载本地 html 文件/false
@@ -169,12 +172,24 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
         // Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+
+
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
                 return super.shouldOverrideUrlLoading(view, request);
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+//                super.onReceivedSslError(view, handler, error);
+                handler.proceed();
+            }
         });
         mWebView.loadUrl(webUrl);
         mWebView.setWebChromeClient(new WebChromeClient() {

module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java

@@ -11,6 +11,7 @@ import com.frame.base.bus.LoginUserInfoEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.SPConstance;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.weight.TitleView;

module_home/src/main/java/com/rv/home/rv/module/basic/BaseStatusActivity.java

-package com.rv.home.rv.module.basic;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.alibaba.fastjson.JSON;
-import com.base.utils.ui.datetime.selector.util.TextUtil;
-import com.frame.rv.config.RvFrameConfig;
-import com.ruiwenliu.wrapper.R;
-import com.ruiwenliu.wrapper.SPConstance;
-import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
-import com.ruiwenliu.wrapper.inter.OnViewHolder;
-import com.ruiwenliu.wrapper.presenter.MvpPresenter;
-import com.ruiwenliu.wrapper.util.UtilsManager;
-import com.ruiwenliu.wrapper.util.ViewHolder;
-import com.ruiwenliu.wrapper.bean.BeanUserInfo;
-import com.rv.home.rv.module.ui.login.LoginRvActivity;
-import com.yuyife.okgo.OkGoUtil;
-
-/**
- * Created by ruiwen
- * Data:2018/7/16 0016
- * Email:1054750389@qq.com
- * Desc:状态布局
- */
-
-public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBackActivity<P> {
-
-
-    protected boolean isLoading = false;//是否是第一次加载
-
-    @Override
-    protected void loadData(Bundle savedInstanceState, Intent intent) {
-        isLoading = true;
-    }
-
-
-    @Override
-    public void onShowError(String errorMsg, int errorType) {
-        super.onShowError(errorMsg, errorType);
-//        if (isLoading == true) {
-//            switch (errorType) {
-//                case RvFrameConstant.ERROR_TYPE_NET:
-//                    if (frameLayout != null && frameLayout.getChildCount() > 0) {
-//                        View netView = frameLayout.getChildAt(1);
-//                        if (netView == null) {
-//                            frameLayout.addView(getNetErrorView(-1, ""), 1);
-//                        }
-//                    }
-//                    break;
-//            }
-//        }
-        switch (errorType){
-            case 40301:
-                RvFrameConfig.RvFrameInfo.TYPE_LOGIN = 0;
-                startActivity(LoginRvActivity.getIntent(mActivity,0));
-                break;
-        }
-
-    }
-
-
-    @Override
-    public void onBeforeSuccess() {
-        super.onBeforeSuccess();
-        isLoading = false;
-        if (frameLayout != null && frameLayout.getChildCount() > 1) {
-            for (int i = 0; i < frameLayout.getChildCount(); i++) {
-                if (i == 0) {
-                    continue;
-                }
-                frameLayout.removeViewAt(i);
-            }
-        }
-
-    }
-
-
-    /**
-     * 实例化对应layoutId的view同时生成ViewHelper
-     *
-     * @param group    可为null
-     * @param layoutId
-     * @param listener
-     * @return
-     */
-    protected View getHelperView(ViewGroup group, int layoutId, OnViewHolder listener) {
-        ViewHolder helper = new ViewHolder(this.getLayoutInflater().inflate(layoutId, group == null ? null : group instanceof RecyclerView ? (ViewGroup) group.getParent() : group, false));
-        if (listener != null) {
-            listener.helper(helper);
-        }
-        return helper.getItemView();
-    }
-
-
-    /**
-     * 获取通用空布局
-     *
-     * @param mRecyclerView
-     * @param imageId
-     * @param empty
-     * @return
-     */
-    protected View getEmptyView(RecyclerView mRecyclerView, final int imageId, final String empty) {
-        return getHelperView(mRecyclerView, R.layout.common_empty, new OnViewHolder() {
-            @Override
-            public void helper(ViewHolder helper) {
-                if (imageId != -1) {
-                    helper.setImageResource(R.id.iv_flag, imageId);
-                }
-                helper.setText(R.id.tv_tip, empty);
-
-
-            }
-        });
-    }
-
-    /**
-     * 获取网络异常布局
-     *
-     * @param imageId
-     * @param empty
-     * @return
-     */
-    protected View getNetErrorView(final int imageId, final String empty) {
-        return getHelperView(null, R.layout.common_net_error, new OnViewHolder() {
-            @Override
-            public void helper(ViewHolder helper) {
-                if (imageId != -1) {
-                    helper.setImageResource(R.id.iv_flag, imageId);
-                }
-                if (!TextUtils.isEmpty(empty)) {
-                    helper.setText(R.id.tv_loading, empty);
-                }
-
-                helper.setOnClickListener(R.id.tv_loading, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        loadData(null, getIntent());
-                    }
-                });
-
-
-            }
-        });
-    }
-
-}

module_home/src/main/java/com/rv/home/rv/module/basic/WebActivity.java

@@ -17,6 +17,7 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
 import com.rv.home.R;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalActivity.java

@@ -27,11 +27,11 @@ import com.baidu.mapapi.model.LatLng;
 import com.frame.rv.config.RvFrameConfig;
 import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.LocationManager;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java

@@ -18,6 +18,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
@@ -28,7 +29,6 @@ import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.bean.MultiItemBean;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.AttributeListAdapter;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CityListActivity.java

@@ -22,12 +22,12 @@ import com.frame.base.url.Constance;
 import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
 
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.LocationManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.LogUtil;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.bean.MultiItemBean;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.CityListAdapter;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -36,6 +36,7 @@ import com.frame.rv.config.RvFrameConfig;
 import com.frame.rv.widget.PayResult;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
@@ -50,7 +51,6 @@ import com.rv.component.utils.DisplayUtil;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.SelectedItemAdapter;
 import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingListActivity.java

@@ -10,9 +10,9 @@ import android.view.View;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 
 import com.rv.home.rv.module.ApiConfig;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingUploadActivity.java

@@ -14,10 +14,10 @@ import android.widget.TextView;
 
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.ruiwenliu.wrapper.weight.TitleView;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/PayForActivity.java

@@ -9,9 +9,9 @@ import android.widget.Button;
 import com.frame.rv.config.RvFrameConfig;
 import com.google.gson.annotations.SerializedName;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SalesroomActivity.java

@@ -4,9 +4,9 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 
 public class SalesroomActivity extends BaseStatusActivity<CommonPresenter> {

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectLocationActivity.java

@@ -41,11 +41,11 @@ import com.baidu.mapapi.search.sug.SuggestionSearchOption;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.LocationManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.SearchAdapter;
 import com.rv.home.rv.module.ui.main.home.bean.SearchBean;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectShopActivity.java

@@ -25,13 +25,13 @@ import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.rv.component.utils.DisplayUtil;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShopShowActivity.java

@@ -26,11 +26,11 @@ import com.baidu.mapapi.model.LatLng;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.LocationManager;
 import com.ruiwenliu.wrapper.util.MapUtil;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CancelTheTripActivity.java

@@ -15,12 +15,12 @@ import com.frame.base.bus.CancelOrderEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
 import com.rv.component.dialog.TipsDialog;
 import com.rv.home.rv.module.ui.main.home.order.adapter.CancelTheTripAdapter;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/DepositefundProgressDetailsActivity.java

@@ -18,12 +18,12 @@ import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
 import com.yuyife.okgo.OkGoUtil;
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/EvaluationActivity.java

@@ -19,6 +19,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.view.StarBar;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
@@ -27,7 +28,6 @@ import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.component.dialog.PickerDialog;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/GetOnTheCarQRCodeActivity.java

@@ -17,12 +17,12 @@ import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java

@@ -31,6 +31,7 @@ import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.frame.rv.widget.PayResult;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
@@ -39,7 +40,6 @@ import com.rv.component.utils.ClipboardUtil;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.WebActivity;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.OrderAliPayBean;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java

@@ -14,9 +14,9 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.horizontal.GallerySnapHelper;
 import com.ruiwenliu.wrapper.weight.horizontal.SpaceItemDecoration;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/PickUpTheCarQRCodeActivity.java

@@ -13,13 +13,13 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.ZxingUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/other/SelectItemActivity.java

@@ -13,11 +13,11 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.SelectItemDefaultAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.SelectItemOptionalAdapter;

module_mine/src/main/java/com/rv/rvmine/personal/IDCardCertificationShowActivity.java

@@ -7,9 +7,9 @@ import android.text.TextUtils;
 import android.widget.TextView;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.Inc;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.rvmine.R;
 import com.rv.rvmine.R2;

module_mine/src/main/java/com/rv/rvmine/traveler/AboutUsActivity.java

@@ -8,9 +8,9 @@ import android.view.View;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.rvmine.R;
 import com.rv.rvmine.R2;

module_mine/src/main/java/com/rv/rvmine/traveler/ChooseAVisitorActivity.java

@@ -14,10 +14,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.rvmine.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.rvmine.R;
 import com.rv.rvmine.adapter.TravelerListAdapter;

module_mine/src/main/java/com/rv/rvmine/traveler/CollectionActivity.java

@@ -12,11 +12,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.rvmine.R2;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.rvmine.R;
 import com.rv.rvmine.adapter.CollectionAdapter;

module_mine/src/main/java/com/rv/rvmine/traveler/MyReleaseActivity.java

@@ -13,11 +13,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.HomeRecommendBean;
 import com.rv.rvmine.R;

module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java

@@ -56,6 +56,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(getString(R.string.setting_title));
+        isShowLoadingError = false;
     }
 
     @Override
@@ -96,7 +97,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
         int id = view.getId();
         if (id == R.id.rl_item_change_password) {
             //修改密码
-            startActivity(RegisteredActivity.getIntent(mActivity, 1,0));
+            startActivity(RegisteredActivity.getIntent(mActivity, 1, 0));
 
         } else if (id == R.id.ll_item_app_push) {
             //App推送消息
@@ -115,6 +116,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
                             .updateInfo(versionCheckBean.getData().getContent())
                             .apkSize(versionCheckBean.getData().getPackagesize())
                             .isForce(versionCheckBean.getData().getIsCompel() == 0 ? false : true)
+                            .isShowToast(true)
                             .update();
                 }
             } else {
@@ -145,6 +147,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
 
         Map<String, Object> headMap = new LinkedHashMap<>();
         String versionName = UpdateAppUtils.getAppVersionName(this);
+        tvVersion.setText("当前版本 V" + versionName);
         if (!TextUtils.isEmpty(versionName)) {
             mPresenter.getData(0, String.format(ApiConfig.HTTP_URL_VERSION_CHECK, versionName), VersionCheckBean.class, headMap, false);
         }

module_mine/src/main/java/com/rv/rvmine/traveler/TravelSettingsActivity.java

@@ -5,8 +5,8 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.DrivingListActivity;
 import com.rv.rvmine.R;

plugin_member/src/main/java/com/rv.member/ConsumeRecordActivity.java

@@ -17,8 +17,6 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.order.OrderDetailActivity;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 import com.rv.member.adapter.ConsumeRecordListAdapter;
-import com.rv.component.utils.RvCache;
-import com.rv.component.utils.CacheEnum;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;

plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java

@@ -23,12 +23,12 @@ import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.dialog.PaymentTypeSelection;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
 import com.rv.member.bean.MemberListBean;

plugin_points/src/main/java/com/rv/points/SignActivity.java

@@ -17,10 +17,10 @@ import android.widget.Toast;
 
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.DisplayUtil;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.points.bean.SignRecordBean;
 import com.rv.points.bean.SignResultBean;

plugin_share/src/main/java/com/rv/share/PopularizeActivity.java

@@ -12,10 +12,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ruiwenliu.wrapper.adapter.TabAdapter;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.horizontal.GallerySnapHelper;
 import com.ruiwenliu.wrapper.weight.horizontal.SpaceItemDecoration;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.OrderMenuAdapter;
 import com.rv.share.fragment.ActivationFragment;

plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java

@@ -27,6 +27,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.bean.UserInfoBean;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
@@ -36,7 +37,6 @@ import com.rv.component.utils.CacheEnum;
 import com.rv.component.utils.DisplayUtil;
 import com.rv.component.utils.RvCache;
 import com.rv.component.utils.ZxingUtils;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.share.presenter.ReativeBillPresenter;
 import com.rv.share.utils.TransformationUtils;
 import com.yuyife.okgo.OkGoUtil;

plugin_share/src/main/java/com/rv/share/ShareActivity.java

@@ -15,12 +15,12 @@ import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.DisplayUtil;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.share.bean.PersonShareBean;
 import com.rv.share.presenter.SharePresenter;
 import com.yuyife.okgo.OkGoUtil;

plugin_share/src/main/java/com/rv/share/ShareRulerActivity.java

@@ -4,8 +4,8 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 
 public class ShareRulerActivity extends BaseStatusActivity<CommonPresenter> {

plugin_share/src/main/java/com/rv/share/WebViewActivity.java

@@ -4,11 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -18,8 +14,8 @@ import android.widget.Toast;
 import com.base.utils.tools.android.NetworkUtil;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.share.presenter.WebViewPresenter;
 import com.rv.share.view.RvWebView;
 

plugin_version/src/main/java/com/rv/version/util/UpdateAppUtils.java

@@ -27,6 +27,8 @@ public class UpdateAppUtils {
 
     public static boolean showNotification = true;
 
+    private boolean isShowToast = false;
+
     // 将所有的 属性 放入model
     private UpdateBean updateBean = new UpdateBean();
 
@@ -86,6 +88,11 @@ public class UpdateAppUtils {
         return this;
     }
 
+    public UpdateAppUtils isShowToast(boolean isShowToast) {
+        this.isShowToast = isShowToast;
+        return this;
+    }
+
 
     /**
      * 获取apk的版本号 currentVersionCode
@@ -112,7 +119,8 @@ public class UpdateAppUtils {
                 if (updateBean.getServerVersionCode() > updateBean.getLocalVersionCode()) {
                     toUpdate();
                 } else {
-//                    Toast.makeText(activity, "当前版本是最新版本", Toast.LENGTH_SHORT).show();
+                    if (isShowToast)
+                        Toast.makeText(activity, "当前版本是最新版本", Toast.LENGTH_SHORT).show();
                     Log.i(TAG, "当前版本是最新版本" + updateBean.getServerVersionCode() + "/" + updateBean.getServerVersionName());
                 }
                 break;
@@ -121,7 +129,8 @@ public class UpdateAppUtils {
                 if (!updateBean.getServerVersionName().equals(updateBean.getLocalVersionName())) {
                     toUpdate();
                 } else {
-//                    Toast.makeText(activity, "当前版本是最新版本", Toast.LENGTH_SHORT).show();
+                    if (isShowToast)
+                        Toast.makeText(activity, "当前版本是最新版本", Toast.LENGTH_SHORT).show();
                     Log.i(TAG, "当前版本是最新版本" + updateBean.getServerVersionCode() + "/" + updateBean.getServerVersionName());
                 }
                 break;

plugin_wallet/src/main/java/com/xxrv/wallet/activity/EnchashmentRecordActivity.java

@@ -12,11 +12,11 @@ import android.widget.LinearLayout;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.xxrv.wallet.R;
 import com.xxrv.wallet.R2;