1.账单列表。

app/src/main/AndroidManifest.xml

@@ -97,6 +97,7 @@
         <activity android:name=".activity.VehicleInfoActivity"/>
         <activity android:name=".activity.EvaluateActivity"/>
         <activity android:name=".activity.WithdrawalActivity"/>
+        <activity android:name=".activity.BillDetailsActivity"/>
 
 
     </application >

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

@@ -0,0 +1,35 @@
+package com.quansu.heifengwuliu.activity
+
+import android.os.Bundle
+import com.quansu.heifengwuliu.adapter.BillDetailsAdapter
+import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.databinding.ActivityBilldetailsBinding
+import com.quansu.heifengwuliu.vmodel.BillDetailsVModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/23
+ */
+class BillDetailsActivity : MBRActivity<BillDetailsVModel, BillDetailsAdapter, ActivityBilldetailsBinding>(){
+
+
+    override fun initCreate(savedInstanceState: Bundle?) {
+        super.initCreate(savedInstanceState)
+        vm.getTotalInfo()
+    }
+    override fun binding(): ActivityBilldetailsBinding {
+        return ActivityBilldetailsBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<BillDetailsVModel> {
+        return BillDetailsVModel::class.java
+    }
+
+    override fun initAdapter(): BillDetailsAdapter {
+       return BillDetailsAdapter()
+    }
+
+    override fun title(): String? {
+        return "账单列表"
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.quansu.heifengwuliu.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.databinding.ItemBillBinding
+import com.quansu.heifengwuliu.model.AmountList
+import com.ysnows.base.base.BAdapter
+
+class BillDetailsAdapter() : BAdapter<AmountList, BaseDataBindingHolder<ItemBillBinding>>(R.layout.item_bill) {
+    override fun convert(holder: BaseDataBindingHolder<ItemBillBinding>, item: AmountList) {
+        holder.dataBinding?.item = item
+
+    }
+}

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

@@ -6,5 +6,6 @@ import com.ysnows.base.inter.IModel
  *Created by shihuiyun
  *on 2020/9/22
  */
-data class AmountCount(var money:String,var frozen:String,var can_use:String) : IModel {
+data class AmountCount(var money:String,var frozen:String,var can_use:String,
+                       var money_in:String,var money_out:String) : IModel {
 }

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

@@ -60,7 +60,7 @@ data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<St
                          var type_info: TypeInfoBean) : IModel {
 
 
-        data class TypeInfoBean(var type_id: String, var type_name: String, @SerializedName("long") var longx: String,
+        data class TypeInfoBean(var type_id: String, var type_name: String,  var length: String,
 
                                 ): IModel{
         }

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

@@ -24,7 +24,7 @@ data class InfoListBean(var info_id: String, var info_state: Int,
                         var company_name:String,var order_state:Int
 ) : IModel {
 
-    data class TypeInfoBean(var type_id: String,var type_name: String, @SerializedName("long") var longx: String,
+    data class TypeInfoBean(var type_id: String,var type_name: String,  var length: String,
 
     ): IModel{
     }

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

@@ -486,6 +486,13 @@ interface ApiService {
                  @Field("number") number: String?
     ): Observable<Response<Any>>
 
+    /**
+     *明细列表统计-资金
+     * @return
+     */
+    @GET("api/amount/amountTotal")
+    fun amountTotal(@Query("type") type: String,@Query("status") status: String, @Query("p") p: Int): Observable<Response<AmountCount>>
+
 
 
 

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

@@ -3,6 +3,7 @@ package com.quansu.heifengwuliu.vmodel
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.activity.BillDetailsActivity
 import com.quansu.heifengwuliu.activity.WithdrawalActivity
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.fragment.AccountBillFragment
@@ -60,6 +61,7 @@ import io.reactivex.Observable
 
     fun toBillDetails(){//账单明细
 
+        UiSwitch.single(repository().context, BillDetailsActivity::class.java)
 
     }
 }

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

@@ -0,0 +1,41 @@
+package com.quansu.heifengwuliu.vmodel
+
+
+import androidx.lifecycle.MutableLiveData
+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.IResponse
+import io.reactivex.Observable
+
+class BillDetailsVModel : BRViewModel<BRRepository>() {
+
+    val info: MutableLiveData<AmountCount> = MutableLiveData<AmountCount>()
+
+    var type="0"
+    var status="0"
+
+
+    fun getTotalInfo() {
+        //添加司机
+
+        repository()
+                .lreq(NetEngine.service.amountTotal(type,status,repository().autoPage()))
+                .doOnNext {
+                    if (it.ok(false)) {
+                        var bean=it.data() as AmountCount
+                        info.value=bean
+
+                    }
+                }
+                .subscribe()
+    }
+
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.amountList(type,status,repository().autoPage())
+    }
+
+}

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

@@ -0,0 +1,101 @@
+<?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="vm"
+            type="com.quansu.heifengwuliu.vmodel.BillDetailsVModel" />
+    </data>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="11dp"
+            android:layout_marginTop="12dp"
+            android:background="@drawable/ic_account_one"
+            android:layout_height="118dp">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="入账合计(元)"
+                    android:textSize="14sp"
+                    android:textColor="@color/white"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:textSize="27sp"
+                    android:layout_marginTop="9dp"
+                    android:text="@{vm.info.money_in}"
+                    tools:text="20000"
+                    android:textColor="@color/white"
+                    android:layout_height="wrap_content"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="支出合计(元)"
+                    android:textSize="14sp"
+                    android:textColor="@color/white"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:textSize="27sp"
+                    android:layout_marginTop="9dp"
+                    tools:text="30000"
+                    android:text="@{vm.info.money_out}"
+                    android:textColor="@color/white"
+                    android:layout_height="wrap_content"/>
+
+            </LinearLayout>
+
+
+
+        </LinearLayout>
+
+
+
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingBottom="70dp"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_bill" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+    </LinearLayout>
+
+</layout>

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

@@ -387,7 +387,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.longx}"
+                            android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.length}"
                             tools:text="平板货车 · 13米" />
 
                     </LinearLayout>

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

@@ -470,7 +470,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_weight="1"
                                     android:gravity="right"
-                                    android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.longx+@string/rice}"
+                                    android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.length+@string/rice}"
                                     android:textColor="@color/text_title"
                                     android:textSize="@dimen/sp_14"
                                     tools:text="电话:1835399999"></TextView>

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

@@ -156,7 +156,7 @@
                 tools:text="平板货车 · 13米"
                 android:textColor="#727374"
                 android:textSize="13sp"
-                android:text="@{item.type_info.type_name +@string/spot+item.type_info.longx+@string/rice}"
+                android:text="@{item.type_info.type_name +@string/spot+item.type_info.length+@string/rice}"
                 app:layout_constraintBottom_toBottomOf="@id/img_vehicle"
                 app:layout_constraintStart_toEndOf="@id/img_vehicle"
                 app:layout_constraintTop_toTopOf="@id/img_vehicle" />

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

@@ -144,7 +144,7 @@
                     android:id="@+id/tv_vehicle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@{item.type_info.type_name +@string/spot+item.type_info.longx+@string/rice}"
+                    android:text="@{item.type_info.type_name +@string/spot+item.type_info.length+@string/rice}"
                     app:layout_goneMarginStart="20dp"
                     android:textSize="@dimen/sp_13"
                     android:textColor="#727374"

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

@@ -121,7 +121,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
 
-                android:text="@{item.type_info.type_name +@string/spot+item.type_info.longx+@string/rice}"
+                android:text="@{item.type_info.type_name +@string/spot+item.type_info.length+@string/rice}"
                 app:layout_constraintBottom_toBottomOf="@id/img_vehicle"
                 app:layout_constraintStart_toEndOf="@id/img_vehicle"
                 app:layout_constraintTop_toTopOf="@id/img_vehicle" />