司机注册，编辑大图查看

app/src/main/AndroidManifest.xml

@@ -258,6 +258,11 @@
             android:configChanges="keyboardHidden|orientation|locale"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name=".ui.home.activity.MessageActivity"
+            android:configChanges="keyboardHidden|orientation|locale"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".ui.account.authteam.AuthTeamActivity"
             android:configChanges="keyboardHidden|orientation|locale"

app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/MineCarsAdapter.kt

@@ -0,0 +1,51 @@
+package com.arpa.hndahesudintocctmsdriver.adapter
+
+import android.content.Context
+import android.view.ViewGroup
+import android.widget.ImageView
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.arpa.hndahesudintocctmsdriver.R
+import com.arpa.hndahesudintocctmsdriver.bean.CarBean
+import com.arpa.mylibrary.utils.ImageLoader
+
+/**
+ * @ClassName WaybillAdapter
+ * @Author 用户
+ * @Date 2024/1/23 16:27
+ * @Description TODO
+ */
+class MineCarsAdapter() :
+    BaseQuickAdapter<CarBean, QuickViewHolder>() {
+    override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: CarBean?) {
+        holder.run {
+            setText(R.id.tvCarNum, item?.vehicleNum)
+            setText(R.id.tvCarType, item?.vehicleType)
+//            setText(R.id.tvCarLen, """${if (!item?.carLong.isNullOrEmpty()) item?.carLong else ""}mm""")
+            setText(
+                R.id.tvCarWei,
+                """${if (!item?.carLong.isNullOrEmpty()) item?.carLong?.toDouble()?.div(1000) else ""}m/${
+                    if (!item?.approvedLoad.isNullOrEmpty()) item?.approvedLoad?.toFloat()
+                        ?.div(1000) else if (!item?.tractionWeight.isNullOrEmpty()) item?.tractionWeight?.toFloat()
+                        ?.div(1000) else 0
+                }吨"""
+            )
+
+//            setGone(R.id.tvNotic,
+//                !(item?.roadLicenseValidityOverdue=="1")
+//            )
+//
+//            ImageLoader.getInstance()
+//                .loadRoundImage(context, item?.carUrl, 6, getView<ImageView>(R.id.ivHead))
+        }
+    }
+
+    override fun onCreateViewHolder(
+        context: Context,
+        parent: ViewGroup,
+        viewType: Int
+    ): QuickViewHolder {
+        // 返回一个 ViewHolder
+        return QuickViewHolder(R.layout.item_cars_mine, parent)
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthBankCardActivity.kt

@@ -1,6 +1,7 @@
 package com.arpa.hndahesudintocctmsdriver.ui.account.authperson
 
 import android.os.Bundle
+import android.view.View
 import com.arpa.hndahesudintocctmsdriver.R
 import com.arpa.hndahesudintocctmsdriver.bean.OcrPersonBean
 import com.arpa.hndahesudintocctmsdriver.bean.UpBankInfoBean
@@ -9,6 +10,7 @@ import com.arpa.hndahesudintocctmsdriver.net.BaseObserver
 import com.arpa.hndahesudintocctmsdriver.net.DataManager
 import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
 import com.arpa.hndahesudintocctmsdriver.oss.OssServiceUtil
+import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
 import com.arpa.mylibrary.utils.ActivityUtils
@@ -38,6 +40,13 @@ class AuthBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
                 subMit()
             }
             ivFront.setOnClickListener {
+                if (bankInfo.driverBankcardPhotoUrl.isNullOrEmpty()){
+                    selBankPic()
+                }else{
+                    CommonPopUtils.getInstance().showOnePic(mContext,ivFront,bankInfo.driverBankcardPhotoUrl)
+                }
+            }
+            tvChangeFront.setOnClickListener {
                 selBankPic()
             }
         }
@@ -72,6 +81,7 @@ class AuthBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
                                             it.etId.setText(cardNumber)
                                             it.tvBankName.setText(bankName)
                                         }
+                                        binding.tvChangeFront.visibility = View.VISIBLE
                                     }
 
                                 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthQualificationActivity.kt

@@ -1,6 +1,7 @@
 package com.arpa.hndahesudintocctmsdriver.ui.account.authperson
 
 import android.os.Bundle
+import android.view.View
 import com.arpa.hndahesudintocctmsdriver.R
 import com.arpa.hndahesudintocctmsdriver.bean.UpQualiInfoBean
 import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthQualificationBinding
@@ -8,6 +9,7 @@ import com.arpa.hndahesudintocctmsdriver.net.BaseObserver
 import com.arpa.hndahesudintocctmsdriver.net.DataManager
 import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
 import com.arpa.hndahesudintocctmsdriver.oss.OssServiceUtil
+import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
 import com.arpa.mylibrary.utils.PickerUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
