1.忘记密码。

app/src/main/AndroidManifest.xml

@@ -106,6 +106,7 @@
         <activity android:name=".activity.EachOtherActivity"/>
         <activity android:name=".activity.OpinionActivity"/>
         <activity android:name=".activity.InvoiceListActivity"/>
+        <activity android:name=".activity.ForgetPasswordActivity"/>
 
 
     </application >

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

@@ -0,0 +1,26 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.databinding.ActivityForgetPasswordBinding
+import com.quansu.heifengwuliu.vmodel.ForgetPasswordVModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/25
+ */
+class ForgetPasswordActivity : MBActivity<ForgetPasswordVModel, ActivityForgetPasswordBinding>(){
+
+
+    override fun binding(): ActivityForgetPasswordBinding {
+       return ActivityForgetPasswordBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<ForgetPasswordVModel> {
+        return ForgetPasswordVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "忘记密码"
+    }
+
+}

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

@@ -23,4 +23,8 @@ class InvoiceListActivity: MBRActivity<InvoiceListVModel, InvoiceListAdapter, Ac
     override fun vmClass(): Class<InvoiceListVModel> {
         return InvoiceListVModel::class.java
     }
+
+    override fun title(): String? {
+        return "申请开票"
+    }
 }

app/src/main/java/com/quansu/heifengwuliu/adapter/InvoiceListAdapter.kt

@@ -4,12 +4,13 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.databinding.ItemBillBinding
 import com.quansu.heifengwuliu.databinding.ItemCommentListBinding
+import com.quansu.heifengwuliu.databinding.ItemInvoiceListBinding
 import com.quansu.heifengwuliu.model.AmountList
 import com.quansu.heifengwuliu.model.OrderEva
 import com.ysnows.base.base.BAdapter
 
-class InvoiceListAdapter() : BAdapter<OrderEva, BaseDataBindingHolder<ItemCommentListBinding>>(R.layout.item_comment_list) {
-    override fun convert(holder: BaseDataBindingHolder<ItemCommentListBinding>, item: OrderEva) {
+class InvoiceListAdapter() : BAdapter<OrderEva, BaseDataBindingHolder<ItemInvoiceListBinding>>(R.layout.item_invoice_list) {
+    override fun convert(holder: BaseDataBindingHolder<ItemInvoiceListBinding>, item: OrderEva) {
         holder.dataBinding?.item = item
 
     }

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

@@ -628,6 +628,15 @@ interface ApiService {
 
 
 
+    /**
+     * 待开票列表-发票
+     * @return
+     */
+    @GET("api/invoice/infoList")
+    suspend fun infoList(@Query("p") p: Int): Resp<List<OrderEva>>
+
+
+
 
 
 

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

@@ -0,0 +1,95 @@
+package com.quansu.heifengwuliu.vmodel
+
+import android.app.Activity
+import android.app.Application
+import android.content.Intent
+import android.text.TextUtils
+import androidx.databinding.Bindable
+import com.quansu.heifengwuliu.BR
+import com.quansu.heifengwuliu.model.BankCard
+import com.quansu.heifengwuliu.model.InfoBean
+import com.quansu.heifengwuliu.utils.ChosePhotoUtils
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+class ForgetPasswordVModel(application: Application) : BViewModel<BRepository>(application) {
+
+   // var image: MutableLiveData<String> = MutableLiveData("")
+   var image=""
+
+    @Bindable
+    var phone: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.phone)
+        }
+
+    @Bindable
+    var code: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.code)
+        }
+
+    @Bindable
+    var passWord: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.passWord)
+        }
+
+    @Bindable
+    var passWordTo: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.passWordTo)
+        }
+
+
+
+    fun toSubmit(){
+        if(TextUtils.isEmpty(phone)){
+            toast("请输入手机号")
+            return
+        }
+
+        if(TextUtils.isEmpty(code)){
+            toast("请输入验证码")
+            return
+        }
+        if(TextUtils.isEmpty(passWord)){
+            toast("请输入登录密码")
+            return
+        }
+
+        if(TextUtils.isEmpty(passWordTo)){
+            toast("请再次输入登录密码")
+            return
+        }
+
+        if(!passWord.equals(passWordTo)){
+            toast("两次登录密码不一致")
+            return
+        }
+
+//        repository().rxLreq(NetEngine.service.setCardBank(name, number,bank,kbank, image))
+//                .doOnNext {
+//                    if (it.ok(true)) {
+//                        var con = repository().context as Activity
+//                        con.setResult(Activity.RESULT_OK, Intent())
+//                        con.finish()
+//                    }
+//                }
+//                .subscribe()
+
+    }
+
+
+
+
+
+}
+
+
+

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

@@ -5,12 +5,10 @@ import android.app.Application
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.quansu.heifengwuliu.model.AmountCount
-import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
 import com.ysnows.base.net.IResp
