1.修改发料列表状态字段。

2.修改运单详情。

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

@@ -44,14 +44,13 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
     }
 
 
-
    private fun initViewPager(bean:DataInfoBean){
        var  adapterOut= OrderInfoadapter()
        binding.recyclerViewOut.adapter=adapterOut
        var  outList = bean.order.send
        adapterOut!!.addData(outList)
        //入
-       var adapterIn= OrderInfoInadapter(bean.order.send[0].time)
+       var adapterIn= OrderInfoInadapter()
        binding.recyclerViewIn.adapter=adapterIn
        var  inList = bean.order.receive
        adapterIn!!.addData(inList)

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

@@ -6,10 +6,9 @@ import com.quansu.heifengwuliu.databinding.ItemEnterinfoBinding
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.ysnows.base.base.BAdapter
 
-class OrderInfoInadapter(val start_time:String) : BAdapter<DataInfoBean.OrderBean.ReceiveBean, BaseDataBindingHolder<ItemEnterinfoBinding>>(R.layout.item_enterinfo) {
+class OrderInfoInadapter() : BAdapter<DataInfoBean.OrderBean.ReceiveBean, BaseDataBindingHolder<ItemEnterinfoBinding>>(R.layout.item_enterinfo) {
 
     override fun convert(holder: BaseDataBindingHolder<ItemEnterinfoBinding>, item: DataInfoBean.OrderBean.ReceiveBean) {
-        holder.dataBinding?.timeOn = start_time
         holder.dataBinding?.item = item
     }
 }

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

@@ -7,12 +7,12 @@ import com.ysnows.base.inter.IModel
  *on 2020/9/18
  * invoice_id：获取发票抬头的 id
  * in_id:发票列表的id
- * state：1：开票中 2通过（已邮寄） 3系统拒绝  9取消
+ * states：1：开票中 2通过（已邮寄） 3系统拒绝  9取消
  */
 class Invoice(var invoice_id:String,var uid:String,var company:String,
               var sn:String,var addr:String,var tel:String,
               var bank:String,var number:String,var create_time:String,
               var update_time:String,var delete_time:String,var in_id:String,
-              var state:Int,var money:String
+              var status:Int,var money:String
 ) : IModel {
 }

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

@@ -10,8 +10,8 @@ class InvoiceVModel : BRViewModel<BRRepository>() {
 
 
     //state：1：开票中 2通过（已邮寄） 3系统拒绝  9取消
-    fun getInvoiceStatus(state: Int): String {
-        return when (state) {
+    fun getInvoiceStatus(status: Int): String {
+        return when (status) {
             1 -> "开票中"
             2 -> "发票已邮寄"
             3 -> "系统拒绝"

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

@@ -4,9 +4,7 @@
 
     <data >
 
-        <variable
-            name="timeOn"
-            type="String" />
+
         <variable
             name="item"
             type="com.quansu.heifengwuliu.model.DataInfoBean.OrderBean.ReceiveBean" />
@@ -26,12 +24,38 @@
             android:gravity="center_vertical"
             android:layout_height="wrap_content">
 
-            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            <ImageView
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:src="@drawable/ic_time"
+                android:layout_marginEnd="@dimen/dp_10"
+                />
+
+
+            <TextView
+                android:layout_width="match_parent"
+                android:textSize="@dimen/sp_15"
+                android:textColor="@color/text_title"
+                android:text="@{item.time}"
+                tools:text="08-01-1"
+                android:layout_height="wrap_content">
+            </TextView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="@dimen/dp_10"
+            android:gravity="center_vertical"
+            android:layout_height="wrap_content">
+
+            <ImageView
                 android:layout_width="25dp"
                 android:layout_height="25dp"
-                android:src="@drawable/ic_math"
+                android:src="@drawable/ic_enter"
                 android:layout_marginEnd="@dimen/dp_10"
-                app:qmui_is_circle="true" />
+                />
 
 
             <TextView
@@ -51,6 +75,7 @@
             android:gravity="center_vertical"
             android:paddingStart="35dp"
             android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_5"
             android:layout_height="wrap_content">
 
             <TextView
@@ -90,51 +115,6 @@
         </LinearLayout>
 
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_5"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:src="@drawable/ic_math"
-                app:qmui_is_circle="true" />
-
-
-            <TextView
-
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/text_title"
-                android:textSize="@dimen/sp_15"
-                android:text="@{timeOn}"
-                tools:text="08-03 17：05"></TextView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:text="至"
-                android:textColor="@color/text_title"
-                android:textSize="@dimen/sp_15"></TextView>
-
-
-            <TextView
-
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{item.time}"
-                android:textColor="@color/text_title"
-                android:textSize="@dimen/sp_15"
-                tools:text="08-03 17：05"></TextView>
-
-        </LinearLayout>
 
     </LinearLayout>
 

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

@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:text="@{vm.getInvoiceStatus(item.state)}"
+                    android:text="@{vm.getInvoiceStatus(item.status)}"
                     android:textColor="#67ACEE"
                     android:textSize="@dimen/sp_16"
                     tools:text="@string/app_name" />

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

@@ -73,12 +73,12 @@
                 android:orientation="horizontal">
 
 
-                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                <ImageView
                     android:id="@+id/img"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:src="@drawable/ic_math"
-                    app:qmui_is_circle="true" />
+                    android:src="@drawable/ic_enter"
+                     />
 
 
                 <TextView
@@ -188,7 +188,7 @@
                     android:layout_height="20dp"
                     android:layout_marginStart="35dp"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/ic_math" />
+                    android:src="@drawable/ic_name_enter" />
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="0dp"
@@ -219,7 +219,7 @@
                     android:layout_height="20dp"
                     android:layout_marginStart="@dimen/dp_15"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/ic_math" />
+                    android:src="@drawable/ic_phone_enter" />
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="0dp"

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

@@ -20,6 +20,33 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical">
 
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="@dimen/dp_10"
+            android:gravity="center_vertical"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:src="@drawable/ic_time"
+                android:layout_marginEnd="@dimen/dp_10"
+                />
+
+
+            <TextView
+                android:layout_width="match_parent"
+                android:textSize="@dimen/sp_15"
+                android:textColor="@color/text_title"
+                android:text="@{item.time}"
+                tools:text="08-01-1"
+                android:layout_height="wrap_content">
+            </TextView>
+
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:orientation="horizontal"
@@ -27,12 +54,12 @@
             android:gravity="center_vertical"
             android:layout_height="wrap_content">
 
-            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            <ImageView
                 android:layout_width="25dp"
                 android:layout_height="25dp"
-                android:src="@drawable/ic_math"
+                android:src="@drawable/ic_out"
                 android:layout_marginEnd="@dimen/dp_10"
-                app:qmui_is_circle="true" />
+                />
 
 
             <TextView

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

@@ -35,12 +35,12 @@
                 android:orientation="horizontal">
 
 
-                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                <ImageView
                     android:id="@+id/img"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:src="@drawable/ic_math"
-                    app:qmui_is_circle="true" />
+                    android:src="@drawable/ic_enter"
+                    />
 
 
                 <TextView
@@ -144,7 +144,7 @@
                     android:layout_height="20dp"
                     android:layout_marginStart="35dp"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/ic_math" />
+                    android:src="@drawable/ic_name_enter" />
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="0dp"
@@ -174,7 +174,7 @@
                     android:layout_height="20dp"
                     android:layout_marginStart="@dimen/dp_15"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/ic_math" />
+                    android:src="@drawable/ic_phone_enter" />
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="0dp"

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

@@ -92,12 +92,12 @@
                 android:orientation="horizontal">
 
 
-                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                <ImageView
                     android:id="@+id/img"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:src="@drawable/ic_math"
-                    app:qmui_is_circle="true" />
+                    android:src="@drawable/ic_out"
+                    />
 
 
                 <TextView
@@ -201,7 +201,7 @@
                     android:layout_height="20dp"
                     android:layout_marginStart="35dp"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/ic_math" />
+                    android:src="@drawable/ic_name_out" />
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="0dp"
@@ -231,7 +231,7 @@
                     android:layout_height="20dp"
                     android:layout_marginStart="@dimen/dp_15"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/ic_math" />
+                    android:src="@drawable/ic_phone_out" />
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="0dp"