Token改造

RvClient/src/main/java/com/test/rv/RvClientApplication.java

@@ -13,9 +13,9 @@ import com.base.utils.eventbusmodel.EventRestartApp;
 import com.frame.base.FrameApp;
 import com.frame.base.bean.BeanHeartbeat;
 import com.frame.base.manager.MyFrameManager;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.util.LogUtils;
 import com.tencent.bugly.crashreport.CrashReport;
-import com.rv.home.rv.AppConfig;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
 import com.yuyife.okgo.OkGoUtil;
@@ -48,7 +48,7 @@ public class RvClientApplication extends FrameApp {
         //初始化AutoSize
         initAuto();
 
-        OkGoUtil.initOkGo(this, false);
+        OkGoUtil.initOkGo(this, true);
         MyFrameManager.getInstance().setKeepWake(false);
         setOnFrameAppListener(new OnFrameAppListener() {
             @Override
@@ -106,7 +106,7 @@ public class RvClientApplication extends FrameApp {
     }
 
     {
-        PlatformConfig.setWeixin(AppConfig.APP_ID, "088effbd5e5c5340779d512f87fab15e");
+        PlatformConfig.setWeixin(RvFrameConfig.APP_ID, "088effbd5e5c5340779d512f87fab15e");
         PlatformConfig.setQQZone("100424468", "c7394704798a158208a74ab60104f0ba");
     }
 

RvFrame/src/main/java/com/frame/rv/RvFrameConfig.java

+package com.frame.rv;
+
+
+/**
+ * Created :Auser
+ * Date: 2019/5/9.
+ * Desc:
+ */
+
+public interface RvFrameConfig extends RvFrameConstant {
+    String HOST = "https://xxtest.upyuns.com";
+    String ADMIN_POST = "/api/admin/";
+    String AUTH_POST = HOST + "/api/auth/";
+    String VEHICLE_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_CAR_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_UPLOAD = HOST + "/api/universal/";
+    String VEHICLE_ORDER = HOST + "/api/order/";
+
+
+    String APP_ID = "wx9c9d978e5698d00f";//微信注册ID
+
+    class RvFrameInfo {
+        public static int TYPE_LOGIN = 0;//登录类型0、token过期、1、租车
+    }
+
+}

RvFrame/src/main/java/com/frame/rv/RvFrameConstant.java

+package com.frame.rv;
+
+/**
+ * Created by Amuse
+ * Data:2018/12/19 0019
+ * Desc:
+ */
+
+public interface RvFrameConstant {
+
+    int HTTP_STATE_OTHER_LOGIN = 2003;//第三方登录未注册
+    int HTTP_STATE_NOT_REGISTERED = 1003;//用户未注册
+    int HTTP_STATE_USER_SP = 1002;//用户已存在
+    int HTTP_STATE_SUCCESS = 200;//请求成功
+    /**
+     * 请求错误类型
+     */
+    int ERROR_TYPE_NET = 1001;//网络已断开
+    int ERROR_TYPE_TIME_OUR = 1002;//请求超时
+    int ERROR_TYPE_HOST = 1003;//未发现指定服务器
+    int ERROR_TYPE_URL = 1004;//url错误
+    int ERROR_TYPE_EXCEPTION = 1005;//未知错误
+
+
+}

RvFrame/src/main/java/com/frame/rv/FrameTestActivity.java → RvFrame/src/main/java/com/frame/rv/RvFrameTestActivity.java

@@ -3,7 +3,7 @@ package com.frame.rv;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
-public class FrameTestActivity extends AppCompatActivity {
+public class RvFrameTestActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

RvFrame/src/main/res/layout/frame_test_main.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".FrameTestActivity">
+    tools:context=".RvFrameTestActivity">
 
     <TextView
         android:layout_width="wrap_content"

RvHome/src/main/java/com/rv/home/rv/AppConfig.java

-package com.rv.home.rv;
-
-import com.ruiwenliu.wrapper.BaseConfig;
-
-/**
- * Created :Auser
- * Date: 2019/5/9.
- * Desc:
- */
-
-public class AppConfig extends BaseConfig {
-    //    https://wanandroid.com/    http://10.1.37.192:9527   10.1.37.248:8091   :8765
-    public static  String ZJW_HOST="https://xxtest.upyuns.com";//周建威
-    public static  String HZ_HOST="https://xxtest.upyuns.com";//何政
-    //    public static  String BASE_HOST="http://10.1.37.192";
-    public static  String ADMIN_POST="/api/admin/";
-    public static  String AUTH_POST=HZ_HOST+"/api/auth/";
-    public static  String VEHICLE_POST=ZJW_HOST+"/vehicle/";//租车
-    public static  String VEHICLE_CAR_POST=HZ_HOST+"/vehicle/";//租车
-    public static  String VEHICLE_UPLOAD=HZ_HOST+"/api/universal/";
-    public static  String VEHICLE_ORDER=ZJW_HOST+"/api/order/";
-
-
-    public static final String APP_ID = "wx9c9d978e5698d00f";//微信注册ID
-    public static  int TYPE_LOGIN=0;//登录类型0、token过期、1、租车 2、
-    public static String APP_TOKEN="";
-//    public static  String BASE_URL=BASE_HOST + BASE_POST;
-
-}

RvHome/src/main/java/com/rv/home/rv/module/ApiConfig.java

 package com.rv.home.rv.module;
 
-import com.rv.home.rv.AppConfig;
+import com.frame.rv.RvFrameConfig;
 
 /**
  * Created :Auser
@@ -11,41 +11,35 @@ import com.rv.home.rv.AppConfig;
 public class ApiConfig {
 
 
-//    public static  String HTTP_URL= AppConfig.BASE_URL;
+    //    public static  String HTTP_URL= RvFrameConfig.BASE_URL;
 ////    public static  String TEST_JSON=HTTP_URL+"wxarticle/chapters/json";
 //    public static String  HTTP_URL_SEND_CODE=HTTP_URL+"auth/jwt/sendsms";//发送验证码
 //    public static String  HTTP_URL_USER_REGISTER=HTTP_URL+"auth/jwt/register";//注册
 //    public static String  HTTP_URL_SHOP_LIST=HTTP_URL+"branchCompany/search";//门店列表
 //    public static String HTTP_URL_PWD_LOGIN=HTTP_URL+"auth/jwt/token";//密码登录
-    public static String  HTTP_URL_SEND_CODE= AppConfig.AUTH_POST+"jwt/sendsms";//发送验证码
-    public static String  HTTP_URL_USER_REGISTER= AppConfig.AUTH_POST+"jwt/register";//注册
-    public static String  HTTP_URL_SHOP_LIST= AppConfig.VEHICLE_POST+"branchCompany/search";//门店列表
-    public static String HTTP_URL_PWD_LOGIN= AppConfig.AUTH_POST+"jwt/login";//验证码、密码登录
-    public static String HTTP_URL_CHECK_PHONE= AppConfig.AUTH_POST+"jwt/checkBindWechat";//检查手机号是否绑定
-    public static String HTTP_URL_OTHER_LOGIN= AppConfig.AUTH_POST+"jwt/wxlogin";//第三方登录
-    public static String HTTP_URL_PWD_RESET= AppConfig.AUTH_POST+"jwt/reset";//重置密码
-    public static String HTTP_URL_OTHER_LOGIN_BIND= AppConfig.AUTH_POST+"jwt/wxregister";//第三方登录绑定
-    public static String HTTP_URL_CAR_TYPE_LIST= AppConfig.VEHICLE_POST+"vehicleInfo/rent/usable-vehicle";//租车类型列表
-    public static String HTTP_URL_CAR_ATTRIBUTE_LIST= AppConfig.VEHICLE_CAR_POST+"cata/app/unauth/all";//租车属性列表
-    public static String HTTP_URL_FILE_UPLOAD= AppConfig.VEHICLE_UPLOAD+"file/app/unauth/upload";//文件上传
-    public static String HTTP_URL_FILE_UPLOADS= AppConfig.VEHICLE_UPLOAD+"file/app/unauth/uploadFiles";//多张图片上传
-    public static String HTTP_URL_EDIT_DRIVING= AppConfig.VEHICLE_CAR_POST+"user/license/update";//新增、编辑驾驶证
-    public static String HTTP_URL_DRIVING_LIST= AppConfig.VEHICLE_CAR_POST+"user/license/all";//驾驶证列表
-    public static String HTTP_URL_DELETE_DRIVING= AppConfig.VEHICLE_CAR_POST+"user/license/del";//删除驾驶员
-    public static String HTTP_URL_CONFIRM_ORDER= AppConfig.VEHICLE_ORDER+"orderRentVehicle/add";//确认订单
-    public static String HTTP_URL_GET_ORDER_PRICE=AppConfig.VEHICLE_ORDER+"orderRentVehicle/app/unauth/calculate-price";//获得订单价格
-    public static String HTTP_URL_WEIXIN_PAY=AppConfig.VEHICLE_UPLOAD+"pay/app/wx";//微信支付
-    public static String HTTP_URL_ORDER_LIST=AppConfig.VEHICLE_ORDER+"baseOrder/page";//订单列表
-    public static String HTTP_URL_PAY_THE_CALLBACK=AppConfig.VEHICLE_ORDER+"baseOrder/pay";//订单支付
-    public static String HTTP_URL_CAR_TYPE_DETAIL=AppConfig.HZ_HOST+"/h5/appHtml/view/detail.html";//租车类型详情页
-    public static String HTTP_URL_CAR_TYPE_ORDERDETAIL=AppConfig.HZ_HOST+"/h5/appHtml/view/orderDetail.html";//订单详情页
-    public static String HTTP_URL_BASEORDER_CANCEL= AppConfig.VEHICLE_ORDER+"baseOrder/cancel/";//重置密码
-
-
-
-
-
-
+    public static String HTTP_URL_SEND_CODE = RvFrameConfig.AUTH_POST + "jwt/sendsms";//发送验证码
+    public static String HTTP_URL_USER_REGISTER = RvFrameConfig.AUTH_POST + "jwt/register";//注册
+    public static String HTTP_URL_SHOP_LIST = RvFrameConfig.VEHICLE_POST + "branchCompany/search";//门店列表
+    public static String HTTP_URL_PWD_LOGIN = RvFrameConfig.AUTH_POST + "jwt/login";//验证码、密码登录
+    public static String HTTP_URL_CHECK_PHONE = RvFrameConfig.AUTH_POST + "jwt/checkBindWechat";//检查手机号是否绑定
+    public static String HTTP_URL_OTHER_LOGIN = RvFrameConfig.AUTH_POST + "jwt/wxlogin";//第三方登录
+    public static String HTTP_URL_PWD_RESET = RvFrameConfig.AUTH_POST + "jwt/reset";//重置密码
+    public static String HTTP_URL_OTHER_LOGIN_BIND = RvFrameConfig.AUTH_POST + "jwt/wxregister";//第三方登录绑定
+    public static String HTTP_URL_CAR_TYPE_LIST = RvFrameConfig.VEHICLE_POST + "vehicleInfo/rent/usable-vehicle";//租车类型列表
+    public static String HTTP_URL_CAR_ATTRIBUTE_LIST = RvFrameConfig.VEHICLE_CAR_POST + "cata/app/unauth/all";//租车属性列表
+    public static String HTTP_URL_FILE_UPLOAD = RvFrameConfig.VEHICLE_UPLOAD + "file/app/unauth/upload";//文件上传
+    public static String HTTP_URL_FILE_UPLOADS = RvFrameConfig.VEHICLE_UPLOAD + "file/app/unauth/uploadFiles";//多张图片上传
+    public static String HTTP_URL_EDIT_DRIVING = RvFrameConfig.VEHICLE_CAR_POST + "user/license/update";//新增、编辑驾驶证
+    public static String HTTP_URL_DRIVING_LIST = RvFrameConfig.VEHICLE_CAR_POST + "user/license/all";//驾驶证列表
+    public static String HTTP_URL_DELETE_DRIVING = RvFrameConfig.VEHICLE_CAR_POST + "user/license/del";//删除驾驶员
+    public static String HTTP_URL_CONFIRM_ORDER = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/add";//确认订单
+    public static String HTTP_URL_GET_ORDER_PRICE = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/app/unauth/calculate-price";//获得订单价格
+    public static String HTTP_URL_WEIXIN_PAY = RvFrameConfig.VEHICLE_UPLOAD + "pay/app/wx";//微信支付
+    public static String HTTP_URL_ORDER_LIST = RvFrameConfig.VEHICLE_ORDER + "baseOrder/page";//订单列表
+    public static String HTTP_URL_PAY_THE_CALLBACK = RvFrameConfig.VEHICLE_ORDER + "baseOrder/pay";//订单支付
+    public static String HTTP_URL_CAR_TYPE_DETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/detail.html";//租车类型详情页
+    public static String HTTP_URL_CAR_TYPE_ORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/orderDetail.html";//订单详情页
+    public static String HTTP_URL_BASEORDER_CANCEL = RvFrameConfig.VEHICLE_ORDER + "baseOrder/cancel/";//重置密码
 
 
 }

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

@@ -5,11 +5,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.rv.home.rv.module.ui.main.HomeActivity;
@@ -18,6 +18,7 @@ import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.utils.SocializeUtils;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -107,11 +108,11 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
         UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putString("username", registeredBean.getData().getUsername());
         UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putInt("userid", registeredBean.getData().getUserid());
         UtilsManager.getInstance(mActivity).setSharePreferencesSave("city_json").putString("token", registeredBean.getToken()).commit();
-       AppConfig.APP_TOKEN = registeredBean.getToken();
+        OkGoUtil.setToken(registeredBean.getToken());
         UtilsManager.getInstance(mActivity).setShNull();
-        switch (AppConfig.TYPE_LOGIN) {
+        switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN) {
             case 1:
-                startActivity(CarDetailActivity.getIntent(mActivity,1));
+                startActivity(CarDetailActivity.getIntent(mActivity, 1));
                 break;
             default:
                 startActivity(HomeActivity.getIntent(mActivity));

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

@@ -7,13 +7,12 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.ruiwenliu.wrapper.BaseConfig;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.util.ViewHolder;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 
 /**
@@ -39,7 +38,7 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
         super.onShowError(errorMsg, errorType);
 //        if (isLoading == true) {
 //            switch (errorType) {
-//                case BaseConfig.ERROR_TYPE_NET:
+//                case RvFrameConstant.ERROR_TYPE_NET:
 //                    if (frameLayout != null && frameLayout.getChildCount() > 0) {
 //                        View netView = frameLayout.getChildAt(1);
 //                        if (netView == null) {
@@ -51,7 +50,7 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
 //        }
         switch (errorType){
             case 40301:
-                AppConfig.TYPE_LOGIN = 0;
+                RvFrameConfig.RvFrameInfo.TYPE_LOGIN = 0;
                 startActivity(LoginRvActivity.getIntent(mActivity));
                 break;
         }

RvHome/src/main/java/com/rv/home/rv/module/basic/presenter/CommonPresenter.java

 package com.rv.home.rv.module.basic.presenter;
 
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
-import com.rv.home.rv.AppConfig;
 
 /**
  * Created by Amuse
@@ -17,6 +17,6 @@ public class CommonPresenter extends MvpPresenter {
      * 域名地址
      */
     public String getBaseUrl() {
-        return AppConfig.AUTH_POST;
+        return RvFrameConfig.AUTH_POST;
     }
 }

RvHome/src/main/java/com/rv/home/rv/module/ui/WelcomeActivity.java

@@ -9,9 +9,9 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.HomeActivity;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.concurrent.TimeUnit;
 
@@ -66,7 +66,10 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
                     @Override
                     public void accept(@NonNull Long aLong) throws Exception {
                         if (!TextUtils.isEmpty(UtilsManager.getInstance(mActivity).getSPInstance("city_json").getString("token", ""))) {
-                            AppConfig.APP_TOKEN = UtilsManager.getInstance(mActivity).getSPInstance("city_json").getString("token", "");
+                            OkGoUtil.setToken(
+                                    UtilsManager.getInstance(mActivity)
+                                            .getSPInstance("city_json")
+                                            .getString("token", ""));
                         }
                         startActivity(HomeActivity.getIntent(mActivity));
                         mDisposable.dispose();

RvHome/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java

@@ -17,7 +17,7 @@ import com.ruiwenliu.wrapper.weight.TitleView;
 
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
+import com.frame.rv.RvFrameConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseLoginActivity;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
@@ -184,7 +184,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
     @Override
     public void onShowError(String errorMsg, int errorType) {
         super.onShowError(errorMsg, errorType);
-        if (errorType == AppConfig.HTTP_STATE_OTHER_LOGIN) {
+        if (errorType == RvFrameConfig.HTTP_STATE_OTHER_LOGIN) {
             startActivity(BingPhoneActivity.getIntent(mActivity, mOpenid, mHeadImg, mLoginType, mName,mUnionid));
         }
     }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/HomeActivity.java

@@ -18,7 +18,6 @@ import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.adapter.TabAdapter;
@@ -27,6 +26,7 @@ import com.rv.home.rv.module.ui.main.found.FoundFragment;
 import com.rv.home.rv.module.ui.main.home.HomePageFragment;
 import com.rv.home.rv.module.ui.main.mine.MineFragment;
 import com.rv.home.rv.module.ui.main.travel.TravelFragment;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,7 +68,9 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
 
     public static Intent getIntent(Context context) {
         return new Intent(context, HomeActivity.class);
-    };
+    }
+
+    ;
 
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
@@ -101,14 +103,14 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
         int i = view.getId();
         if (i == R.id.rl_home) {
 
-            if (ModuleChangeUtil.getOnModuleChangedListener()!=null){
+            if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
                 ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_HOME);
                 return;
             }
             setCurrent(TYPE_HOME_PAGE);
         } else if (i == R.id.rl_travel) {
 
-            if (ModuleChangeUtil.getOnModuleChangedListener()!=null){
+            if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
                 ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_TRAVEL);
                 return;
             }
@@ -116,7 +118,7 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
             setCurrent(TYPE_TRAVEL);
 
         } else if (i == R.id.rl_camp) {
-            if (ModuleChangeUtil.getOnModuleChangedListener()!=null){
+            if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
                 ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_CAMP);
                 return;
             }
@@ -124,7 +126,7 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
             setCurrent(TYPE_CAMP);
 
         } else if (i == R.id.rl_found) {
-            if (ModuleChangeUtil.getOnModuleChangedListener()!=null){
+            if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
                 ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_FIND);
                 return;
             }
@@ -133,11 +135,11 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
 
         } else if (i == R.id.rl_mine) {
 
-            if (ModuleChangeUtil.getOnModuleChangedListener()!=null){
+            if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
                 ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_MINE);
                 return;
             }