-import io.reactivex.Observable
 import kotlinx.coroutines.launch
 
 class InvoiceListVModel(application: Application) : BRViewModel<BRRepository>(application) {
@@ -26,12 +24,9 @@ class InvoiceListVModel(application: Application) : BRViewModel<BRRepository>(ap
     }
 
     override fun apiFunc(): suspend () -> IResp<*> {
-        return { NetEngine.service.evaList(repository().page) }
+        return { NetEngine.service.infoList(repository().page) }
     }
 
 
-//    override fun api(): Observable<out IResponse<*>> {
-//        return NetEngine.service.evaList(repository().autoPage())
-//    }
 
 }

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

@@ -1,11 +1,15 @@
 package com.quansu.heifengwuliu.vmodel
 
+import android.app.Activity
 import android.app.Application
+import android.app.UiAutomation
 import android.graphics.Color
+import com.quansu.heifengwuliu.activity.InvoiceListActivity
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
 import com.ysnows.base.net.IResp
+import com.ysnows.base.utils.UiSwitch
 import io.reactivex.Observable
 
 class InvoiceVModel(application: Application) : BRViewModel<BRRepository>(application) {
@@ -41,7 +45,7 @@ class InvoiceVModel(application: Application) : BRViewModel<BRRepository>(applic
 
     fun goInvoice(){
         //申请开票
-
+        UiSwitch.single(repository().context as Activity, InvoiceListActivity::class.java)
 
 
     }

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

@@ -1,17 +1,19 @@
 package com.quansu.heifengwuliu.vmodel
 
+import android.app.Activity
 import android.app.Application
 import android.view.View
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
 import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.activity.ForgetPasswordActivity
 import com.quansu.heifengwuliu.config.ConfigMMKV
-import com.quansu.heifengwuliu.model.SendSmsBean
 import com.quansu.heifengwuliu.repository.LoginRepository
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.utils.MMKVManager
+import com.ysnows.base.utils.UiSwitch
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -146,4 +148,11 @@ open class LoginVModel(application: Application) : BViewModel<LoginRepository>(a
         return LoginRepository()
     }
 
+    fun goRetrieveWord(){
+
+        UiSwitch.single(repository().context as Activity, ForgetPasswordActivity::class.java)
+
+
+    }
+
 }

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

@@ -82,7 +82,7 @@ open class RegisterVModel(application: Application) : BViewModel<RegisterReposit
             toast(R.string.please_input_code)
             return
         }
