token过期

MyFrame/src/main/java/com/frame/base/bus/SignOutEvent.java

+package com.frame.base.bus;
+
+public class SignOutEvent extends Event {
+}

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -159,8 +159,9 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
         getEffectiveTime();
         getActivityPopup();
         checkVersion();
-    }
 
+        checkToken();
+    }
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
@@ -205,18 +206,36 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
                     }).setData(act).create();
                     promotionDialog.show();
                 }
+                break;
+            case 3:
+
                 break;
             default:
                 break;
         }
     }
 
+
+    /**
+     * 检查token是否过期
+     */
+    private void checkToken() {
+        Map<String, Object> heapmap = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            map.put("Authorization", OkGoUtil.getToken());
+            map.put("token", OkGoUtil.getToken());
+            mPresenter.getData(RvFrameConfig.HOST, 3, ApiConfig.HTTP_URL_GET_TOKEN, BaseBean.class, map, heapmap, false);
+        }
+    }
+
+
     private void getActivityPopup() {
         Map<String, Object> map = new HashMap<>();
         if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
             map.put("Authorization", OkGoUtil.getToken());
+            mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_GET_ACT, ActBean.class, map, true);
         }
-        mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_GET_ACT, ActBean.class, map, true);
     }
 
     private void postActivityPopup(int id) {

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

@@ -108,12 +108,12 @@ public class RvClientApplication extends FrameApp {
         ARouter.init(RvClientApplication.this);
 
       /**********************内存检测****************************/
-        if (LeakCanary.isInAnalyzerProcess(this)) {
+       /* if (LeakCanary.isInAnalyzerProcess(this)) {
             // This process is dedicated to LeakCanary for heap analysis.
             // You should not init your app in this process.
             return;
         }
-        LeakCanary.install(this);
+        LeakCanary.install(this);*/
         /**********************************************/
     }
 

RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java

@@ -2,26 +2,19 @@ package com.xxfc.rv;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
-
-import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseActivity;
 import com.ruiwenliu.wrapper.base.BaseBean;
-import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.component.utils.Cookie;
 import com.rv.component.utils.LogUtil;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.yuyife.okgo.OkGoUtil;
-
 import java.util.concurrent.TimeUnit;
-
 import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;

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

@@ -13,6 +13,8 @@ public interface RvFrameConstant {
     int HTTP_STATE_USER_SP = 1002;//用户已存在
     int HTTP_STATE_SUCCESS = 200;//请求成功
     int HTTP_STATE_DATA_ALREADY_EXISTS = 1009;
+    int HTTP_STATE_NOT_CHECKTOKEN = 10003;   //参数不能为空",
+    int HTTP_STATE_DATA_NOT_CHECKTOKEN =10009; //"token无效",
     /**
      * 请求错误类型
      */

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

@@ -2,6 +2,8 @@ package com.ruiwenliu.wrapper.http;
 
 import android.util.Log;
 
+import com.frame.base.bus.RxBus;
+import com.frame.base.bus.SignOutEvent;
 import com.frame.rv.config.RvFrameConstant;
 import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -57,6 +59,10 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                     case RvFrameConstant.HTTP_STATE_DATA_ALREADY_EXISTS:
                         baseView.onShowError(bean.message, RvFrameConstant.HTTP_STATE_DATA_ALREADY_EXISTS);
                         break;
+                    case RvFrameConstant.HTTP_STATE_NOT_CHECKTOKEN:
+                    case RvFrameConstant.HTTP_STATE_DATA_NOT_CHECKTOKEN:
+                        RxBus.post(new SignOutEvent());
+                        break;
                     default:
                         baseView.onShowError(bean.message, bean.status);
                         break;

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

@@ -131,4 +131,9 @@ public class ApiConfig {
 
     //会员信息
     public static String RVENTHUSIAST_GETUSERMEMBER = RvFrameConfig.HOST + "/api/admin/baseUserMember/app/getUserMember";
+
+    /**
+     * 检查token是否有效
+     */
+    public static String HTTP_URL_GET_TOKEN = RvFrameConfig.HOST + "/api/auth/jwt/checkToken";
 }

module_home/src/main/java/com/rv/home/rv/module/ui/login/BingPhoneActivity.java

@@ -98,6 +98,7 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
         switch (requestType) {
             case 0:
                 showToast(mActivity.getString(R.string.rv_phone_code_toast));
+                sendCode(60);
                 break;
             case 1:
                 CheckLoginBean checkLoginBean = (CheckLoginBean) result;
@@ -118,7 +119,7 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
                 processLoginData((RegisteredBean) result);
                 break;
             case 10:
-                setDataUser((BeanUserInfo)result);
+                setDataUser((BeanUserInfo) result);
                 break;
         }
     }
@@ -142,7 +143,14 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
                 showToast(mActivity.getString(R.string.rv_phone_hint));
                 return;
             }
-            sendCode(60);
+
+            if (getPhone().length() != 11) {
+                showToast("请输入正确手机号");
+                return;
+            }
+
+            sendCode();
+
         } else if (id == R.id.tv_bind) {
             checkPhone();
         }
