1.银行卡OCR。

app/src/main/AndroidManifest.xml

@@ -94,6 +94,7 @@
         <activity android:name=".activity.InvoiceTitleActivity"/>
         <activity android:name=".activity.VehicleListActivity"/>
         <activity android:name=".activity.GrabDetailsActivity"/>
+        <activity android:name=".activity.BankActivity"/>
 
 
     </application >

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

@@ -0,0 +1,90 @@
+package com.quansu.heifengwuliu.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import com.luck.picture.lib.PictureSelector
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.config.MIntentAction
+import com.quansu.heifengwuliu.databinding.ActivityBankBinding
+import com.quansu.heifengwuliu.inte.OnUploadCallback
+import com.quansu.heifengwuliu.utils.OssUtils
+import com.quansu.heifengwuliu.vmodel.BankVModel
+import java.util.ArrayList
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/21
+ */
+class BankActivity : MBActivity<BankVModel, ActivityBankBinding>(), OnUploadCallback<String> {
+
+    override fun initCreate(savedInstanceState: Bundle?) {
+        super.initCreate(savedInstanceState)
+        vm.getInfo()
+    }
+
+    override fun binding(): ActivityBankBinding {
+        return ActivityBankBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<BankVModel> {
+        return BankVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "银行卡信息"
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode != Activity.RESULT_OK) {
+            return
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_THREE) {//图片
+
+            val selectList = PictureSelector.obtainMultipleResult(data)
+            val list = ArrayList<String>()
+            if (null != selectList) {
+                for (path in selectList) {
+                    list.add(path.path)
+                }
+
+                OssUtils(this)
+                        .setUpLoad("bank", list, this)
+
+            }
+
+            return
+
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_CAMERA) {//拍照
+            //拍照
+            val selectList = PictureSelector.obtainMultipleResult(data) ?: return
+            val list = ArrayList<String>()
+            list.add(selectList[0].path)
+            OssUtils(this)
+                    .setUpLoad("bank", list, this)
+
+            return
+        }
+
+    }
+
+    override fun onUploadSuccess(t: String) {
+        val ss: Array<String> = t.split(",".toRegex()).toTypedArray()
+        //ss[0]--//不完整路径-接口需要   ss[1]完整路径
+
+        Log.e("-shy-", "ss[1]=: "+ss[1] )
+
+        vm.image = ss[1]
+        vm.discernBank(ss[1])
+
+
+    }
+
+    override fun onUploadError(error: String?) {
+        TODO("Not yet implemented")
+    }
+
+}

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