-        if (showType.value!!) {
+        if (!showType.value!!) {
             toast("请勾选已阅读并同意《平台服务协议》")
             return
         }

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

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.ForgetPasswordVModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:layout_marginTop="12dp"
+            android:orientation="vertical"
+           >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:paddingStart="35dp"
+                android:paddingEnd="14dp"
+                android:layout_height="43dp">
+
+                <com.ysnows.base.widget.DelEditText
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:hint="请输入手机号"
+                    android:inputType="phone"
+                    android:text="@={vm.phone}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#BABBBD"
+                    android:textSize="@dimen/sp_14" />
+
+                  <TextView
+                      android:layout_width="wrap_content"
+                      android:textSize="14sp"
+                      android:text="获取验证码"
+                      android:textColor="#FFBC00"
+                      android:layout_height="wrap_content"/>
+
+
+            </LinearLayout>
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#F3F4F5" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="43dp"
+                android:layout_weight="1"
+                android:background="@color/white"
+                android:hint="请输入验证码"
+                android:paddingStart="35dp"
+                android:text="@={vm.code}"
+                android:textColor="@color/text_title"
+                android:textColorHint="#BABBBD"
+                android:textSize="@dimen/sp_14" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#F3F4F5" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="43dp"
+                android:layout_weight="1"
+                android:background="@color/white"
+                android:hint="请输入登录密码"
+                android:paddingStart="35dp"
+                android:text="@={vm.passWord}"
+                android:textColor="@color/text_title"
+                android:textColorHint="#BABBBD"
+                android:textSize="@dimen/sp_14" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#F3F4F5" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="43dp"
+                android:layout_weight="1"
+                android:background="@color/white"
+                android:hint="请再次输入登录密码"
+                android:paddingStart="35dp"
+                android:text="@={vm.passWordTo}"
+                android:textColor="@color/text_title"
+                android:textColorHint="#BABBBD"
+                android:textSize="@dimen/sp_14" />
+
+
+
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:onClick="@{v->vm.toSubmit()}">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="106dp"
+                android:src="@drawable/ic_details_grab" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="完成"
+                android:textColor="@color/white"
+                android:textSize="16sp">
+
+            </TextView>
+
+        </FrameLayout>
+
+
+    </LinearLayout>
+</layout>

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

@@ -17,102 +17,128 @@
         android:background="@color/color_bg"
         android:orientation="vertical">
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        <View
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:paddingStart="12dp"
-            android:paddingTop="11dp"
-            app:qmui_radius="4dp"
-            app:qmui_backgroundColor="@color/white"
-            app:qmui_borderColor="@color/white"
-            android:layout_height="80dp">
+            android:layout_height="1dp"
+            android:background="#E3E4E5" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="39dp"
+            android:background="@color/white"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingStart="6dp"
+            android:paddingEnd="12dp">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:text="共计"
-                    android:textSize="16sp"
-                    android:textColor="#3D3F4E"
-                    android:layout_height="wrap_content"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    tools:text="48"
-                    android:text="@{vm.info.total}"
-                    android:textSize="16sp"
-                    android:textColor="#3D3F4E"
-                    android:layout_height="wrap_content"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:text="条评论"
-                    android:textSize="16sp"
-                    android:textColor="#3D3F4E"
-                    android:layout_height="wrap_content"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:hint="选择时间"
+                android:textColor="@color/text_title"
+                android:textColorHint="#95959A"
+                android:textSize="12sp" />
 
 
+            <ImageView
+                android:layout_width="19dp"
+                android:layout_height="19dp"
+                android:layout_marginStart="11dp"
+                android:src="@drawable/ic_account_timeon" />
 
-            </LinearLayout>
 
-            <LinearLayout
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/refresh_layout"
                 android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:layout_marginTop="12dp"
-                android:gravity="center_vertical"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:text="平均评分"
-                    android:textSize="14sp"
-                    android:textColor="#3D3F4E"
-                    android:layout_height="wrap_content"/>
-                <ImageView
-                    android:layout_width="13dp"
-                     android:layout_height="14dp"
-                    android:textSize="16sp"
-                    android:src="@drawable/ic_star_on"
-                    android:layout_marginStart="5dp"
-                  />
-                <TextView
-                    android:layout_width="wrap_content"
-                    tools:text="4.9分"
-                    android:text="@{vm.info.avg+@string/branch}"
-                    android:textSize="12sp"
-                    android:layout_marginStart="3dp"
-                    android:textColor="#939393"
-                    android:layout_height="wrap_content"/>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="54dp"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_invoice_list" />
 
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-            </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_gravity="bottom"
+                android:background="@color/white"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="30dp"
+                    android:orientation="horizontal">
 
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="18dp"
+                        android:src="@drawable/select_on" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="全选"
+                        android:layout_marginStart="3dp"
+                        android:textColor="#1C1C1C"
+                        android:textSize="14sp" />
 
+                </LinearLayout>
 
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="合计："
+                    android:layout_marginStart="39dp"
+                    android:textColor="#1C1C1C"
+                    android:textSize="14sp" />
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="￥"
+                    android:textColor="#FFBC00"
+                    android:textSize="14sp" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/item_comment_list" />
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textColor="#FFBC00"
+                    android:textSize="20sp"
+                    tools:text="70000.00" />
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                    android:layout_width="100dp"
+                    android:layout_height="40dp"
+                    android:layout_marginEnd="12dp"
+                    android:text="申请开票"
+                    android:textColor="@color/white"
+                    android:textSize="14sp"
+                    app:qmui_backgroundColor="#FFBB00"
+                    app:qmui_borderColor="#FFBB00"
+                    app:qmui_radius="20dp" />
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+            </LinearLayout>
+
+        </FrameLayout>
 
     </LinearLayout>
 

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

@@ -178,6 +178,8 @@
                 android:layout_height="wrap_content"
                 android:text="忘记密码？"
                 android:textColor="@color/white"
+                android:onClick="@{v->vm.goRetrieveWord()}"
+
                 android:textSize="14sp" />
 
             <View

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

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.OrderEva" />
+
+    </data>
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="12dp"
+        android:paddingStart="9dp"
+        android:paddingEnd="10dp"
+        android:orientation="vertical"
+        app:qmui_radius="4dp"
+        app:qmui_borderColor="@color/white"
+        app:qmui_backgroundColor="@color/white"
+       >
+
+        <TextView
+            android:layout_width="wrap_content"
+            tools:text="运单号：YD20200901171059066"
+            android:textSize="14sp"
+            android:textColor="#26292F"
+            android:layout_marginTop="11dp"
+            android:layout_height="wrap_content"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:background="#E3E4E5"
+            android:layout_marginTop="10dp"
+            android:layout_height="1dp"/>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="15dp"
+            android:layout_height="wrap_content">
+            
+            <ImageView
+                android:layout_width="17dp"
+                 android:src="@drawable/select_on"
+                android:layout_height="18dp"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:textColor="#26292F"
+                android:textSize="15sp"
+                tools:text="苹果(农产品）· 35吨"
+                android:layout_marginStart="6dp"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginBottom="15dp"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:textColor="#FFBC00"
+                android:textSize="17sp"
+                tools:text="#FFBC00"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:textColor="#767778"
+                android:gravity="right"
+                android:textSize="13sp"
+                tools:text="2020-09-15 11:30:10"
+                android:layout_height="wrap_content"/>
+
+
+        </LinearLayout>
+
+
+
+
+
+    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+</layout>