1.消息列表。

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

@@ -4,10 +4,15 @@ import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.adapter.MsgAdapter
 import com.quansu.heifengwuliu.base.MBRActivity
 import com.quansu.heifengwuliu.databinding.ActivityMsgBinding
-import com.ysnows.base.base.BRRepository
-import com.ysnows.base.base.BRViewModel
+import com.quansu.heifengwuliu.vmodel.MsgVModel
 
-class MsgActivity : MBRActivity<BRViewModel<BRRepository>, MsgAdapter, ActivityMsgBinding>() {
+class MsgActivity : MBRActivity<MsgVModel, MsgAdapter, ActivityMsgBinding>() {
+
+
+
+    override fun vmClass(): Class<MsgVModel> {
+        return MsgVModel::class.java
+    }
     override fun binding(): ActivityMsgBinding {
         return ActivityMsgBinding.inflate(layoutInflater)
     }
@@ -20,4 +25,4 @@ class MsgActivity : MBRActivity<BRViewModel<BRRepository>, MsgAdapter, ActivityM
     override fun title(): String? {
         return getString(R.string.msg)
     }
-}
+}

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

@@ -3,11 +3,11 @@ package com.quansu.heifengwuliu.adapter
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.databinding.ItemMsgBinding
-import com.quansu.heifengwuliu.model.Msg
+import com.quansu.heifengwuliu.model.MsgList
 import com.ysnows.base.base.BAdapter
 