-            if (TextUtils.isEmpty(AppConfig.APP_TOKEN)) {
+            if (TextUtils.isEmpty(OkGoUtil.getToken())) {
                 startActivity(LoginRvActivity.getIntent(mActivity));
                 return;
             }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java

@@ -16,13 +16,13 @@ import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
@@ -33,6 +33,7 @@ import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;
 import com.umeng.socialize.utils.ShareBoardlistener;
+import com.yuyife.okgo.OkGoUtil;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -177,8 +178,8 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             }
         }
         else if(view.getId()==R.id.tv_appointment){
-            if (TextUtils.isEmpty(AppConfig.APP_TOKEN)) {
-                AppConfig.TYPE_LOGIN = 1;
+            if (TextUtils.isEmpty( OkGoUtil.getToken())) {
+                RvFrameConfig.RvFrameInfo.TYPE_LOGIN = 1;
                 startActivity(LoginRvActivity.getIntent(mActivity));
                 return;
             }
@@ -200,7 +201,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
 //                break;
 //            case R.id.tv_appointment:
 //                if (TextUtils.isEmpty(MyApplication.TYPE_USER_TOKEN)) {
-//                    AppConfig.TYPE_LOGIN = 1;
+//                    RvFrameConfig.TYPE_LOGIN = 1;
 //                    startActivity(LoginRvActivity.getIntent(mActivity));
 //                    return;
 //                }

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

@@ -24,6 +24,7 @@ import android.widget.TimePicker;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.mapapi.model.LatLng;
+import com.frame.rv.RvFrameConfig;
 import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.LocationManager;
@@ -36,7 +37,6 @@ import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
@@ -211,7 +211,7 @@ public class CarRentalActivity extends BaseStatusActivity<CommonPresenter> {
         map.put("limit", 1);
         map.put("lat", lat);
         map.put("lon", lon);
-        mPresenter.getData(AppConfig.VEHICLE_POST, 0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class, map, true);
+        mPresenter.getData(RvFrameConfig.VEHICLE_POST, 0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class, map, true);
     }
 
     /**

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

@@ -13,13 +13,13 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 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;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.bean.MultiItemBean;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
@@ -245,7 +245,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
         map.put("lon", mLon);
         map.put("startDateTamp", dataBean.getStartTime());
         map.put("endDateTamp", dataBean.getEndTime());
-        mPresenter.getData(AppConfig.VEHICLE_POST, 1, ApiConfig.HTTP_URL_CAR_TYPE_LIST, CarTypeListBean.class, map, true);
+        mPresenter.getData(RvFrameConfig.VEHICLE_POST, 1, ApiConfig.HTTP_URL_CAR_TYPE_LIST, CarTypeListBean.class, map, true);
     }
 
     /**

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

@@ -16,18 +16,15 @@ import android.widget.RatingBar;
 import android.widget.TextView;
 
 import com.frame.base.glide.GlideManager;
+import com.frame.rv.RvFrameConfig;
 import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.ViewHolder;
-import com.tencent.mm.opensdk.modelpay.PayReq;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+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.weight.TitleView;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
 import com.rv.home.rv.module.ui.main.home.bean.ConfirmOrderBean;
@@ -40,6 +37,10 @@ import com.rv.home.rv.module.ui.main.home.dialog.OrderPriceDetailPw;
 import com.rv.home.rv.module.ui.main.home.dialog.PaymentTypeSelection;
 import com.rv.home.rv.until.bus.PayEvent;
 import com.rv.home.rv.until.bus.RxBus;
+import com.tencent.mm.opensdk.modelpay.PayReq;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -150,7 +151,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(mActivity.getString(R.string.rv_confirm_order));
-        api = WXAPIFactory.createWXAPI(this, AppConfig.APP_ID);
+        api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
         dataBean = (OrderDataBean) intent.getSerializableExtra("bean");
         mCarBean = (CarTypeListBean.DataBeanX.DataBean) intent.getSerializableExtra("carBean");
         intiView();
@@ -289,7 +290,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             showToast("请同意预定须知 ¥");
             return;
         }
-//        showToast("token" +AppConfig.APP_TOKEN);
+//        showToast("token" +RvFrameConfig.APP_TOKEN);
 
         new PaymentTypeSelection(mActivity) {
             @Override
@@ -328,8 +329,10 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
      */
     private void createOrder() {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
-        mPresenter.postBodyData(AppConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_CONFIRM_ORDER, ConfirmOrderBean.class, dataBean, headMap, true);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
+
+        mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_CONFIRM_ORDER, ConfirmOrderBean.class, dataBean, headMap, true);
     }
 
     /**
@@ -342,7 +345,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
         map.put("startTime", dataBean.getStartTime());
         map.put("endTime", dataBean.getEndTime());
         map.put("dayNum", dataBean.getDayNum());
-        mPresenter.getData(AppConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_GET_ORDER_PRICE, OrderPriceBean.class, map, true);
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_GET_ORDER_PRICE, OrderPriceBean.class, map, true);
     }
 
     /**
@@ -350,12 +353,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
      */
     private void orderPay(String orderNo, int payWay, int type) {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
 //        Map<String, Object> map = new LinkedHashMap<>();
 //        map.put("orderNo",orderNo);
 //        map.put("payWay",payWay);
 //        map.put("type",type);
-        mPresenter.postBodyData(AppConfig.VEHICLE_ORDER, 2, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payWay, type), headMap, true);
+        mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 2, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payWay, type), headMap, true);
     }
 
 

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