@@ -49,19 +51,25 @@ class AuthQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
             }
 
             ivFront.setOnClickListener {
+                if (upQuaInfo.qualificationCertificatePhotoUrl.isNullOrEmpty()){
                     PopsUtils.getInstance().showSimSelPic(mContext) {
                         var data = it[0]
                         ossServiceUtil.asyncPutImage(data.realPath, this@AuthQualificationActivity)
                         ossServiceUtil.setResultCallBack { data, oldPath ->
                             upQuaInfo.qualificationCertificatePhotoUrl = oldPath
+                            binding.tvChangeFront.visibility = View.VISIBLE
                             runOnUiThread {
                                 ImageLoader.getInstance()
                                     .loadRoundImage(mContext, it[0].realPath, 12, ivFront)
                             }
 
                         }
-
                     }
+                }else{
+                    CommonPopUtils.getInstance().seeBigPic(mContext,ivFront,upQuaInfo.qualificationCertificatePhotoUrl)
+                }
+
+
             }
         }
     }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditBankCardActivity.kt

@@ -12,6 +12,8 @@ import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
 import com.arpa.hndahesudintocctmsdriver.oss.OssServiceUtil
 import com.arpa.hndahesudintocctmsdriver.utils.UserUtils
 import com.arpa.glex.bean.UserDetail
+import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
+import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
 import com.arpa.mylibrary.utils.ActivityUtils
@@ -45,6 +47,14 @@ class EditBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
                 subMit()
             }
             ivFront.setOnClickListener {
+                if (!perInfoBean.driverBankcardPhotoUrl.isNullOrEmpty())
+                    CommonPopUtils.getInstance().seeBigPic(
+                        mContext,
+                        binding.ivFront,
+                        perInfoBean.driverBankcardPhotoUrl
+                    )
+            }
+            tvChangeFront.setOnClickListener {
                 selBankPic()
             }
         }
@@ -63,9 +73,11 @@ class EditBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
                         if (isOnlyShow) {
                             tvBankName.isEnabled = false
                             etId.isEnabled = false
-                            ivFront.isEnabled = false
+                            llOk.visibility = View.GONE
+//                            ivFront.isEnabled = false
                         }