-class MsgAdapter : BAdapter<Msg, BaseDataBindingHolder<ItemMsgBinding>>(R.layout.item_msg) {
-    override fun convert(holder: BaseDataBindingHolder<ItemMsgBinding>, item: Msg) {
+class MsgAdapter : BAdapter<MsgList, BaseDataBindingHolder<ItemMsgBinding>>(R.layout.item_msg) {
+    override fun convert(holder: BaseDataBindingHolder<ItemMsgBinding>, item: MsgList) {
         holder.dataBinding?.item = item
     }
-}
+}

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

@@ -1,12 +0,0 @@
-package com.quansu.heifengwuliu.model
-
-
-data class Msg(
-        val title: String?,
-        val content: String?,
-        val create_time: String?,
-        val checked: Int?
-) {
-
-
-}

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

@@ -0,0 +1,13 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/25
+ */
+data class MsgList(var data_id:String,var uid:String,var msg_id:String,
+                   var is_read:Int,var create_time:String,var update_time:String,
+                   var title:String,var content:String
+): IModel {
+}

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

@@ -592,8 +592,8 @@ interface ApiService {
      * 添加收藏-货主
      * @return
      */
-    @GET("api/driver/setOwn")
-    suspend fun setOwn(@Query("arr") arr: String?): Resp<List<Any>>
+    @GET("api/owner/setOwn")
+    suspend fun setOwn(@Query("arr") arr: String?): Resp<Any>
 
 
     /**
@@ -609,6 +609,16 @@ interface ApiService {
 
 
 
+    /**
+     * 列表-消息
+     * @return
+     */
+    @GET("api/msg/msgList")
+    suspend fun msgList(@Query("p") p: Int): Resp<List<MsgList>>
+
+
+
+
 
 
 }

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

@@ -16,7 +16,7 @@ import com.ysnows.base.base.BViewModel
 class ComVerityVModel(application: Application) : BViewModel<ComVerifyRepository>(application) {
 
     var imgBL: MutableLiveData<String> = MutableLiveData("")
-    var isShow: MutableLiveData<Boolean> = MutableLiveData(true)
+    var isShow: MutableLiveData<Boolean> = MutableLiveData(true)//status ->2 不能修改
 
 
     @Bindable
@@ -71,7 +71,7 @@ class ComVerityVModel(application: Application) : BViewModel<ComVerifyRepository
                     if (it.ok(true)) {
                         var bean = it.data()
                         if (null != bean) {
-                            isShow.value = bean.status != "1"
+                            isShow.value = bean.status != "2"
                             //设置值
                             imgBL.value = bean.license_img
                             name = bean.company_name

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

@@ -0,0 +1,20 @@
+package com.quansu.heifengwuliu.vmodel
+
+import android.app.Application
+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
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/25
+ */
+class MsgVModel(application: Application) : BRViewModel<BRRepository>(application) {
+
+
+
+    override fun apiFunc(): suspend () -> IResp<*> {
+        return { NetEngine.service.msgList(repository().page) }
+    }
+}

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

@@ -91,7 +91,7 @@ class PersonalVerityVModel(application: Application) : BViewModel<PersonalVerify
                     if (it.ok(false)) {
                         var bean=it.data()
                         if(null!=bean){
-                            isShow.value = bean.status != "1"
+                            isShow.value = bean.status != "2"
                             //设置值
                             imgIDMan.value=bean.idcard_z
                             imgIDEmblem.value=bean.idcard_f

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

@@ -47,6 +47,7 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
     var carCate_code=""
     var carEnergy_code=""
 
+    var isShow: MutableLiveData<Boolean> = MutableLiveData(true)
 
 
     @Bindable
@@ -230,6 +231,8 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
                             //todo:
                             info.value=bean
 
+                            isShow.value = bean.status != "2"
+
                             driverImg.value=bean.driver_img
                             drivingZ.value=bean.driving_z
                             drivingF.value=bean.driving_f

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

@@ -10,6 +10,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/color_bg"
         android:orientation="vertical" >
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -27,4 +28,4 @@
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
     </LinearLayout >
 
-</layout >
+</layout >

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

@@ -1011,6 +1011,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="33dp"
                     android:layout_marginEnd="@dimen/dp_16"
+                    android:visibility=""
                     android:onClick="@{v->vm.toSubmit()}">
 
                     <ImageView

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

@@ -1,78 +1,81 @@
 <?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.Msg" />
+            type="com.quansu.heifengwuliu.model.MsgList" />
 
     </data >
 
-    <RelativeLayout
-        android:id="@+id/rl_todo"
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_10"
-        android:paddingRight="@dimen/dp_10" >
-
-        <ImageView
-            android:id="@+id/img_icon"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_centerVertical="true"
-            android:padding="@dimen/dp_13"
-            android:src="@{item.checked==0?@drawable/uncomplete:@drawable/complete}"
-            tools:src="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
+        android:layout_marginTop="13dp"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        app:qmui_radius="6dp"
+        app:qmui_borderColor="@color/white"
+        app:qmui_backgroundColor="@color/white"
+        android:layout_height="wrap_content">
+
+
+        <RelativeLayout
+            android:id="@+id/rl_todo"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/dp_8"
-            android:layout_toEndOf="@id/img_icon"
-            android:orientation="vertical" >
+            android:orientation="horizontal"
+            android:paddingLeft="12dp"
+            android:paddingTop="19dp"
+            android:paddingBottom="17dp"
+            android:paddingRight="15dp" >
 
-            <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@{item.title}"
-                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
-                android:textSize="@dimen/sp_16"
-                tools:text="@string/app_name" />
-
-            <TextView
-                android:id="@+id/tv_desc"
+            <ImageView
+                android:id="@+id/img_icon"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_msg_one"
+                 />
+
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_2"
-                android:text="@{item.create_time}"
-                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
-                tools:text="@string/app_name" />
-
-        </LinearLayout >
-
-        <ImageView
-            android:id="@+id/img_sort"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:padding="@dimen/dp_14"
-            android:src="@drawable/ic_sort" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@color/llGray" />
-    </RelativeLayout >
-</layout >
+                android:layout_centerVertical="true"
+                android:layout_marginStart="@dimen/dp_8"
+                android:layout_toEndOf="@id/img_icon"
+                android:orientation="vertical" >
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text="@{item.title}"
+                    android:textColor="#3E3D3D"
+                    android:textSize="@dimen/sp_15"
+                    tools:text="@string/app_name" />
+
+                <TextView
+                    android:id="@+id/tv_desc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:text="@{item.create_time}"
+                    android:textColor="#8B8B8B"
+                    android:textSize="11dp"
+                    tools:text="@string/app_name" />
+
+            </LinearLayout >
+
+
+
+        </RelativeLayout >
+
+
+    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+</layout >

app/src/main/res/values/strings.xml

@@ -418,7 +418,7 @@ Api 已达到使用限制
     <string name="my_account" >我的账户</string >
     <string name="my_collection" >我的收藏</string >
     <string name="connect_service" >联系客服</string >
-    <string name="msg" >消息</string >
+    <string name="msg" >消息通知</string >
     <string name="bill" >账单</string >
     <string name="analysis" >统计</string >
     <string name="available_balance" >可用余额</string >