1. 判断user类型

app/src/main/java/com/quansu/heifengwuliu/activity/OneLoginActivity.kt

@@ -16,7 +16,7 @@ import com.ysnows.base.base.BRepository
  *Created by shihuiyun
  *on 2020/9/9
  */
-class OneLoginActivity : MBActivity<OneLoginVModel, ActivityOneloginBinding>(){
+class OneLoginActivity : MBActivity<OneLoginVModel, ActivityOneloginBinding>() {
 
 
     override fun binding(): ActivityOneloginBinding {
@@ -42,7 +42,7 @@ class OneLoginActivity : MBActivity<OneLoginVModel, ActivityOneloginBinding>(){
 
     @Subscribe(tags = [Tag(ConfigRx.ADD_ONELOGIN)])
     fun setOneLogin(token: String) {
-        Log.e("-shy-", "token1: "+token)
+        Log.e("-shy-", "token1: " + token)
         vm.oneLogin(token)
 
     }
@@ -51,24 +51,24 @@ class OneLoginActivity : MBActivity<OneLoginVModel, ActivityOneloginBinding>(){
     fun setLoginError(bean: OneLoginBean) {
 
         if (bean.code === 2016) {
-            toast( "当前网络环境不支持认证")
+            toast("当前网络环境不支持认证")
             return
         }
         if (bean.code === 2017) {
-            toast( "运营商配置错误")
+            toast("运营商配置错误")
             return
         }
         if (bean.code === 2018) {
-            toast( "本地不支持的运营商")
+            toast("本地不支持的运营商")
             return
         }
         if (bean.code === 3002) {
-            toast( "无效电话号码")
+            toast("无效电话号码")
 
             return
         }
         if (bean.code === 3003) {
-            toast( "前后两次请求少于设定时间")
+            toast("前后两次请求少于设定时间")
 
             return
         }
@@ -76,15 +76,14 @@ class OneLoginActivity : MBActivity<OneLoginVModel, ActivityOneloginBinding>(){
             //Toasts.toast(getContext(), "用户取消一键登录");
             return
         }
-        toast( bean.msg)
+        toast(bean.msg)
 
     }
 
     @Subscribe(tags = [Tag(ConfigRx.ADD_SEND_CODE)])
     fun setLoginCode(code: String) {
+        Log.d("Hello", code)
         vm.login(code)
     }
-
-
 }
 

app/src/main/java/com/quansu/heifengwuliu/model/User.java

@@ -10,29 +10,15 @@ import com.ysnows.base.utils.MMKVManager;
 
 import org.jetbrains.annotations.Nullable;
 
-public class User implements IUser, Parcelable , IModel {
-
-
-    /**
-     * uid : 185
-     * name : 微信
-     * mobile : 18353965350
-     * avatar :
-     * money : 0.00
-     * type : 1
-     * status : 1
-     * openid : 011reE00052RfK1ZQ3100fcB1Q2reE0G
-     * union_id : null
-     * create_time : 2020-09-10 19:52:56
-     * update_time : 1970-01-01 08:00:00
-     * delete_time : null
-     */
+public class User implements IUser, Parcelable, IModel {
+
+
     public String uid;
     public String name;
     public String mobile;
     public String avatar;
     public String money;
-    public String type;//1是司机 2是货主
+    public int type;//1是司机 2是货主
     public String status;
     public String openid;
     public String union_id;
@@ -40,55 +26,15 @@ public class User implements IUser, Parcelable , IModel {
     public String update_time;
     public String delete_time;
 
-
-    protected User(Parcel in) {
-        uid = in.readString();
-        name = in.readString();
-        mobile = in.readString();
-        avatar = in.readString();
-        money = in.readString();
-        type = in.readString();
-        status = in.readString();
-        openid = in.readString();
-        union_id = in.readString();
-        create_time = in.readString();
-        update_time = in.readString();
-        delete_time = in.readString();
+    public Boolean isDriver() {
+        return type == 1;
     }
 
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(uid);
-        dest.writeString(name);
-        dest.writeString(mobile);
-        dest.writeString(avatar);
-        dest.writeString(money);
-        dest.writeString(type);
-        dest.writeString(status);
-        dest.writeString(openid);
-        dest.writeString(union_id);
-        dest.writeString(create_time);
-        dest.writeString(update_time);
-        dest.writeString(delete_time);
-    }
 
-    @Override
-    public int describeContents() {
-        return 0;
+    public Boolean isShipper() {
+        return type == 2;
     }
 
-    public static final Creator<User> CREATOR = new Creator<User>() {
-        @Override
-        public User createFromParcel(Parcel in) {
-            return new User(in);
-        }
-
-        @Override
-        public User[] newArray(int size) {
-            return new User[size];
-        }
-    };
-
     @Nullable
     @Override
     public String avatar() {
@@ -114,7 +60,51 @@ public class User implements IUser, Parcelable , IModel {
     }
 
 
+    @Override
+    public int describeContents() {
+        return 0;
+    }
 
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.uid);
+        dest.writeString(this.name);
+        dest.writeString(this.mobile);
+        dest.writeString(this.avatar);
+        dest.writeString(this.money);
+        dest.writeInt(this.type);
+        dest.writeString(this.status);
+        dest.writeString(this.openid);
+        dest.writeString(this.union_id);
+        dest.writeString(this.create_time);
+        dest.writeString(this.update_time);
+        dest.writeString(this.delete_time);
+    }
 
+    protected User(Parcel in) {
+        this.uid = in.readString();
+        this.name = in.readString();
+        this.mobile = in.readString();
+        this.avatar = in.readString();
+        this.money = in.readString();
+        this.type = in.readInt();
+        this.status = in.readString();
+        this.openid = in.readString();
+        this.union_id = in.readString();
+        this.create_time = in.readString();
+        this.update_time = in.readString();
+        this.delete_time = in.readString();
+    }
 
+    public static final Creator<User> CREATOR = new Creator<User>() {
+        @Override
+        public User createFromParcel(Parcel source) {
+            return new User(source);
+        }
+
+        @Override
+        public User[] newArray(int size) {
+            return new User[size];
+        }
+    };
 }

app/src/main/java/com/quansu/heifengwuliu/repository/OneLoginRepository.kt

@@ -1,8 +1,6 @@
 package com.quansu.heifengwuliu.repository
 
 import android.annotation.SuppressLint
-import android.widget.Toast
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog
 import com.quansu.heifengwuliu.activity.HomeActivity
 import com.quansu.heifengwuliu.activity.RegisterActivity
 import com.quansu.heifengwuliu.model.LoginBean
@@ -17,19 +15,21 @@ class OneLoginRepository : BRepository() {
     fun login(token: String) {
 
         lreq(NetEngine.service.wxLogin(token))
-                .doOnNext{
+                .doOnError(){
+                   it.printStackTrace()
+                }
+                .doOnNext {
                     if (it.ok(true)) {
 
-                        var bean: LoginBean =it.data() as LoginBean;
-                        MMKV.defaultMMKV().putString("token",bean.TOKEN)
+                        val bean: LoginBean = it.data() as LoginBean;
+                        MMKV.defaultMMKV().putString("token", bean.TOKEN)
 
                         UiSwitch.single(context, HomeActivity::class.java)
 
-                    }else{
-                        if(it.code()==0){
-
-                            UiSwitch.bundle(context,RegisterActivity::class.java, B.with().putString("open_id", token).ok())
+                    } else {
+                        if (it.code() == 0) {
 
+                            UiSwitch.bundle(context, RegisterActivity::class.java, B.with().putString("open_id", token).ok())
                         }
                     }
                 }
@@ -39,13 +39,13 @@ class OneLoginRepository : BRepository() {
 
 
     @SuppressLint("CheckResult")
-    fun simLogin(mobile:String,type: String) {
+    fun simLogin(mobile: String, type: String) {
 
-        lreq(NetEngine.service.simlRegister(mobile,type))
-                .doOnNext{
+        lreq(NetEngine.service.simlRegister(mobile, type))
+                .doOnNext {
                     if (it.ok(true)) {
-                        var bean: LoginBean =it.data() as LoginBean;
-                        MMKV.defaultMMKV().putString("token",bean.TOKEN)
+                        var bean: LoginBean = it.data() as LoginBean;
+                        MMKV.defaultMMKV().putString("token", bean.TOKEN)
                         UiSwitch.single(context, HomeActivity::class.java)
                     }
                 }

app/src/main/java/com/quansu/heifengwuliu/wxapi/WXEntryActivity.kt

@@ -88,7 +88,6 @@ class WXEntryActivity : Activity(), IWXAPIEventHandler {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Log.e("onCreate", "onCreate: ")
         RxBus.get().register(this)
         val mWXApi = WXAPIFactory.createWXAPI(this, WeChatUtil.WECHAT_APP_ID, true)
         mWXApi.handleIntent(intent, this)