-
+                        tvChangeFront.visibility =
+                            if (perInfoBean.driverBankcardPhotoUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE
                         etId.setText(perInfoBean.driverBankcardNumber)
                         tvBankName.setText(perInfoBean.driverBankcardAddress)
                         ImageLoader.getInstance()
@@ -82,6 +94,7 @@ class EditBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
 
 
     private fun selBankPic() {
+
         PopsUtils.getInstance().showSimSelPic(mContext) { it ->
             var data1 = it[0]
             ossServiceUtil.asyncPutImage(data1.realPath, this@EditBankCardActivity)

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt

@@ -1,6 +1,7 @@
 package com.arpa.hndahesudintocctmsdriver.ui.account.authperson
 
 import android.os.Bundle
+import android.view.View
 import com.arpa.hndahesudintocctmsdriver.R
 import com.arpa.hndahesudintocctmsdriver.base.AppConfig
 import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthQualificationBinding
@@ -10,6 +11,7 @@ import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
 import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils
 import com.arpa.hndahesudintocctmsdriver.utils.UserUtils
 import com.arpa.glex.bean.UserDetail
+import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
 import com.arpa.mylibrary.utils.PickerUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
@@ -29,7 +31,7 @@ class EditQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
     var upQuaInfo = UserDetail()
     override fun initView(savedInstanceState: Bundle?) {
         setStatusBarColor(R.color.white)
-        setTitleBar("实名认证"){
+        setTitleBar("实名认证") {
             setResult(RESULT_OK)
             finish()
         }
@@ -52,6 +54,15 @@ class EditQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
             }
 
             ivFront.setOnClickListener {
+                if (!upQuaInfo.qualificationCertificatePhotoUrl.isNullOrEmpty())
+                    CommonPopUtils.getInstance().seeBigPic(
+                        mContext,
+                        binding.ivFront,
+                        upQuaInfo.qualificationCertificatePhotoUrl
+                    )
+            }
+
+            tvChangeFront.setOnClickListener {
                 OcrUtils.getInstance()
                     .noOcrUpPic(mContext, this@EditQualificationActivity) { picPath, _ ->
                         ImageLoader.getInstance()
@@ -74,13 +85,15 @@ class EditQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
                         var isOnlyShow =
                             intent.extras?.getBoolean(AppConfig.IS_ONLY_SHOW, false) == true
                         if (isOnlyShow) {
+                            llOk.visibility = View.GONE
                             tvDate.isEnabled = false
                             etId.isEnabled = false
-                            ivFront.isEnabled = false
+//                            ivFront.isEnabled = false
                         }
                         tvDate.text = upQuaInfo.qualificationCertificateEffectiveEnd
 //                        etId.setText(if (upQuaInfo.qualificationCertificateNo.isNullOrEmpty()) SPUtils.instance.getUserInfo(mContext).idcard else upQuaInfo.qualificationCertificateNo)
-
+                        tvChangeFront.visibility =
+                            if (upQuaInfo.qualificationCertificatePhotoUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE
                         ImageLoader.getInstance()
                             .loadRoundImage(
                                 mContext,
@@ -114,7 +127,7 @@ class EditQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
                         showToast("修改成功")
                         val goNextPersonInfo = UserUtils.instance.goNextPersonInfo(upQuaInfo)
                         if (goNextPersonInfo != null) {
-                            ActivityUtils.startActivity(mContext,goNextPersonInfo)
+                            ActivityUtils.startActivity(mContext, goNextPersonInfo)
                         }
                         setResult(RESULT_OK)
                         finish()
@@ -122,6 +135,7 @@ class EditQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
                 }))
         }
     }
+
     override fun onBackPressed() {
         super.onBackPressed()
         setResult(RESULT_OK)

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt

@@ -30,6 +30,8 @@ import com.arpa.glex.bean.OrderBean
 import com.arpa.glex.bean.UserBean
 import com.arpa.glex.bean.UserDetail
 import com.arpa.hndahesudintocctmsdriver.bean.MyJtt
+import com.arpa.hndahesudintocctmsdriver.ui.account.authperson.AuthPartyActivity
+import com.arpa.hndahesudintocctmsdriver.ui.home.activity.MessageActivity
 import com.arpa.hndahesudintocctmsdriver.utils.GDLocationUtils
 import com.arpa.mylibrary.base.BaseFragment
 import com.arpa.mylibrary.callback.RefreshCallBack
@@ -56,7 +58,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
         GridBean("司机之家", R.drawable.home_driver),
         GridBean("咨询客服", R.drawable.home_ask),
         GridBean("问卷调查", R.drawable.home_que),
-        GridBean("知识竞赛", R.drawable.home_know),
+        GridBean("党员认证", R.drawable.home_part),
     )
 
     override fun onFragmentVisibleChange(isVisible: Boolean) {
@@ -122,13 +124,15 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
                         }
 
                         3 -> {
-                            ActivityUtils.startActivity(
+                            ActivityUtils.startActivity(mContext, AuthPartyActivity::class.java)
-                                mContext,
+
-                                WebActivity::class.java,
+//                            ActivityUtils.startActivity(
-                                Bundle().apply {
+//                                mContext,
-                                    putString("url", "https://ks.wjx.top/vm/h6Jqu8A.aspx")
+//                                WebActivity::class.java,
-                                    putString("title", gridDatas[i].title)
+//                                Bundle().apply {
-                                })
+//                                    putString("url", "https://ks.wjx.top/vm/h6Jqu8A.aspx")
+//                                    putString("title", gridDatas[i].title)
+//                                })
                         }
                     }
                 }
@@ -144,6 +148,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
                 showToast("敬请期待")
             }
 
+            llMessage.setOnClickListener {
+                ActivityUtils.startActivity(mContext,MessageActivity::class.java)
+            }
+
 //            llNotic.setOnClickListener {
 //                val userInfo = SPUtils.instance.getUserInfo(mContext)
 //                if (userInfo?.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择）

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/BusinessActivity.kt

@@ -29,7 +29,7 @@ import com.luck.picture.lib.utils.DensityUtil
  * @ClassName BusinessActivity
  * @Author john
  * @Date 2024/3/25 11:24