@@ -8,17 +8,18 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 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.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.DrivingListAdapter;
 import com.rv.home.rv.module.ui.main.home.bean.DrivingListBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -119,10 +120,11 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
      */
     private void getDrivingList(int page) {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("page", page);
-        mPresenter.postData(AppConfig.VEHICLE_CAR_POST, 0, ApiConfig.HTTP_URL_DRIVING_LIST, DrivingListBean.class, map, headMap, page == 1 ? true : false);
+        mPresenter.postData(RvFrameConfig.VEHICLE_CAR_POST, 0, ApiConfig.HTTP_URL_DRIVING_LIST, DrivingListBean.class, map, headMap, page == 1 ? true : false);
     }
 
     /**

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

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.frame.base.glide.GlideManager;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.rv.home.R;
 import com.rv.home.R2;
@@ -21,12 +22,12 @@ import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.ruiwenliu.wrapper.weight.TitleView;
 
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.dialog.PickerDialog;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.DrivingListBean;
 import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.io.File;
 import java.io.Serializable;
@@ -280,7 +281,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
 //                RequestBody.create(MediaType.parse("multipart/form-data"), file);
 //        MultipartBody.Part body =
 //                MultipartBody.Part.createFormData("file", file.getName(), requestFile);
-        mPresenter.getUploadFile(AppConfig.VEHICLE_UPLOAD, 0, ApiConfig.HTTP_URL_FILE_UPLOAD, ImageUploadBean.class, description, body, true);
+        mPresenter.getUploadFile(RvFrameConfig.VEHICLE_UPLOAD, 0, ApiConfig.HTTP_URL_FILE_UPLOAD, ImageUploadBean.class, description, body, true);
     }
 
 
@@ -288,7 +289,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
      * 编辑或修改驾驶证信息
      */
     private void processDriving() {
-        mPresenter.postBodyData(AppConfig.VEHICLE_CAR_POST, 1,
+        mPresenter.postBodyData(RvFrameConfig.VEHICLE_CAR_POST, 1,
                 ApiConfig.HTTP_URL_EDIT_DRIVING, BaseBean.class,
                 new addDriving(drivingId == 0 ? null : drivingId, getDrivingPhone(), getDrivingIdCard(), getDrivingName(), strCard, strCardCopy),
                 getHeadMap(), true);
@@ -301,7 +302,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
     private void deleteDriving(int id) {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("id", id);
-        mPresenter.getData(AppConfig.VEHICLE_CAR_POST, 2, ApiConfig.HTTP_URL_DELETE_DRIVING, BaseBean.class, map, getHeadMap(), true);
+        mPresenter.getData(RvFrameConfig.VEHICLE_CAR_POST, 2, ApiConfig.HTTP_URL_DELETE_DRIVING, BaseBean.class, map, getHeadMap(), true);
     }
 
 
@@ -335,7 +336,8 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
 
     private Map<String, Object> getHeadMap() {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
         return headMap;
     }
 

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/HomePageFragment.java

@@ -24,6 +24,7 @@ import android.widget.TimePicker;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.mapapi.model.LatLng;
+import com.frame.rv.RvFrameConfig;
 import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
@@ -35,7 +36,6 @@ import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
@@ -222,7 +222,7 @@ public class HomePageFragment extends BaseFragment<CommonPresenter> {
         map.put("limit", 1);
         map.put("lat", lat);
         map.put("lon", lon);
-        mPresenter.getData(AppConfig.VEHICLE_POST, 0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class, map, true);
+        mPresenter.getData(RvFrameConfig.VEHICLE_POST, 0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class, map, true);
     }
 
     /**

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

@@ -5,8 +5,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
-import android.widget.Toast;
 
+import com.frame.rv.RvFrameConfig;
 import com.google.gson.annotations.SerializedName;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.rv.home.R;
@@ -16,7 +16,6 @@ import com.ruiwenliu.wrapper.weight.TitleView;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 
@@ -54,7 +53,7 @@ public static Intent getIntent(Context context) {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle("支付");
-        api = WXAPIFactory.createWXAPI(this, AppConfig.APP_ID);
+        api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
     }
 
     @Override
@@ -104,7 +103,7 @@ public static Intent getIntent(Context context) {
     public void requestPay(){
         Map<String,Object> map=new LinkedHashMap<>();
         map.put("Authorization","eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMzYxMjY4ODUzOSIsInVzZXJJZCI6IjciLCJyZXF1ZXN0VHlwZSI6IkFQUCIsImV4cCI6MTU1OTU0MjAyOX0.s2_aejc9vFqRHC0fnVM_rDO-D0WXsE33bAYoJspRrvVhXLgfC-HblR3Nk5y5imql6nRGfhEpHd4kJT11cBDT3cSFpIOBomnUf9bMzcjLe4Dr8q61TkRq7khh2ftJP2bY_ylRbvcFU5okjlcojAnSFi3fa0s4wTdkLsGvmqf0pqM");
-        mPresenter.postBodyData(AppConfig.VEHICLE_UPLOAD,0, ApiConfig.HTTP_URL_WEIXIN_PAY, PayToData.class, new PayData("12586598","211",1,1,1,"10.1.37.192","商品1","支付","ssss",1),map,true);
+        mPresenter.postBodyData(RvFrameConfig.VEHICLE_UPLOAD,0, ApiConfig.HTTP_URL_WEIXIN_PAY, PayToData.class, new PayData("12586598","211",1,1,1,"10.1.37.192","商品1","支付","ssss",1),map,true);
     }
 
     public class PayData {

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

@@ -8,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.rv.home.R;
 import com.rv.home.R2;
@@ -15,15 +16,12 @@ 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;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.SelectShopAdapter;
 import com.rv.home.rv.module.ui.main.home.bean.ShopListBean;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 import butterknife.BindView;
@@ -132,7 +130,7 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
             map.put("lat", mLat);
             map.put("lon", mLon);
         }
-        mPresenter.getData(AppConfig.VEHICLE_POST,0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class,map, page == 1 ? true : false);
+        mPresenter.getData(RvFrameConfig.VEHICLE_POST,0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class,map, page == 1 ? true : false);
     }
 
 

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

@@ -2,15 +2,11 @@ package com.rv.home.rv.module.ui.main.home;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
@@ -26,6 +22,7 @@ import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.model.LatLng;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.LocationManager;
 import com.ruiwenliu.wrapper.util.MapUtil;
@@ -35,7 +32,6 @@ import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
 
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.dialog.PickerDialog;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
@@ -47,7 +43,6 @@ import java.util.List;
 import java.util.Map;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import io.reactivex.Observable;
 import io.reactivex.observers.DisposableObserver;
@@ -174,7 +169,7 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
             map.put("lat", mLat);
             map.put("lon", mLon);
         }
-        mPresenter.getData(AppConfig.VEHICLE_POST, 0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class, map, true);
+        mPresenter.getData(RvFrameConfig.VEHICLE_POST, 0, ApiConfig.HTTP_URL_SHOP_LIST, ShopListBean.class, map, true);
     }
 
     private void processData(ShopListBean bean) {

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java

@@ -8,17 +8,18 @@ import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.order.adapter.OrderListAdapter;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -115,11 +116,12 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
 
     private void orderData(int page) {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> mapData = new LinkedHashMap<>();
         mapData.put("page", page);
         mapData.put("limit", 10);
-        mPresenter.getData(AppConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
     }
 
     /**

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

@@ -9,16 +9,17 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import com.rv.home.rv.module.ui.main.home.order.adapter.CancelTheTripAdapter;
 import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -40,8 +41,8 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
     private String cancelReason;
     private String no;
 
-    public static Intent getIntent(Context context,String no) {
-        return new Intent(context, CancelTheTripActivity.class).putExtra("no",no);
+    public static Intent getIntent(Context context, String no) {
+        return new Intent(context, CancelTheTripActivity.class).putExtra("no", no);
     }
 
     @Override
@@ -63,7 +64,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(mActivity.getString(R.string.cancel_the_trip));
 
-       no = intent.getStringExtra("no");
+        no = intent.getStringExtra("no");
 
         mAdapter = new CancelTheTripAdapter();
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
@@ -74,9 +75,9 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<CancelTheTripBean> data = adapter.getData();
-                if (data !=null) {
+                if (data != null) {
                     for (int i = 0; i < data.size(); i++) {
-                           data.get(i).setCheck(false);
+                        data.get(i).setCheck(false);
                     }
                 }
                 CancelTheTripBean item = (CancelTheTripBean) adapter.getItem(position);
@@ -89,18 +90,20 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
 
     @OnClick(R2.id.tv_ok)
     public void onViewClicked() {
-        if (TextUtils.isEmpty(cancelReason)){
+        if (TextUtils.isEmpty(cancelReason)) {
             showToast("请选择取消原因！");
             return;
         }
-        Map<String,Object> mapHead=new LinkedHashMap<>();
-        mapHead.put("Authorization",AppConfig.APP_TOKEN);
+        Map<String, Object> headMap = new LinkedHashMap<>();
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
 //        Map<String, Object> map = new LinkedHashMap<>();
 //        map.put("cancelReason",cancelReason);
-        mPresenter.postBodyData(AppConfig.VEHICLE_ORDER,0, ApiConfig.HTTP_URL_BASEORDER_CANCEL + no, CancelTheTripBean.class, new cancelReasonBean(cancelReason), mapHead,true);
+        mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0,
+                ApiConfig.HTTP_URL_BASEORDER_CANCEL + no, CancelTheTripBean.class, new cancelReasonBean(cancelReason), headMap, true);
     }
 
-    private class  cancelReasonBean{
+    private class cancelReasonBean {
         private String cancelReason;
 
         public cancelReasonBean(String cancelReason) {

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java

@@ -8,17 +8,18 @@ import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.order.adapter.CompletedAdapter;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -128,12 +129,13 @@ public class CompletedFragment extends BaseFragment<CommonPresenter>implements B
 
     private void orderData(int page) {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> mapData = new LinkedHashMap<>();
         mapData.put("page", page);
         mapData.put("limit", 10);
         mapData.put("status", 6);
-        mPresenter.getData(AppConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
     }
 
     /**

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

@@ -16,18 +16,17 @@ import android.widget.RatingBar;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 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;
 import com.rv.home.rv.module.basic.dialog.PickerDialog;
-import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean;
 import com.rv.home.rv.module.ui.main.home.order.adapter.EvaluationAdapter;
@@ -253,7 +252,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
 //                RequestBody.create(MediaType.parse("multipart/form-data"), file);
 //        MultipartBody.Part body =
 //                MultipartBody.Part.createFormData("file", file.getName(), requestFile);
-        mPresenter.getUploadFile(AppConfig.VEHICLE_UPLOAD, 0, ApiConfig.HTTP_URL_FILE_UPLOAD, ImageUploadBean.class, description, body, true);
+        mPresenter.getUploadFile(RvFrameConfig.VEHICLE_UPLOAD, 0, ApiConfig.HTTP_URL_FILE_UPLOAD, ImageUploadBean.class, description, body, true);
     }
 
 
@@ -280,7 +279,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
         RequestBody description =
                 RequestBody.create(
                         MediaType.parse("multipart/form-data"), "flie");
-        mPresenter.getUploadFiles(AppConfig.VEHICLE_UPLOAD, 0, ApiConfig.HTTP_URL_FILE_UPLOADS, BaseBean.class,description, map, true);
+        mPresenter.getUploadFiles(RvFrameConfig.VEHICLE_UPLOAD, 0, ApiConfig.HTTP_URL_FILE_UPLOADS, BaseBean.class,description, map, true);
     }
 
 

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java

@@ -9,17 +9,18 @@ import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.order.adapter.ForPaymentAdapter;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -123,12 +124,13 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
 
     private void orderData(int page) {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> mapData = new LinkedHashMap<>();
         mapData.put("page", page);
         mapData.put("limit", 10);
         mapData.put("status", 3);
-        mPresenter.getData(AppConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
     }
 
     /**

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java

@@ -8,17 +8,18 @@ import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.order.adapter.HaveToTravelAdapter;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -113,12 +114,13 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
 
     private void orderData(int page) {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> mapData = new LinkedHashMap<>();
         mapData.put("page", page);
         mapData.put("limit", 10);
         mapData.put("status", 5);
-        mPresenter.getData(AppConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
     }
 
     /**

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

@@ -17,10 +17,10 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
+import com.yuyife.okgo.OkGoUtil;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -211,7 +211,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
         mWebView.loadUrl(webUrl);
-        mWebView.setWebViewClient(new WebViewClient(){
+        mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
                 return super.shouldOverrideUrlLoading(view, request);
@@ -231,7 +231,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
     public class AndroidJs {
         @JavascriptInterface
         public String getToken() {
-            return AppConfig.APP_TOKEN;
+            return OkGoUtil.getToken();
         }
     }
 }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java

@@ -8,17 +8,18 @@ import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.order.adapter.ToTravelAdapter;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -112,12 +113,13 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
 
     private void orderData(int page) {
         Map<String, Object> headMap = new LinkedHashMap<>();
-        headMap.put("Authorization",AppConfig.APP_TOKEN);
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> mapData = new LinkedHashMap<>();
         mapData.put("page", page);
         mapData.put("limit", 10);
         mapData.put("status", 4);
-        mPresenter.getData(AppConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
     }
 
     /**

RvHome/src/main/java/com/rv/home/wxapi/WXPayEntryActivity.java

@@ -5,11 +5,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.widget.TextView;
 
+import com.frame.rv.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.AppConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
@@ -44,7 +44,7 @@ public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> impl
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(mActivity.getString(R.string.rv_weixin_pay_success));
-        api = WXAPIFactory.createWXAPI(this, AppConfig.APP_ID);
+        api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
         api.handleIntent(getIntent(), this);
     }
 

RvWrapper/src/main/java/com/ruiwenliu/wrapper/BaseConfig.java

-package com.ruiwenliu.wrapper;
-
-/**
- * Created by Amuse
- * Data:2018/12/19 0019
- * Desc:
- */
-
-public class BaseConfig {
-
-    public static String TYPE_DB_NAME="Down_DB";//数据库名称
-
-    public final static int HTTP_STATE_OTHER_LOGIN=2003;//第三方登录未注册
-    public final static int HTTP_STATE_NOT_REGISTERED=1003;//用户未注册
-    public final static int HTTP_STATE_USER_SP=1002;//用户已存在
-    public final static int HTTP_STATE_SUCCESS=200;//请求成功
-    /**
-     * 请求错误类型
-     */
-    public static final int  ERROR_TYPE_NET=1001;//网络已断开
-    public static final int ERROR_TYPE_TIME_OUR=1002;//请求超时
-    public static final int ERROR_TYPE_HOST=1003;//未发现指定服务器
-    public static final int ERROR_TYPE_URL=1004;//url错误
-    public static final  int ERROR_TYPE_EXCEPTION=1005;//未知错误
-
-
-}

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

@@ -8,7 +8,6 @@ import android.text.TextUtils;
 import android.view.Window;
 
 
-import com.ruiwenliu.wrapper.BaseConfig;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.dialog.LoadingDialog;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;

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

@@ -2,13 +2,12 @@ package com.ruiwenliu.wrapper.base;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.view.menu.MenuView;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.ruiwenliu.wrapper.BaseConfig;
+import com.frame.rv.RvFrameConstant;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
@@ -38,7 +37,7 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
         super.onShowError(errorMsg, errorType);
         if (isLoading == true) {
             switch (errorType) {
-                case BaseConfig.ERROR_TYPE_NET:
+                case RvFrameConstant.ERROR_TYPE_NET:
                     if (frameLayout != null && frameLayout.getChildCount() > 0) {
                         View netView = frameLayout.getChildAt(1);
                         if (netView == null) {

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

@@ -10,7 +10,6 @@ import android.view.Window;
 import android.widget.Toast;
 
 
-import com.ruiwenliu.wrapper.BaseConfig;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.dialog.LoadingDialog;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;

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

@@ -2,8 +2,8 @@ package com.ruiwenliu.wrapper.http;
 
 import android.util.Log;
 
+import com.frame.rv.RvFrameConstant;
 import com.google.gson.Gson;
-import com.ruiwenliu.wrapper.BaseConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseView;
 
@@ -44,14 +44,14 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                 String result = response.body().string();
                 T bean = new Gson().fromJson(result, baseBean);
                 switch (bean.status) {
-                    case BaseConfig.HTTP_STATE_SUCCESS:
+                    case RvFrameConstant.HTTP_STATE_SUCCESS:
                         baseView.onShowResult(position, bean);
                         break;
-                    case BaseConfig.HTTP_STATE_OTHER_LOGIN:
-                        baseView.onShowError("", BaseConfig.HTTP_STATE_OTHER_LOGIN);
+                    case RvFrameConstant.HTTP_STATE_OTHER_LOGIN:
+                        baseView.onShowError("", RvFrameConstant.HTTP_STATE_OTHER_LOGIN);
                         break;
-                    case BaseConfig.HTTP_STATE_NOT_REGISTERED:
-                        baseView.onShowError("", BaseConfig.HTTP_STATE_NOT_REGISTERED);
+                    case RvFrameConstant.HTTP_STATE_NOT_REGISTERED:
+                        baseView.onShowError("", RvFrameConstant.HTTP_STATE_NOT_REGISTERED);
                         break;
                     default:
                         baseView.onShowError(bean.message, bean.status);