@@ -39,7 +39,7 @@ class SettingsActivity : MBActivity<SettingsVModel, ActivitySettingsBinding>() {
 
 
 
-        binding.btnLogout.onClick {
+        binding.flLogout.onClick {
             message(R.string.enture_logout, negativeEnable = true, positiveAction = { dialog, _ ->
                 MMKVManager.instance().clearAll()
                 dialog.dismiss()

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

@@ -0,0 +1,10 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/21
+ */
+data class BankCard(var number:String): IModel {
+}

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

@@ -14,7 +14,9 @@ class InfoBean(var info_id:String,var uid:String,
                var status:String,
                var create_time:String,var update_time:String,
                var delete_time:String,var license_img:String,
-               var license_sn:String,var company_name:String
+               var license_sn:String,var company_name:String,
+               var bank:String,var kbank:String,var number:String
+
 
      ): IModel {
 }

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

@@ -276,9 +276,20 @@ interface ApiService {
                 @Field("name") name: String?, @Field("idcard") idcard: String?
     ): Observable<Response<Any>>
 
+    /**
+     * 银行卡信息-保存
+     * @return
+     */
+    @POST("api/user/setCard")
+    @FormUrlEncoded
+    fun setCardBank(@Field("name") name: String?, @Field("number") number: String?,
+                    @Field("bank") bank: String?, @Field("kbank") kbank: String?,
+                    @Field("image") image: String?): Observable<Response<Any>>
+
+
 
     /**
-     * 获取信息-认证信息 身份 车辆 公司
+     * 获取信息-认证信息 身份 车辆 公司 银行卡
      * @return
      */
     @GET("api/user/getInfo")
@@ -364,6 +375,9 @@ interface ApiService {
 
 
 
+
+
+
     /**
      * 识别身份证-OCR
      * @return
@@ -380,5 +394,13 @@ interface ApiService {
     fun cvBusinessLicense(@Query("img") img: String?): Observable<Response<Business>>
 
 
+    /**
+     * 识别身份证-OCR
+     * @return
+     */
+    @GET("api/wxocr/cv_bankCard")
+    fun cvBankCard(@Query("img") img: String?): Observable<Response<BankCard>>
+
+
 
 }

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

@@ -0,0 +1,124 @@
+package com.quansu.heifengwuliu.vmodel
+
+import android.app.Activity
+import android.text.TextUtils
+import androidx.databinding.Bindable
+import com.quansu.heifengwuliu.BR
+import com.quansu.heifengwuliu.model.BankCard
+import com.quansu.heifengwuliu.model.InfoBean
+import com.quansu.heifengwuliu.utils.ChosePhotoUtils
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+class BankVModel : BViewModel<BRepository>() {
+
+   // var image: MutableLiveData<String> = MutableLiveData("")
+   var image=""
+
+    @Bindable
+    var name: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.name)
+        }
+
+    @Bindable
+    var number: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.number)
+        }
+
+    @Bindable
+    var bank: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.bank)
+        }
+
+    @Bindable
+    var kbank: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.kbank)
+        }
+
+
+    fun discernBank(img:String){//识别银行卡
+
+        repository().lreq(NetEngine.service.cvBankCard(img))
+                .doOnNext {
+                    if (it.ok()) {
+                        var bean=it.data() as BankCard
+                        number=bean.number
+                    }
+
+                }
+                .subscribe()
+
+     }
+
+    fun toSubmit(){
+        if(TextUtils.isEmpty(name)){
+            toast("请输入真实姓名")
+            return
+        }
+
+        if(TextUtils.isEmpty(number)){
+            toast("请输入银行卡号")
+            return
+        }
+        if(TextUtils.isEmpty(bank)){
+            toast("请输入开户银行")
+            return
+        }
+
+        if(TextUtils.isEmpty(kbank)){
+            toast("请输入开户银行所在支行")
+            return
+        }
+
+        repository().lreq(NetEngine.service.setCardBank(name, number,bank,kbank, image))
+                .doOnNext {
+                    if (it.ok(true)) {
+                        (repository().context as Activity).finish()
+                    }
+                }
+                .subscribe()
+
+    }
+
+    fun choseImg(){
+
+        //选择照片
+        ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
+
+    }
+
+
+    fun getInfo(){
+        //获取银行卡信息
+        repository().lreq(NetEngine.service.getInfo("4"))
+                .doOnNext {
+                    if (it.ok(true)) {
+                        var bean=it.data() as InfoBean
+                        if(null!=bean){
+                            name=bean.name
+                            number=bean.number
+                            bank=bean.bank
+                            kbank=bean.kbank
+
+                        }
+
+                    }
+                }
+                .subscribe()
+
+    }
+
+
+}
+
+
+

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

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.os.Bundle
 import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.activity.BankActivity
 import com.quansu.heifengwuliu.activity.PasswordActivity
 import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.repository.UserInfoRepository
@@ -33,4 +34,11 @@ class SettingsVModel : BViewModel<UserInfoRepository>() {
         })
     }
 
+
+    fun goBank(){//银行卡信息
+
+        UiSwitch.single(repository().context, BankActivity::class.java)
+
+    }
+
 }

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

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.BankVModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingStart="16dp"
+            android:paddingEnd="15dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="姓名"
+                android:textColor="#5D5E5F"
+                android:textSize="12sp" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:hint="请输入真实姓名"
+                android:paddingTop="18dp"
+                android:paddingBottom="7dp"
+                android:text="@={vm.name}"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACAFAC"
+                android:textSize="@dimen/sp_14" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#EFF0F1" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="11dp"
+                android:text="银行卡"
+                android:textColor="#5D5E5F"
+                android:textSize="12sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:orientation="horizontal">
+
+                <com.ysnows.base.widget.DelEditText
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/white"
+                    android:hint="请输入银行卡号"
+                    android:paddingTop="18dp"
+                    android:paddingBottom="7dp"
+                    android:text="@={vm.number}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#ACAFAC"
+                    android:textSize="@dimen/sp_14" />
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginTop="18dp"
+                    android:onClick="@{v->vm.choseImg()}"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:src="@drawable/ic_scanner" />
+
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#EFF0F1" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="11dp"
+                android:text="开户银行"
+                android:textColor="#5D5E5F"
+                android:textSize="12sp" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:hint="请输入开户银行"
+                android:paddingTop="18dp"
+                android:paddingBottom="7dp"
+                android:text="@={vm.bank}"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACAFAC"
+                android:textSize="@dimen/sp_14" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#EFF0F1" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="11dp"
+                android:text="所在支行"
+                android:textColor="#5D5E5F"
+                android:textSize="12sp" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:hint="请输入开户银行所在支行"
+                android:paddingTop="18dp"
+                android:paddingBottom="7dp"
+                android:text="@={vm.kbank}"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACAFAC"
+                android:textSize="@dimen/sp_14" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:layout_marginBottom="32dp"
+                android:background="#EFF0F1" />
+
+
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:onClick="@{v->vm.toSubmit()}">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="106dp"
+                android:src="@drawable/ic_details_grab" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="完成"
+                android:textColor="@color/white"
+                android:textSize="16sp">
+
+            </TextView>
+
+        </FrameLayout>
+
+
+    </LinearLayout>
+</layout>

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

