Merge remote-tracking branch 'origin/master'

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

@@ -11,5 +11,4 @@ public class LoginBean implements IModel {
     public String name;
     public String mobile;
     public String TOKEN;
-
 }

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

@@ -12,41 +12,90 @@ import org.jetbrains.annotations.Nullable;
 
 public class User implements IUser, Parcelable , IModel {
 
-    public String id;
-    public String nick_name;
+
+    /**
+     * 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 String uid;
+    public String name;
+    public String mobile;
     public String avatar;
-    public String open_id;
-    public String bac_time;
-    public int create_time;
-    public String user_mobile;
-    public int vip;
-    public int ab_uid;
-    public String user_name;
-    public String vip_time;
+    public String money;
+    public String type;//1是司机 2是货主
+    public String status;
+    public String openid;
+    public String union_id;
+    public String create_time;
+    public String update_time;
+    public String delete_time;
 
 
-    @Nullable
+    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();
+    }
+
     @Override
-    public String id() {
-        return id;
+    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);
     }
 
-    @Nullable
     @Override
-    public String nickName() {
-        return nick_name;
+    public int describeContents() {
+        return 0;
     }
 
+    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() {
         return avatar;
     }
 
-    @Nullable
-    @Override
-    public String userName() {
-        return user_name;
+    public User() {
     }
 
 
@@ -65,57 +114,7 @@ public class User implements IUser, Parcelable , IModel {
     }
 
 
-    public User() {
-    }
-
-    @Override
-    public boolean vip() {
-        return vip == 1;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
 
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.id);
-        dest.writeString(this.nick_name);
-        dest.writeString(this.avatar);
-        dest.writeString(this.open_id);
-        dest.writeString(this.bac_time);
-        dest.writeInt(this.create_time);
-        dest.writeString(this.user_mobile);
-        dest.writeInt(this.vip);
-        dest.writeInt(this.ab_uid);
-        dest.writeString(this.user_name);
-        dest.writeString(this.vip_time);
-    }
 
-    protected User(Parcel in) {
-        this.id = in.readString();
-        this.nick_name = in.readString();
-        this.avatar = in.readString();
-        this.open_id = in.readString();
-        this.bac_time = in.readString();
-        this.create_time = in.readInt();
-        this.user_mobile = in.readString();
-        this.vip = in.readInt();
-        this.ab_uid = in.readInt();
-        this.user_name = in.readString();
-        this.vip_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/HomeRepository.kt

@@ -1,27 +1,23 @@
 package com.quansu.heifengwuliu.repository
 
-import android.annotation.SuppressLint
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRepository
 
 class HomeRepository : BRepository() {
-    @SuppressLint("CheckResult")
-    fun getuserinfo() {
 
-        lreq(NetEngine.service.getuserinfo())
-                .doOnNext {
-                    if (it.ok(false)) {
+    fun getUserInfo() {
 
-                    } else {
-//                        if(it.code()== NetCode.CODE_OFFLINE){
-//                            UiSwitch.single(context, OneLoginActivity::class.java)
-//
-//                        }
-                    }
+        lreq(NetEngine.service.getUser())
+                .doOnNext {
+                    if (it.ok()) {
+                            it.data()?.let { user ->
+                                user.save()
+                            }
+                        }
                 }
                 .subscribe();
 
-    }
+        }
 
 
 }

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -13,8 +13,6 @@ import java.util.*
  */
 interface ApiService {
 
-    @GET("user")
-    fun getUser(): Observable<Response<User>>
 
 
     @POST("task/save")
@@ -130,8 +128,7 @@ interface ApiService {
     fun wxLogin(@Field("code") code: String?): Observable<Response<LoginBean>>
 
 
-    @GET("api/user/getuserinfo")
-    fun getuserinfo(): Observable<Response<LoginBean>>
+
 
     /**
      简易版注册
@@ -141,5 +138,14 @@ interface ApiService {
     @POST("api/index/siml_register")
     @FormUrlEncoded
     fun simlRegister(@Field("mobile") mobile: String?,@Field("type") type: String?): Observable<Response<LoginBean>>
+    /**
+     * 用户信息
+     * @return
+     */
+    @GET("api/user/getuserinfo")
+    fun getUser(): Observable<Response<User>>
+
+
+
 
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/HomeVModel.kt

@@ -10,7 +10,7 @@ open class HomeVModel : BViewModel<HomeRepository>() {
     val user: LiveData<User> = MutableLiveData<User>()
 
     fun getUserInfo() {
-        repository().getuserinfo()
+        repository().getUserInfo()
     }
 
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/SettingsVModel.kt

@@ -6,7 +6,7 @@ import com.quansu.heifengwuliu.repository.UserInfoRepository
 import com.ysnows.base.base.BViewModel
 
 class SettingsVModel : BViewModel<UserInfoRepository>() {
-    val user: MutableLiveData<User> = MutableLiveData(User.get())
+    val user: MutableLiveData<User?> = MutableLiveData(User.get())
 
 
     override fun firstReq() {
@@ -22,4 +22,4 @@ class SettingsVModel : BViewModel<UserInfoRepository>() {
     fun buyVip() {
     }
 
-}
+}

app/src/main/res/layout/activity_private_center.xml

@@ -44,7 +44,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:onClick="@{v-> vm.user==null?vm.view().toLogin():null}"
-                android:text="@{vm.user==null?`SULTRA`:vm.user.nickName()}"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_16" />
 
@@ -216,4 +215,4 @@
         </LinearLayout >
 
     </LinearLayout >
-</layout >
+</layout >

app/src/main/res/layout/activity_settings.xml

@@ -51,7 +51,6 @@
                             android:id="@+id/tv_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{@string/app_name+` V`+BuildConfig.VERSION_NAME}"
                             android:textColor="@color/primary_text"
                             android:textSize="@dimen/sp_16" />
 
@@ -59,7 +58,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_3"
-                            android:text="@{vm.user.vip()?vm.user.vip_time:@string/vip_intro}"
                             android:textColor="@color/text_hint"
                             android:textSize="@dimen/sp_13" />
                     </LinearLayout >
@@ -74,7 +72,6 @@
                         android:paddingRight="@dimen/dp_8"
                         android:paddingBottom="@dimen/dp_4"
                         android:onClick="@{v->vm.buyVip()}"
-                        android:text="@{vm.user.vip()?@string/unlocked_vip:@string/unlock_vip}"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_13"
                         app:qmui_backgroundColor="@color/colorPrimary"
@@ -997,4 +994,4 @@
             </LinearLayout >
         </ScrollView >
     </LinearLayout >
-</layout >
+</layout >

base/src/main/java/com/ysnows/base/inter/IUser.kt

@@ -1,11 +1,7 @@
 package com.ysnows.base.inter
 
 interface IUser {
-    fun id(): String?
-    fun nickName(): String?
-    fun userName(): String?
     fun avatar(): String?
     fun save(): Boolean
-    fun vip(): Boolean
 
-}
+}