1.修改自定义支付秘密view

app/src/main/java/com/quansu/heifengwuliu/model/DriverBean.kt

@@ -9,8 +9,8 @@ import com.ysnows.base.inter.IModel
  *
  * 选择的时候 sj_uid
  */
-class DriverBean( val driver_id: String?, val sj_uid:String,val uid: String?, val avatar: String?,
+class DriverBean(  val sj_uid:String,val uid: String?, val avatar: String?,
                   val name: String?, val mobile: String?, val car_id: String?,
-                  val number: String?, val car_cate: String?,
+                  val number: String?, val car_cate: String?,val driver_id: String?,
                   var checked: Int = 0): IModel {
 }

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

@@ -17,6 +17,8 @@ open class PasswordVModel : BViewModel<BRepository>() {
 
     var type: MutableLiveData<Int> = MutableLiveData(1)
 
+    var isPayShow: MutableLiveData<Boolean> = MutableLiveData( User.get()!!.isPayPwd)
+
 
 
     @Bindable
@@ -71,6 +73,12 @@ open class PasswordVModel : BViewModel<BRepository>() {
                     .doOnNext {
                         if (it.ok(true)) {
                             toast(it.msg())
+                            if(!isShow.value!!) {
+                                //没有设置密码
+                                var user=User.get()
+                                user!!.is_pwd=1
+                                user.save()
+                            }
                             (repository().context as Activity).finish()
                         }
                     }
@@ -84,20 +92,33 @@ open class PasswordVModel : BViewModel<BRepository>() {
 
 
     fun toPaySubmit(oldPassword:String,newPassword:String){
-        if(TextUtils.isEmpty(oldPassword)){
-            toast("请输入旧支付密码")
-            return
+        var oldpwd=""
+        if(isPayShow.value!!) {
+            if (TextUtils.isEmpty(oldPassword)) {
+                toast("请输入旧支付密码")
+                return
+            }
+
+            oldpwd= oldpassWord.toString()
         }
 
+
         if(TextUtils.isEmpty(newPassword)){
             toast("请输入新支付密码")
             return
         }
-
-        repository().lreq(NetEngine.service.setPwd(oldPassword, newPassword,"1"))
+        repository().lreq(NetEngine.service.setPwd(oldpwd, newPassword,"1"))
                 .doOnNext {
                     if (it.ok(true)) {
                         toast(it.msg())
+
+                        if(!isPayShow.value!!) {
+                            //没有设置密码
+                            var user=User.get()
+                            user!!.is_pay_pwd=1
+                            user.save()
+                        }
+
                         (repository().context as Activity).finish()
                     }
                 }
@@ -105,6 +126,4 @@ open class PasswordVModel : BViewModel<BRepository>() {
 
     }
 
-
-
 }

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

@@ -183,6 +183,7 @@
                  android:layout_width="match_parent"
                  android:orientation="horizontal"
                  android:layout_marginTop="25dp"
+                 android:visibility="@{vm.isPayShow?View.VISIBLE :View.GONE}"
                  android:gravity="center_vertical"
                  android:layout_marginStart="35dp"
                  android:layout_marginEnd="35dp"