@@ -15,6 +15,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:paddingStart="17dp"
+        android:background="@color/color_bg"
         android:paddingEnd="16dp" >
 
 
@@ -48,6 +49,8 @@
                 android:layout_marginEnd="22dp"
                 android:layout_marginTop="22dp"
                 android:onClick="@{v->vm.choseImg()}"
+                app:qmui_border_color="@color/white"
+                android:scaleType="fitXY"
                 android:src="@drawable/ic_company_bg"
                 app:layout_constraintStart_toStartOf="@id/tv_title"
                 app:layout_constraintTop_toBottomOf="@id/tv_title"

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

@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#F5F5F5"
+        android:background="@color/color_bg"
         android:orientation="vertical">
 
 

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

@@ -15,6 +15,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical" >
 
         <FrameLayout
@@ -28,145 +30,222 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@color/color_bg"
                     android:orientation="vertical" >
 
+
+
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:paddingTop="@dimen/dp_10"
-                        android:paddingBottom="@dimen/dp_10" >
+                         >
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="7dp"
+                            android:layout_marginBottom="6dp"
+                            android:text="功能"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_12" />
 
                         <RelativeLayout
                             android:id="@+id/lay_login_password"
                             android:layout_width="match_parent"
-                            android:layout_height="48dp"
+                            android:layout_height="44dp"
+                            android:background="@color/white"
                             android:onClick="@{v->vm.goPassword(1)}"
-                            android:layout_marginStart="@dimen/dp_14" >
+                            android:paddingStart="19dp" >
 
                             <ImageView
                                 android:id="@+id/img_icon1"
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="22dp"
+                                android:layout_height="24dp"
                                 android:layout_centerVertical="true"
-                                android:padding="@dimen/dp_4"
-                                android:src="@drawable/ic_login_pwd" />
+                                android:src="@drawable/ic_setting_pwd" />
 
                             <TextView
                                 android:id="@+id/tv_title1"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_centerVertical="true"
-                                android:layout_marginLeft="@dimen/dp_10"
+                                android:layout_marginLeft="18dp"
                                 android:layout_toRightOf="@id/img_icon1"
                                 android:gravity="center_vertical"
-                                android:text="登录密码"
-                                android:textColor="@color/primary_text"
-                                android:textSize="@dimen/sp_15" />
+                                android:text="修改密码"
+                                android:textColor="@color/text_title"
+                                android:textSize="@dimen/sp_14" />
 
-                             <ImageView
+                            <ImageView
                                 style="@style/mine_arrow_right"
                                  android:layout_centerVertical="true"
                                  android:layout_alignParentRight="true"
-                                 android:layout_marginEnd="@dimen/dp_12"
+                                 android:layout_marginEnd="@dimen/dp_17"
                                  android:src="@drawable/mine_right" />
 
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_alignLeft="@id/tv_title1"
-                                android:layout_alignParentBottom="true"
-                                android:background="@color/color_page_bg" />
-
                         </RelativeLayout >
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1dp"
-                            android:layout_marginLeft="@dimen/dp_14"
-                            android:background="@color/color_page_bg" />
+                            android:background="#EEEFF0" />
 
 
                         <RelativeLayout
                             android:id="@+id/lay_pay_password"
                             android:layout_width="match_parent"
-                            android:layout_height="48dp"
+                            android:layout_height="44dp"
+                            android:background="@color/white"
                             android:onClick="@{v->vm.goPassword(2)}"
