Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

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>

component_utils/src/main/java/com/rv/component/utils/LocationRecord.java

+package com.rv.component.utils;
+
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/******
+ * 记录上一次的经纬度
+ */
+public class LocationRecord {
+
+    private final static String FILE_NAME = "location_cookie";
+
+    private final static String KEY_LAT = "key_lat";
+
+    private final static String KEY_LON = "key_lon";
+
+    private static SharedPreferences preferences;
+
+    private static SharedPreferences getPreference(Context context) {
+        if (preferences == null) {
+            preferences = context.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE);
+        }
+        return preferences;
+    }
+
+    public static double getOrSavelatLatitude(Context context, int errorCode, double latLatitude) {
+        if (errorCode == 61 || errorCode == 161) {
+            saveLat(context, latLatitude);
+        } else {
+            latLatitude = getLat(context);
+            if (latLatitude == 0d) {
+                latLatitude = 22.954073;
+            }
+        }
+        return latLatitude;
+    }
+
+    public static double getOrSaveLonLongitude(Context context, int errorCode, double lonLongitude) {
+        if (errorCode == 61 || errorCode == 161) {
+            saveLon(context, lonLongitude);
+        } else {
+            lonLongitude = getLon(context);
+            if (lonLongitude == 0d) {
+                lonLongitude = 113.881138;
+            }
+        }
+        return lonLongitude;
+    }
+
+    public static void savePosition(Context context, int errorCode, double latLatitude, double lonLongitude) {
+        if (errorCode == 61 || errorCode == 161) {
+            LocationRecord.saveLat(context, latLatitude);
+            LocationRecord.saveLon(context, lonLongitude);
+        } else {
+            latLatitude = LocationRecord.getLat(context);
+            lonLongitude = LocationRecord.getLat(context);
+            if (latLatitude == 0) {
+                latLatitude = 23.05;
+            }
+            if (lonLongitude == 0) {
+                lonLongitude = 113.75;
+            }
+        }
+    }
+
+    public static void saveLat(Context context, double s) {
+        getPreference(context).edit().putString(KEY_LAT, String.valueOf(s)).commit();
+    }
+
+    public static double getLat(Context context) {
+        return Double.valueOf(getPreference(context).getString(KEY_LAT, "0.00"));
+    }
+
+    public static void saveLon(Context context, double s) {
+        getPreference(context).edit().putString(KEY_LON, String.valueOf(s)).commit();
+    }
+
+    public static double getLon(Context context) {
+        return Double.valueOf(getPreference(context).getString(KEY_LON, "0.00"));
+    }
+
+}

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;
@@ -66,7 +66,7 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
             }
         });
 
-        mAdapter = new DrivingListAdapter(dataBean != null);
+        mAdapter = new DrivingListAdapter(openType == 1);
         mAdapter.setOnLoadMoreListener(this, recyclerView);
         recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
         recyclerView.setAdapter(mAdapter);

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;

module_tourism/src/main/java/com/rv/tourism/TourismFragment.java

@@ -39,6 +39,7 @@ import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.component.utils.LocationRecord;
 import com.rv.tourism.adapter.AllPopularAdapter;
 import com.rv.tourism.adapter.PopularBrigadeAdapter;
 import com.rv.tourism.adapter.TourAroundAdapter;
@@ -420,10 +421,13 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
         if (geoCoder != null) {
             geoCoder.destroy();
         }
+        if (locationManager != null) {
+            locationManager.stopLocation();
+            locationManager.onDestroy();
+        }
     }
 
-
-//    @Override
+    //    @Override
 //    public void onLoadMoreRequested() {
 //        if (mPage >= countPage) {
 //            mTourAroundAdapter.loadMoreEnd();