@@ -232,7 +240,7 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
             @Override
             public void accept(Disposable disposable) throws Exception {
                 tvGetCode.setEnabled(false);
-                sendCode();
+
             }
         }, new Observer<Long>() {
             @Override

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

@@ -139,6 +139,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         switch (requestType) {
             case 0:
                 showToast(mActivity.getString(R.string.rv_phone_code_toast));
+                sendCode(60);
                 break;
             case 1:
             case 2:
@@ -158,7 +159,13 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
                 showToast(mActivity.getString(R.string.rv_phone_hint));
                 return;
             }
-            sendCode(60);
+
+            if (getPhone().length() != 11) {
+                showToast("请输入正确手机号");
+                return;
+            }
+
+            sendCode();
         } else if (view.getId() == R.id.tv_login) {
 
             codeLogin();
@@ -307,7 +314,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
             @Override
             public void accept(Disposable disposable) throws Exception {
                 tvGetCode.setEnabled(false);
-                sendCode();
+
             }
         }, new Observer<Long>() {
             @Override

module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java

@@ -108,6 +108,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
         switch (requestType) {
             case 0:
                 showToast(mActivity.getString(R.string.rv_phone_code_toast));
+                sendCode(60);
                 break;
             case 1:
                 processLoginData((RegisteredBean) result);
@@ -132,7 +133,13 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
                 showToast(mActivity.getString(R.string.rv_phone_hint));
                 return;
             }
-            sendCode(60);
+
+            if (getPhone().length() != 11) {
+                showToast("请输入正确手机号");
+                return;
+            }
+
+            sendCode();
         } else if (view.getId() == R.id.iv_clear_code) {
             pwdShow = !pwdShow;
             ivClearPwd.setSelected(pwdShow);
@@ -325,7 +332,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
             @Override
             public void accept(Disposable disposable) throws Exception {
                 tvGetCode.setEnabled(false);
-                sendCode();
+
             }
         }, new Observer<Long>() {
             @Override

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -24,6 +24,7 @@ import com.frame.base.bus.Observer;
 import com.frame.base.bus.PaymentFailedEvent;
 import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
+import com.frame.base.bus.SignOutEvent;
 import com.frame.base.bus.WithdrawSuccessEvent;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
@@ -36,6 +37,7 @@ import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.component.utils.Cookie;
 import com.rv.component.utils.RvCache;
 import com.rv.component.utils.CacheEnum;
 import com.rv.home.rv.module.ApiConfig;
@@ -71,6 +73,7 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.OnClick;
 import butterknife.Unbinder;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 
 /**
@@ -232,6 +235,21 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
                         loadProfit();
                     }
                 });
+
+        RxBus.tObservable(SignOutEvent.class)
+//                .observeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<SignOutEvent>(disposable) {
+                    @Override
+                    public void onNext(SignOutEvent event) {
+                        UtilsManager.getInstance(_mActivity).clearShareData("city_json");
+                        UtilsManager.getInstance(_mActivity).setShNull();
+                        RvCache.getInstance(_mActivity).clear();
+                        Cookie.clear(_mActivity);
+                        OkGoUtil.clearToken();
+                        signOut();
+                    }
+                });
     }
 
 
@@ -261,7 +279,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
 
         } else if (id == R.id.tv_login) {
             //登录
-            startActivity(LoginRvActivity.getIntent(_mActivity,0));
+            startActivity(LoginRvActivity.getIntent(_mActivity, 0));
 
         } else if (id == R.id.tv_verified) {
             //实名认证
@@ -360,23 +378,28 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 101 && resultCode == 201) {
-            ivAvatar.setImageResource(R.drawable.common_icon_avatar_default);
-            tvNickname.setVisibility(View.GONE);
-            ((View) ivMember.getParent()).setVisibility(View.GONE);
-//            ivMember.setVisibility(View.GONE);
-            tvLogin.setVisibility(View.VISIBLE);
-            tvVerified.setVisibility(View.GONE);
-            tvUserIdentity.setVisibility(View.GONE);
-            tvViewPrivileges.setText("会员中心");
-            tvMembershipLevel.setText("会员特权");
-            tvMemberHint.setText("免费用车- -天");
-            tvIntegral.setText("0");
-            tvWallet.setText("0");
-            tvCoupon.setText("0");
-            mSimpleRefreshLayout.setPullDownEnable(false);
+            signOut();
         }
     }
 
+    private void signOut() {
+        ivAvatar.setBackgroundResource(0);
+        ivAvatar.setImageResource(R.drawable.common_icon_avatar_default);
+        tvNickname.setVisibility(View.GONE);
+        ((View) ivMember.getParent()).setVisibility(View.GONE);
+//            ivMember.setVisibility(View.GONE);
+        tvLogin.setVisibility(View.VISIBLE);
+        tvVerified.setVisibility(View.GONE);
+        tvUserIdentity.setVisibility(View.GONE);
+        tvViewPrivileges.setText("会员中心");
+        tvMembershipLevel.setText("会员特权");
+        tvMemberHint.setText("免费用车- -天");
+        tvIntegral.setText("0");
+        tvWallet.setText("0");
+        tvCoupon.setText("0");
+        mSimpleRefreshLayout.setPullDownEnable(false);
+    }
+
     private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
     private List<String> titles = new ArrayList<>();         //图片标题
     private List<Integer> localImages = new ArrayList<>();   //图片(本地资源)
@@ -468,7 +491,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     private boolean isLogin() {
         String token = OkGoUtil.getToken();
         if (TextUtils.isEmpty(token)) {
-            startActivity(LoginRvActivity.getIntent(_mActivity,0));
+            startActivity(LoginRvActivity.getIntent(_mActivity, 0));
             return true;
         }
         return false;