-                            android:layout_marginStart="@dimen/dp_14" >
+                            android:paddingStart="19dp" >
 
                             <ImageView
                                 android:id="@+id/img_icon2"
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="22dp"
+                                android:layout_height="24dp"
                                 android:layout_centerVertical="true"
-                                android:padding="@dimen/dp_4"
-                                android:src="@drawable/ic_login_pwd" />
+                                android:src="@drawable/ic_setting_pwd" />
 
                             <TextView
                                 android:id="@+id/tv_title2"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_centerVertical="true"
-                                android:layout_marginLeft="@dimen/dp_10"
+                                android:layout_marginLeft="18dp"
                                 android:layout_toRightOf="@id/img_icon2"
                                 android:gravity="center_vertical"
                                 android:text="支付密码"
-                                android:textColor="@color/primary_text"
-                                android:textSize="@dimen/sp_15" />
+                                android:textColor="@color/text_title"
+                                android:textSize="@dimen/sp_14" />
 
                             <ImageView
                                 style="@style/mine_arrow_right"
                                 android:layout_centerVertical="true"
                                 android:layout_alignParentRight="true"
-                                android:layout_marginEnd="@dimen/dp_12"
+                                android:layout_marginEnd="17dp"
                                 android:src="@drawable/mine_right" />
 
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_alignLeft="@id/tv_title2"
-                                android:layout_alignParentBottom="true"
-                                android:background="@color/color_page_bg" />
 
                         </RelativeLayout >
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1dp"
-                            android:layout_marginLeft="@dimen/dp_14"
-                            android:background="@color/color_page_bg" />
+                            android:background="#EEEFF0" />
+
+
+                        <RelativeLayout
+                            android:id="@+id/lay_bank"
+                            android:layout_width="match_parent"
+                            android:layout_height="44dp"
+                            android:background="@color/white"
+                            android:onClick="@{v->vm.goBank()}"
+                            android:paddingStart="19dp" >
+
+                            <ImageView
+                                android:id="@+id/img_bank"
+                                android:layout_width="20dp"
+                                android:layout_height="18dp"
+                                android:layout_centerVertical="true"
+                                android:src="@drawable/ic_setting_bank" />
+
+                            <TextView
+                                android:id="@+id/tv_bank"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginLeft="18dp"
+                                android:layout_toRightOf="@id/img_bank"
+                                android:gravity="center_vertical"
+                                android:text="银行卡信息"
+                                android:textColor="@color/text_title"
+                                android:textSize="@dimen/sp_14" />
+
+                            <ImageView
+                                style="@style/mine_arrow_right"
+                                android:layout_centerVertical="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_marginEnd="17dp"
+                                android:src="@drawable/mine_right" />
+
+
+                        </RelativeLayout >
+
+
+
+
+
+
 
 
 
 
                         <TextView
                             android:layout_width="wrap_content"
-                            android:layout_height="28dp"
-                            android:layout_marginLeft="@dimen/dp_14"
-                            android:layout_marginTop="@dimen/dp_2"
-                            android:gravity="center_vertical"
-                            android:text="应用"
-                            android:textSize="@dimen/sp_14" />
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="6dp"
+                            android:layout_marginBottom="6dp"
+                            android:text="关于"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_12" />
+
+                        <RelativeLayout
+                            android:id="@+id/lay_about_us"
+                            android:layout_width="match_parent"
+                            android:layout_height="44dp"
+                            android:background="@color/white"
+                            android:paddingStart="21dp" >
+
+                            <ImageView
+                                android:id="@+id/img_icon15"
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:layout_centerVertical="true"
+                                android:src="@drawable/ic_about_us" />
+
+                            <TextView
+                                android:id="@+id/tv_title15"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginStart="17dp"
+                                android:layout_toRightOf="@id/img_icon15"
+                                android:gravity="center_vertical"
+                                android:text="关于我们"
+                                android:textColor="@color/text_title"
+                                android:textSize="@dimen/sp_14" />
+
+                            <ImageView
+                                style="@style/mine_arrow_right"
+                                android:layout_centerVertical="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_marginEnd="17dp"
+                                android:src="@drawable/mine_right" />
+
+
+
+                        </RelativeLayout >
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1dp"
-                            android:layout_marginLeft="@dimen/dp_14"
-                            android:background="@color/color_page_bg" />
+                            android:background="#EEEFF0" />
 
                         <RelativeLayout
                             android:id="@+id/lay_checkupdate"
                             android:layout_width="match_parent"