@@ -568,8 +572,8 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
                 if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
                     //没有检索到结果
                 } else {
-                    latLatitude = result.getLocation().latitude;
-                    lonLongitude = result.getLocation().longitude;
+                    latLatitude = LocationRecord.getOrSavelatLatitude(getContext(), 161, result.getLocation().latitude);
+                    lonLongitude = LocationRecord.getOrSaveLonLongitude(getContext(), 161, result.getLocation().longitude);
 
                     mTourAroundAdapter.getData().clear();
                     mTourAroundAdapter.notifyDataSetChanged();
@@ -583,8 +587,8 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
                 if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
                     //没有找到检索结果
                 } else {
-                    latLatitude = result.getLocation().latitude;
-                    lonLongitude = result.getLocation().longitude;
+                    latLatitude = LocationRecord.getOrSavelatLatitude(getContext(), 161, result.getLocation().latitude);
+                    lonLongitude = LocationRecord.getOrSaveLonLongitude(getContext(), 161, result.getLocation().longitude);
                     mTourAroundAdapter.getData().clear();
                     mTourAroundAdapter.notifyDataSetChanged();
                     loadTourAroundData();
@@ -611,15 +615,10 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
                 //获取经纬度坐标类型，以LocationClientOption中设置过的坐标类型为准
                 String coorType = location.getCoorType();
                 //获取定位类型、定位错误返回码，具体信息可参照类参考中BDLocation类中的说明
-                int errorCode = location.getLocType();
-//                setGpsContent("count=:",String.valueOf(count));
-//                setGpsContent("latitude:",String.valueOf(location.getLatitude()));
-//                setGpsContent("longitude:",String.valueOf(location.getLongitude()));
-//                setGpsContent("城市:",location.getCity());
-//                setGpsContent("街道:",location.getAddrStr());
-//                setGpsContent("当前位置:",location.getLocationDescribe());
-                latLatitude = location.getLatitude();
-                lonLongitude = location.getLongitude();
+                int errorCode = location.getLocType();  //62
+                latLatitude = LocationRecord.getOrSavelatLatitude(getContext(), errorCode, location.getLatitude());
+                lonLongitude = LocationRecord.getOrSaveLonLongitude(getContext(), errorCode, location.getLongitude());
+
                 mLatLng = new LatLng(location.getLatitude(), location.getLongitude());
                 loadTourAroundData();
                 if (!TextUtils.isEmpty(location.getCity()))

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/BillActivity.java

@@ -34,9 +34,9 @@ import butterknife.OnClick;
  */
 public class BillActivity extends BaseStatusActivity<BillPresenter> {
 
-    @BindView(R2.id.tv_back_title)
-    TextView tvBackTitle;
-    @BindView(R2.id.btn_share)
+    //    @BindView(R2.id.tv_back_title)
+//    TextView tvBackTitle;
+    @BindView(R2.id.btn_share_bill)
     Button btnShare;
     @BindView(R2.id.ll_webview)
     CardView llContent;
@@ -50,11 +50,11 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
         return intent;
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
-    }
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
+//    }
 
     @Override
     protected int setLayout() {
@@ -66,7 +66,8 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
 
         url = intent.getStringExtra("billUrl");
-        titleView.setVisibility(View.GONE);
+        titleView.setVisibility(View.VISIBLE);
+        titleView.setTitle("生成海报");
 
         rvWebView = new RvWebView(getApplicationContext(), listener);
         llContent.addView(rvWebView);
@@ -113,13 +114,13 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
         super.onDestroy();
     }
 
-    @OnClick({R2.id.tv_back_title, R2.id.btn_share})
+    @OnClick({R2.id.btn_share_bill, R2.id.btn_save_bill})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id == R.id.tv_back_title) {
-            finish();
-        } else if (id == R.id.btn_share) {
+        if (id == R.id.btn_share_bill) {
             preShare();
+        } else if (id == R.id.btn_save_bill) {
+            mPresenter.saveBill(llContent);
         }
     }
 

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;
 
@@ -146,11 +142,17 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
                     ivTitleRight.setImageResource(R.drawable.tourism_rv_rentingcar_icon_share);
                 }
             });
-            final String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeoplePoster.html";
+            String billUrl = null;
+            if (!TextUtils.isEmpty(url) && url.contains("invitationCourtesyShare.html")) {
+                billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/poster.html";
+            } else if (!TextUtils.isEmpty(url) && url.contains("newPeopleH5.html")) {
+                billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeoplePoster.html";
+            }
+            final String finalBillUrl = billUrl;
             ivTitleRight.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
+                    mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, finalBillUrl);
                 }
             });
         }

plugin_share/src/main/java/com/rv/share/presenter/BillPresenter.java

@@ -8,8 +8,10 @@ import android.support.v7.widget.CardView;
 import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
+import android.widget.Toast;
 
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
+import com.rv.component.utils.ShareUtils;
 import com.rv.component.utils.StorageUtils;
 import com.rv.share.view.ShareChoiceDialog;
 import com.umeng.socialize.ShareAction;
@@ -45,6 +47,23 @@ public class BillPresenter extends CommonPresenter {
         dialog.show();
     }
 