- * @Description TODO
+ * @Description 司机之家
  */
 class BusinessActivity : BaseActivity<ActivityBusinessBinding>(), PoiSearch.OnPoiSearchListener {
     var listType: List<Model> = arrayListOf(

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/MessageActivity.kt

@@ -0,0 +1,88 @@
+package com.arpa.hndahesudintocctmsdriver.ui.home.activity
+
+import android.graphics.Color
+import android.os.Bundle
+import android.widget.LinearLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.arpa.hndahesudintocctmsdriver.R
+import com.arpa.hndahesudintocctmsdriver.adapter.MessageAdapter
+import com.arpa.hndahesudintocctmsdriver.bean.MessageBean
+import com.arpa.hndahesudintocctmsdriver.databinding.ActivityMessageBinding
+import com.arpa.hndahesudintocctmsdriver.net.BaseObserver
+import com.arpa.hndahesudintocctmsdriver.net.DataManager
+import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
+import com.arpa.hndahesudintocctmsdriver.ui.HomeActivity
+import com.arpa.mylibrary.base.BaseActivity
+import com.arpa.mylibrary.callback.RefreshCallBack
+import com.arpa.mylibrary.net.CommonResponseBean
+import com.arpa.mylibrary.recycleviewswipe.RecycleViewDivider
+import com.arpa.mylibrary.utils.ActivityUtils
+import com.arpa.mylibrary.utils.ConvertUtils
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+
+/**
+ * @ClassName MessageActivity
+ * @Author john
+ * @Date 2024/5/7 09:10
+ * @Description TODO
+ */
+class MessageActivity : BaseActivity<ActivityMessageBinding>(), RefreshCallBack {
+    lateinit var adapter: MessageAdapter
+    override fun initView(savedInstanceState: Bundle?) {
+        setStatusBarColor(R.color.white)
+        setTitleBar("消息",true)
+        setRefresh(binding.refresh, this)
+        adapter = binding.recyclerView.run {
+            layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false)
+            addItemDecoration(
+                RecycleViewDivider(
+                    LinearLayout.VERTICAL,
+                    ConvertUtils.dp2px(16.0f),
+                    Color.TRANSPARENT
+                )
+            )
+            adapter = MessageAdapter()
+            adapter as MessageAdapter
+        }.apply {
+            isStateViewEnable = true
+            setOnItemClickListener { _, _, position ->
+                DataManager.getInstance().messageRead(items[position].messageId)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
+                        override fun onSuccess(t: CommonResponseBean<Any>) {
+                            super.onSuccess(t)
+                            initDate()
+                        }
+                    }))
+            }
+        }
+    }
+
+    override fun initDate() {
+        DataManager.getInstance().messageList()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<MutableList<MessageBean>>() {
+                override fun onSuccess(t: CommonResponseBean<MutableList<MessageBean>>) {
+                    super.onSuccess(t)
+                    if (t.data == null || t.data.size == 0) {
+                        adapter.submitList(null)
+                        adapter.setStateViewLayout(mContext, R.layout.empty_view)
+                    } else {
+                        adapter.submitList(t.data)
+                    }
+                    setFinishRefresh(
+                        binding.refresh,
+                        t.total > mRefreshPage * mRefreshCount
+                    )
+                }
+            }))
+    }
+
+    override fun getRefreshDate(stat: Int, page: Int, count: Int) {
+        initDate()
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt

@@ -1,8 +1,12 @@
 package com.arpa.hndahesudintocctmsdriver.ui.mine
 
+import android.graphics.Color
 import android.os.Bundle
 import android.view.View
+import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.arpa.hndahesudintocctmsdriver.R
 import com.arpa.hndahesudintocctmsdriver.adapter.GridItemAdapter
 import com.arpa.hndahesudintocctmsdriver.base.AppConfig
@@ -33,11 +37,19 @@ import com.arpa.glex.bean.CardInfo
 import com.arpa.glex.bean.UserBean
 import com.arpa.glex.bean.UserDetail
 import com.arpa.glex.bean.WalletInfo
+import com.arpa.hndahesudintocctmsdriver.adapter.CarsAdapter
+import com.arpa.hndahesudintocctmsdriver.adapter.MineCarsAdapter
+import com.arpa.hndahesudintocctmsdriver.bean.CarBean
+import com.arpa.hndahesudintocctmsdriver.ui.account.authperson.AuthDrivingActivity
+import com.arpa.hndahesudintocctmsdriver.ui.mine.activity.CarDetailActivity
+import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
 import com.arpa.mylibrary.base.BaseFragment
 import com.arpa.mylibrary.callback.RefreshCallBack
 import com.arpa.mylibrary.net.CommonResponseBean
+import com.arpa.mylibrary.recycleviewswipe.RecycleViewDivider
 import com.arpa.mylibrary.utils.ActivityUtils
 import com.arpa.mylibrary.utils.BaseUtils
+import com.arpa.mylibrary.utils.ConvertUtils
 import com.arpa.mylibrary.utils.ImageLoader
 import com.arpa.mylibrary.utils.MobileInfoUtils
 import com.arpa.mylibrary.utils.PhoneFormatCheckUtils
@@ -46,23 +58,25 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
 
 class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener, RefreshCallBack {
-    private val tools = mutableListOf(
-        GridBean("车队管理", R.drawable.car_team),
-        GridBean("车辆管理", R.drawable.car_manage),
-        GridBean("司机课堂", R.drawable.mine_class),
-        GridBean("评价管理", R.drawable.rate)
-    )
 
-    private val plats = mutableListOf(
+    lateinit var carAdapter: MineCarsAdapter
-        GridBean("平台规则", R.drawable.rules),
+//    private val tools = mutableListOf(
-        GridBean("常见问题", R.drawable.question),
+//        GridBean("车队管理", R.drawable.car_team),
-        GridBean("联系我们", R.drawable.call_us),
+//        GridBean("车辆管理", R.drawable.car_manage),
-        GridBean("意见反馈", R.drawable.opin),
+//        GridBean("司机课堂", R.drawable.mine_class),
-        GridBean("红色方向盘", R.drawable.part_dir),
+//        GridBean("评价管理", R.drawable.rate)
-        GridBean("检查更新", R.drawable.update),
+//    )
-        GridBean("关于我们", R.drawable.about),
+//
-        GridBean("设置", R.drawable.setting)
+//    private val plats = mutableListOf(
-    )
+//        GridBean("平台规则", R.drawable.rules),
+//        GridBean("常见问题", R.drawable.question),
+//        GridBean("联系我们", R.drawable.call_us),
+//        GridBean("意见反馈", R.drawable.opin),
+//        GridBean("红色方向盘", R.drawable.part_dir),
+//        GridBean("检查更新", R.drawable.update),
+//        GridBean("关于我们", R.drawable.about),
+//        GridBean("设置", R.drawable.setting)
+//    )
 
     override fun onFragmentVisibleChange(isVisible: Boolean) {
         if (isVisible) {
@@ -78,19 +92,19 @@ class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener,
 
         binding.run {
             //初始化常用工具
-            gvTools.run {
+//            gvTools.run {
-                adapter = GridItemAdapter(mContext, tools, R.layout.grid_mine_item)
+//                adapter = GridItemAdapter(mContext, tools, R.layout.grid_mine_item)
-                setOnItemClickListener { _, _, i, _ ->
+//                setOnItemClickListener { _, _, i, _ ->
-                    goTools(i)
+//                    goTools(i)
-                }
+//                }
-            }
+//            }
             //初始化平台规则
-            gvPlat.run {
+//            gvPlat.run {
-                adapter = GridItemAdapter(mContext, plats, R.layout.grid_mine_item)
+//                adapter = GridItemAdapter(mContext, plats, R.layout.grid_mine_item)
-                setOnItemClickListener { _, _, i, _ ->
+//                setOnItemClickListener { _, _, i, _ ->
-                    goPlats(i)
+//                    goPlats(i)
-                }
+//                }
-            }
+//            }
 
             rlMoney.setOnClickListener {
                 ActivityUtils.startActivity(mContext, WalletActivity::class.java)
@@ -135,6 +149,51 @@ class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener,
 
             }
 
+            llCars.setOnClickListener {
+                if (SPUtils.instance.getUserInfo(mContext)?.isCarCaptain == "1") {//车队长
+                    ActivityUtils.startActivity(mContext, CarTeamManActivity::class.java)
+                } else {//司机
+                    ActivityUtils.startActivity(mContext, DriverTeamsActivity::class.java)
+                }
+            }
+
+            llClass.setOnClickListener {
+                ActivityUtils.startActivity(mContext, QuesActivity::class.java)
+            }
+
+            llSetting.setOnClickListener {
+                ActivityUtils.startActivity(mContext, SettingActivity::class.java)
+            }
+
+
+            carAdapter = recycler.run {
+                layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false)
+                addItemDecoration(
+                    RecycleViewDivider(
+                        LinearLayout.VERTICAL,
+                        ConvertUtils.dp2px(16.0f),
+                        Color.TRANSPARENT
+                    )
+                )
+                adapter = MineCarsAdapter()
+                adapter as MineCarsAdapter
+            }.apply {
+                isStateViewEnable = true
+                setOnItemClickListener { _, _, position ->
+
+                    ActivityUtils.startActivity(
+                        mContext,
+                        CarDetailActivity::class.java,
+                        Bundle().apply { putString(AppConfig.CAR_ID, items[position].carId) })
+                }
+            }
+
+            tvAddCar.setOnClickListener {
+                ActivityUtils.startActivity(mContext, AuthDrivingActivity::class.java,Bundle().apply {
+                    putBoolean(AppConfig.IS_GO_MINE,true)
+                })
+            }
+
 //            llNotic.setOnClickListener {
 //                val userInfo = SPUtils.instance.getUserInfo(mContext)
 //                if (userInfo?.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择）
@@ -277,6 +336,27 @@ class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener,
         if (userInfo?.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择）
             binding.llNotic.visibility = View.GONE
         } else {
+
+            //司机车辆显示
+            DataManager.getInstance().carList()
+                .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    BaseObserver(mContext, object : RxHttpCallBack<MutableList<CarBean>>() {
+                        override fun onSuccess(t: CommonResponseBean<MutableList<CarBean>>) {
+                            super.onSuccess(t)
+                            if (t.data == null || t.data.size == 0) {
+                                carAdapter.submitList(null)
+                                carAdapter.setStateViewLayout(mContext, R.layout.empty_view)
+                            } else {
+                                carAdapter?.submitList(t.data)
+                            }
+
+
+                        }
+                    })
+                )
+
+
             DataManager.getInstance().getDriverDocIntegrity()
                 .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
                 .subscribe(BaseObserver(mContext, object : RxHttpCallBack<UserDetail>() {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt

@@ -2,12 +2,18 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine.activity
 
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.app.AppCompatActivity
 import cn.jpush.android.ups.JPushUPSManager
 import com.arpa.hndahesudintocctmsdriver.R
+import com.arpa.hndahesudintocctmsdriver.base.WebActivity
 import com.arpa.hndahesudintocctmsdriver.databinding.ActivitySettingBinding
+import com.arpa.hndahesudintocctmsdriver.utils.AppVersionUtils
 import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
 import com.arpa.hndahesudintocctmsdriver.utils.UserUtils
 import com.arpa.mylibrary.base.BaseActivity
+import com.arpa.mylibrary.utils.ActivityUtils
+import com.arpa.mylibrary.utils.AppUtils
+import com.arpa.mylibrary.utils.BaseUtils
 
 /**
  * @ClassName SettingActivity
@@ -22,6 +28,42 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnClickList
         binding.run {
             rlOne.setOnClickListener(this@SettingActivity)
             rlTwo.setOnClickListener(this@SettingActivity)
+
+            llRules.setOnClickListener {
+                ActivityUtils.startActivity(mContext, RulesActivity::class.java)
+            }
+
+            llRates.setOnClickListener {
+                ActivityUtils.startActivity(mContext, RateManActivity::class.java)
+            }
+
+            llQues.setOnClickListener {
+                ActivityUtils.startActivity(mContext, ComProActivity::class.java)
+            }
+
+            llCallMe.setOnClickListener {
+                BaseUtils.callPhone(this@SettingActivity,"拨打电话","13783631930")
+            }
+
+            llAbout.setOnClickListener {
+                ActivityUtils.startActivity(mContext, WebActivity::class.java, Bundle().apply {
+                    putString("title", "关于我们")
+                    putString("url", "http://www.dahehuoyun.com/index.html")
+                })
+            }
+
+            llFeed.setOnClickListener {
+                ActivityUtils.startActivity(mContext, WebActivity::class.java, Bundle().apply {
+                    putString("title", "意见反馈")
+                    putString("url", "https://support.qq.com/products/335639")
+                })
+            }
+
+            llUpdate.setOnClickListener {
+                AppVersionUtils.getInstance().checkVersion(mContext)
+            }
+
+            tvVersion.text = """当前版本V${AppUtils.getAppVersionName()}"""
         }
     }
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt

@@ -181,6 +181,30 @@ class CommonPopUtils private constructor() {
             .show()
     }
 
+
+    /**
+     * 点击查看大图-单张
+     * @param context Context
+     * @param imageView ImageView
+     * @param picPath String
+     */
+    fun seeBigPic(context: Context,imageView: ImageView,picPath:String){
+        XPopup.Builder(context)
+            .asImageViewer(
+                imageView,
+                picPath,
+                false,
+                -1,
+                -1,
+                ConvertUtils.dp2px(10F),
+                false,
+                Color.rgb(32, 36, 46),
+                SmartGlideImageLoader(R.mipmap.ic_launcher_round),
+                null
+            )
+            .show()
+    }
+
     /**
      * app版本检查
      * @param context Context

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

@@ -50,15 +50,35 @@
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16"></TextView>
 
-
+            <RelativeLayout
-            <ImageView
-                android:id="@+id/ivFront"
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="@dimen/dp_97"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginBottom="@dimen/dp_22"
+                >
+
+                <ImageView
+                    android:id="@+id/ivFront"
+                    android:layout_width="@dimen/dp_155"
+                    android:layout_height="@dimen/dp_97"
                     android:background="@drawable/bank_card"></ImageView>
+                <TextView
+                    android:id="@+id/tvChangeFront"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"
+                    android:paddingRight="@dimen/dp_4"
+                    android:paddingBottom="@dimen/dp_4"
+                    android:text="更换图片"
+                    android:textColor="@color/main_red"
+                    android:textStyle="bold"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+
+
 
 
         </RelativeLayout>
@@ -153,6 +173,7 @@
         android:background="@color/white"></View>
 
     <LinearLayout
+        android:id="@+id/llOk"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_70"
         android:background="@color/white"

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

@@ -47,16 +47,35 @@
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16"></TextView>
 
-
+            <RelativeLayout
-            <ImageView
-                android:id="@+id/ivFront"
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="@dimen/dp_97"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
-                android:layout_marginBottom="@dimen/dp_22"
+                android:layout_marginBottom="@dimen/dp_22">
+                <ImageView
+                    android:id="@+id/ivFront"
+                    android:layout_width="@dimen/dp_155"
+                    android:layout_height="@dimen/dp_97"
                     android:background="@drawable/qualication"></ImageView>
 
+                <TextView
+                    android:id="@+id/tvChangeFront"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"
+                    android:paddingRight="@dimen/dp_4"
+                    android:paddingBottom="@dimen/dp_4"
+                    android:text="更换图片"
+                    android:textColor="@color/main_red"
+                    android:textStyle="bold"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+
+
+
 
         </RelativeLayout>
     </androidx.cardview.widget.CardView>
@@ -150,6 +169,7 @@
         android:background="@color/white"></View>
 
     <LinearLayout
+        android:id="@+id/llOk"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_70"
         android:background="@color/white"

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <include layout="@layout/common_toolbar"></include>
+
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/dp_20"
+            ></androidx.recyclerview.widget.RecyclerView>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+</LinearLayout>

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

@@ -1,24 +1,268 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
     <include layout="@layout/common_toolbar"></include>
 
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
         <LinearLayout
-        android:layout_weight="1"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_15"
                 android:background="@color/white"
                 android:orientation="vertical">
 
+                <LinearLayout
+                    android:id="@+id/llRules"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_60"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="平台规则"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/right_gray" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="@dimen/dp_16"
+                    android:layout_marginRight="@dimen/dp_16"
+                    android:background="@color/color_c" />
+
+                <LinearLayout
+                    android:id="@+id/llRates"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_60"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="评价管理"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/right_gray" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="@dimen/dp_16"
+                    android:layout_marginRight="@dimen/dp_16"
+                    android:background="@color/color_c" />
+
+                <LinearLayout
+                    android:id="@+id/llQues"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_60"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="常见问题"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/right_gray" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_15"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/llCallMe"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_60"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="联系我们"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/right_gray" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="@dimen/dp_16"
+                    android:layout_marginRight="@dimen/dp_16"
+                    android:background="@color/color_c" />
+
+                <LinearLayout
+                    android:id="@+id/llAbout"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_60"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="关于我们"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/right_gray" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="@dimen/dp_16"
+                    android:layout_marginRight="@dimen/dp_16"
+                    android:background="@color/color_c" />
+
+                <LinearLayout
+                    android:id="@+id/llFeed"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_60"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="意见反馈"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/right_gray" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_15"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/llUpdate"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_60"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="版本更新"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <TextView
+                        android:id="@+id/tvVersion"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        tools:text="当前版本" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="@dimen/dp_16"
+                    android:layout_marginRight="@dimen/dp_16"
+                    android:background="@color/color_c" />
+
                 <LinearLayout
                     android:id="@+id/rlOne"
                     android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_70"
+                    android:layout_height="@dimen/dp_66"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/dp_16"
                     android:paddingRight="@dimen/dp_16">
@@ -33,34 +277,28 @@
 
                     <com.arpa.mylibrary.weight.SwitchView
                         android:id="@+id/svTog"
-                app:canEnable="false"
                         android:layout_width="wrap_content"
                         android:layout_height="@dimen/dp_30"
+                        app:canEnable="false"
                         app:isOpened="true" />
 
 
-            <ImageView
-                android:layout_width="@dimen/dp_15"
-                android:layout_height="@dimen/dp_15"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/right_gray" />
-
-
                 </LinearLayout>
 
-        <View
+
+            </LinearLayout>
+            <LinearLayout
                 android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_1"
+                android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
+                android:layout_marginTop="@dimen/dp_15"
-            android:layout_marginLeft="@dimen/dp_16"
+                android:background="@color/white"
-            android:layout_marginRight="@dimen/dp_16"
+                android:orientation="vertical">
-            android:background="@color/color_c" />
+
 
                 <LinearLayout
                     android:id="@+id/rlTwo"
                     android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_70"
+                    android:layout_height="@dimen/dp_60"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/dp_16"
                     android:paddingRight="@dimen/dp_16">
@@ -69,29 +307,28 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:gravity="center"
                         android:text="退出"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_16" />
 
 
-            <ImageView
-                android:layout_width="@dimen/dp_15"
-                android:layout_height="@dimen/dp_15"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/right_gray" />
-
-
                 </LinearLayout>
 
             </LinearLayout>
 
+
+
             <TextView
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:layout_marginBottom="@dimen/dp_20"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-        android:text="ICP备案号:豫ICP备09025418号-24A"
+                android:layout_marginTop="@dimen/dp_20"
-        />
+                android:layout_marginBottom="@dimen/dp_20"
+                android:gravity="center"
+                android:text="ICP备案号:豫ICP备09025418号-24A" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
 </LinearLayout>

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

@@ -44,6 +44,7 @@
                         android:background="@color/white"></View>
 
                     <TextView
+                        android:layout_weight="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="河南日报报业集团旗下APP"
@@ -51,6 +52,28 @@
                         android:textSize="@dimen/sp_12">
 
                     </TextView>
+
+                    <LinearLayout
+                        android:id="@+id/llMessage"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        >
+
+                    <ImageView
+                        android:layout_marginTop="@dimen/dp_2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/icon_message"
+                        />
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="消息"
+                        android:textColor="@color/white"
+                        /></LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout

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

@@ -276,8 +276,9 @@
                 </RelativeLayout>
             </LinearLayout>
 
+
             <RelativeLayout
-                android:id="@+id/rlTools"
+                android:id="@+id/rlCars"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_120"
                 android:layout_below="@+id/lltwo"
@@ -293,13 +294,32 @@
                     android:paddingLeft="@dimen/dp_16"
                     android:paddingTop="@dimen/dp_16"
                     android:paddingBottom="@dimen/dp_16"
-                    android:text="常用工具"
+                    android:text="我的车辆"
+                    android:drawableLeft="@drawable/icon_mine_cars"
+                    android:drawablePadding="@dimen/dp_8"
                     android:textColor="@color/black"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"></TextView>
+                <TextView
+                    android:id="@+id/tvAddCar"
+                    android:gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="添加车辆"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignBottom="@+id/tvToolsTitle"
+                    android:layout_alignTop="@+id/tvToolsTitle"
+                    android:paddingRight="@dimen/dp_16"
+                    />
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler"
+                    android:layout_below="@+id/tvToolsTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
 
 
                 <GridView
+                    android:visibility="gone"
                     android:id="@+id/gvTools"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -311,40 +331,114 @@
 
             </RelativeLayout>
 
-            <RelativeLayout
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_190"
+                android:layout_height="wrap_content"
-                android:layout_below="@+id/rlTools"
+                android:layout_below="@+id/rlCars"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginTop="@dimen/dp_12"
                 android:layout_marginRight="@dimen/dp_15"
+                android:orientation="vertical"
                 android:background="@drawable/shape_white_12">
 
+
+                <LinearLayout
+                    android:id="@+id/llCars"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_64"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:padding="@dimen/dp_16"
+                    >
                     <TextView
-                    android:id="@+id/tvplatTitle"
+                        android:layout_weight="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/dp_16"
+                        android:text="我的车队"
-                    android:paddingTop="@dimen/dp_16"
-                    android:paddingBottom="@dimen/dp_16"
-                    android:text="平台规则"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_16"
-                    android:textStyle="bold"></TextView>
+                        />
+                    <ImageView
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:background="@drawable/right_gray"
+                        />
 
-
+                </LinearLayout>
-                <GridView
+                <View
-                    android:id="@+id/gvPlat"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/dp_1"
-                    android:layout_below="@+id/tvplatTitle"
                     android:layout_alignParentBottom="true"
-                    android:listSelector="@color/color_transparent"
+                    android:layout_marginLeft="@dimen/dp_16"
-                    android:numColumns="4"
+                    android:layout_marginRight="@dimen/dp_16"
-                    android:verticalSpacing="@dimen/dp_20"></GridView>
+                    android:background="@color/color_c" />
+                <LinearLayout
+                    android:id="@+id/llClass"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_64"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_16"
+                    android:gravity="center_vertical"
+                    >
+                    <TextView
+                        android:layout_weight="1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="安全课堂"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16"
+                        />
+                    <ImageView
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:background="@drawable/right_gray"
+                        />
+
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="@dimen/dp_16"
+                    android:layout_marginRight="@dimen/dp_16"
+                    android:background="@color/color_c" />
+                <LinearLayout
+                    android:id="@+id/llSetting"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_64"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:padding="@dimen/dp_16"
+                    >
+                    <TextView
+                        android:layout_weight="1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="设置"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16"
+                        />
+                    <ImageView
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:background="@drawable/right_gray"
+                        />
+
+                </LinearLayout>
 
 
-            </RelativeLayout>
+
+
+
+
+            </LinearLayout>
 
         </RelativeLayout>
     </androidx.core.widget.NestedScrollView>

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+
+    android:layout_marginRight="@dimen/dp_15"
+    android:paddingTop="@dimen/dp_10"
+    android:paddingBottom="@dimen/dp_10"
+    android:orientation="horizontal">
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/dp_16"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="豫A4982S"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
+
+            <TextView
+                android:id="@+id/tvNotic"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_6"
+                android:background="#FFEDE5"
+                android:gravity="center"
+                android:maxLines="1"
+                android:paddingLeft="@dimen/dp_6"
+                android:paddingTop="@dimen/dp_3"
+                android:paddingRight="@dimen/dp_6"
+                android:paddingBottom="@dimen/dp_3"
+                android:text="证件即将过期"
+                android:textColor="@color/main_red"
+                android:textSize="@dimen/dp_10"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tvCarNum"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="豫A4982S"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
+
+            <TextView
+                android:id="@+id/tvCarType"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:text="16米"
+                android:textColor="@color/color_9"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/tvCarWei"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:maxLines="1"
+                android:textColor="@color/color_9"
+                android:textSize="@dimen/sp_14"
+                tools:text="30吨" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>