-                            android:layout_height="48dp"
-                            android:layout_marginStart="@dimen/dp_14" >
+                            android:layout_height="44dp"
+                            android:background="@color/white"
+                            android:paddingStart="21dp" >
 
                             <ImageView
                                 android:id="@+id/img_icon14"
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="20dp"
+                                android:layout_height="19dp"
                                 android:layout_centerVertical="true"
-                                android:padding="@dimen/dp_4"
                                 android:src="@drawable/ic_check_update" />
 
                             <TextView
@@ -174,98 +253,79 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_centerVertical="true"
-                                android:layout_marginLeft="@dimen/dp_10"
+                                android:layout_marginLeft="17dp"
                                 android:layout_toRightOf="@id/img_icon14"
                                 android:gravity="center_vertical"
                                 android:text="检查更新"
-                                android:textColor="@color/primary_text"
-                                android:textSize="@dimen/sp_15" />
+                                android:textColor="@color/text_title"
+                                android:textSize="@dimen/sp_14" />
 
                             <TextView
                                 android:id="@+id/tv_version_name"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true"
-                                android:layout_marginRight="@dimen/dp_14"
                                 android:gravity="center_vertical"
                                 android:text="@{`V`+BuildConfig.VERSION_NAME}"
-                                android:textColor="@color/secondary_text"
-                                android:textSize="@dimen/sp_12" />
+                                android:textColor="#26292F"
+                                tools:text="v1.01.11"
+                                android:layout_marginEnd="12dp"
+                                android:layout_alignRight="@id/iv"
+                                android:textSize="@dimen/sp_13" />
 
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_alignLeft="@id/tv_title14"
-                                android:layout_alignParentBottom="true"
-                                android:background="@color/color_page_bg" />
+
+                            <ImageView
+                                android:id="@+id/iv"
+                                style="@style/mine_arrow_right"
+                                android:layout_centerVertical="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_marginEnd="17dp"
+                                android:src="@drawable/mine_right" />
 
                         </RelativeLayout >
 
-                        <RelativeLayout
-                            android:id="@+id/lay_about_us"
+                        <View
                             android:layout_width="match_parent"
-                            android:layout_height="48dp"
-                            android:layout_marginStart="@dimen/dp_14" >
+                            android:layout_height="1dp"
+                            android:background="#EEEFF0" />
+
 
-                            <ImageView
-                                android:id="@+id/img_icon15"
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
-                                android:layout_centerVertical="true"
-                                android:padding="@dimen/dp_4"
-                                android:src="@drawable/ic_about_us" />
 
-                            <TextView
-                                android:id="@+id/tv_title15"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerVertical="true"
-                                android:layout_marginLeft="@dimen/dp_10"
-                                android:layout_toRightOf="@id/img_icon15"
-                                android:gravity="center_vertical"
-                                android:text="关于我们"
-                                android:textColor="@color/primary_text"
-                                android:textSize="@dimen/sp_15" />
 
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_alignLeft="@id/tv_title15"
-                                android:layout_alignParentBottom="true"
-                                android:background="@color/color_page_bg" />
 
-                        </RelativeLayout >
 
                     </LinearLayout >
                 </LinearLayout >
             </ScrollView >
 
-            <androidx.cardview.widget.CardView
+
+            <FrameLayout
+                android:id="@+id/fl_logout"
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:layout_gravity="bottom"
-                android:layout_marginLeft="35dp"
-                android:layout_marginTop="35dp"
-                android:layout_marginRight="35dp"
-                android:layout_marginBottom="@dimen/sp_15"
-                android:background="@color/colorPrimary"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="@dimen/dp_16"
                 android:visibility="@{vm.user.isLogin()?0:8}"
-                app:cardBackgroundColor="@color/colorPrimary"
-                app:cardCornerRadius="22.5dp"
-                app:cardElevation="2dp"
-                app:cardPreventCornerOverlap="true" >
-
-                <Button
-                    android:id="@+id/btn_logout"
+                android:layout_gravity="bottom"
+                android:layout_height="wrap_content">
+                <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@color/colorPrimary"
-                    android:text="@string/logout"
+                    android:layout_height="106dp"
+                    android:src="@drawable/ic_details_grab" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="退出登录"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16" />
+                    android:textSize="16sp"
+                    android:layout_height="wrap_content">
+
+                </TextView>
+
+            </FrameLayout>
+
+
 
-            </androidx.cardview.widget.CardView >
 
         </FrameLayout >
     </LinearLayout >