+    /*****
+     * 保存海报
+     * @param view
+     */
+    public void saveBill(View view) {
+        if (view != null) {
+            Bitmap bitmap = ShareUtils.viewConversionBitmap(view);
+            File file = null;
+            if (bitmap != null) {
+                file = ShareUtils.saveBitmapFile(getPresenterContext(), bitmap);
+            }
+            if (file != null) {
+                Toast.makeText(getPresenterContext(), "海报保存在" + file.getAbsolutePath(), Toast.LENGTH_LONG).show();
+            }
+        }
+    }
+
     /******
      * 分享地址
      * @param var1
@@ -155,6 +174,8 @@ public class BillPresenter extends CommonPresenter {
             }
             if (file != null) {
                 image = new UMImage(getPresenterContext(), file);//bitmap文件
+                UMImage thumb = new UMImage(getPresenterContext(), file);
+                image.setThumb(thumb);
                 image.compressStyle = UMImage.CompressStyle.SCALE;//大小压缩，默认为大小压缩，适合普通很大的图
                 image.compressStyle = UMImage.CompressStyle.QUALITY;//质量压缩，适合长图的分享
                 image.compressFormat = Bitmap.CompressFormat.PNG;

plugin_share/src/main/java/com/rv/share/presenter/ReativeBillPresenter.java

@@ -83,6 +83,8 @@ public class ReativeBillPresenter extends CommonPresenter {
             }
             if (file != null) {
                 image = new UMImage(getPresenterContext(), file);//bitmap文件
+                UMImage thumb = new UMImage(getPresenterContext(), file);
+                image.setThumb(thumb);
                 image.compressStyle = UMImage.CompressStyle.SCALE;//大小压缩，默认为大小压缩，适合普通很大的图
                 image.compressStyle = UMImage.CompressStyle.QUALITY;//质量压缩，适合长图的分享
                 image.compressFormat = Bitmap.CompressFormat.PNG;

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -4,7 +4,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.ConsoleMessage;
@@ -18,7 +17,6 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 
 import com.ruiwenliu.wrapper.SPConstance;
-import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.LogUtil;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;

plugin_share/src/main/res/drawable/bg_btn_bill_save.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/size_20" />
+    <corners android:radius="@dimen/size_30" />
     <solid android:color="@color/white" />
 </shape>
\ No newline at end of file

plugin_share/src/main/res/layout/activity_bill.xml

@@ -4,54 +4,41 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FE6E2F"
+    android:background="#FBE4B3"
     tools:context=".BillActivity">
 
-    <com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
-        android:id="@+id/ll_item_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:use_type="use_padding_top">
-
-        <TextView
-            android:id="@+id/tv_back_title"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/size_40"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:drawableLeft="@drawable/rv_common_icon_back_white"
-            android:drawablePadding="@dimen/size_5"
-            android:gravity="center_vertical"
-            android:text="生成海报"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_18" />
-    </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
-
     <LinearLayout
         android:id="@+id/ll_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/dp_10"
         android:gravity="center"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="分享海报，可以让好友一起参加啦~"
-            android:textColor="@color/gray_f5f5f5"
-            android:textSize="@dimen/sp_12" />
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/size_15">
 
         <Button
-            android:id="@+id/btn_share"
-            android:layout_width="match_parent"
+            android:id="@+id/btn_save_bill"
+            android:layout_width="0dp"
             android:layout_height="@dimen/size_48"
-            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginLeft="@dimen/size_15"
             android:layout_marginTop="@dimen/size_5"
             android:layout_marginRight="@dimen/dp_10"
+            android:layout_weight="1"
+            android:background="@drawable/bg_btn_bill_save"
+            android:gravity="center"
+            android:text="保存海报"
+            android:textColor="#FE9C36"
+            android:textSize="@dimen/sp_16" />
+
+        <Button
+            android:id="@+id/btn_share_bill"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_48"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginTop="@dimen/size_5"
+            android:layout_marginRight="@dimen/size_15"
+            android:layout_weight="1"
             android:background="@drawable/shape_rv_bg_dark_yellow"
             android:gravity="center"
             android:text="立即分享"
@@ -65,10 +52,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/ll_item_title"
-        android:layout_marginBottom="@dimen/size_100"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/size_30"
-        android:layout_marginRight="@dimen/dp_10"
+        android:layout_marginLeft="@dimen/size_15"
+        android:layout_marginTop="@dimen/size_15"
+        android:layout_marginRight="@dimen/size_15"
+        android:layout_marginBottom="@dimen/size_80"
         android:background="@drawable/shape_rv_bg_bill"
         android:orientation="vertical"
         app:cardCornerRadius="5dp" />

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;