1:新增版本号

liugl

2020-12-12 e95f159957e16d82eabc2f6e26f5d17302d7865f

1:新增版本号

 app/build.gradle

@@ -25,8 +25,10 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 3
        versionName "3"
        versionCode 5
        versionName "5"
//        versionCode 22
//        versionName "22"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

 app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt

@@ -31,6 +31,7 @@
import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.DateUtil
import com.okgoincar.utils.EasePopup.EasyPopup
import com.okgoincar.utils.PackageUtil
import com.okgoincar.utils.download.DownloadUtil
import com.okgoincar.utils.glide.GlideUtil
import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
@@ -171,6 +172,7 @@

    private fun showUI(data: UserInfoBean?) {
        data?.let {
            textView_version.text ="版本-V"+PackageUtil.getVersionName(this)
            tv_title_top.text = "服 务 监 督 卡"
            if (data.taxiAptitudeCard.length > 7){
                tv_code_num.text  = "资格证号："+data.taxiAptitudeCard.substring(0,3)+"*******"+data.taxiAptitudeCard.substring(data.taxiAptitudeCard.length-4,data.taxiAptitudeCard.length)

 app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt

@@ -14,8 +14,10 @@
import com.okgoincar.bean.OrderStatueBean
import com.okgoincar.netUtls.Api
import com.okgoincar.netUtls.timeOver
import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.MyUtils
import kotlinx.android.synthetic.main.activity_order_over.*
import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
import java.lang.Exception

class SlabOrderOverActivity : MySlabBaseActivity() {
@@ -266,7 +268,13 @@
        }

        tv_complete.clickDelay {
            overOrder()
           var pop = DialogUtil.getSlabDelAndSurePopWindow(this,"请确认是否收到乘客线下付款",{}){
                overOrder()
            }
            pop.contentView.tv_close_base.text = "未收款"
            pop.contentView.tv_sure_base.text = "已收款"
            pop.showCenter(window.decorView)

        }
    }


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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/ct_bg"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
@@ -314,5 +315,18 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent" />

    <TextView
        android:id="@+id/textView_version"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="TextView"
        android:textSize="22dp"
        android:textColor="#F28105"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        android:layout_marginStart="44dp"
        android:layout_marginTop="21dp"
         />


</androidx.constraintlayout.widget.ConstraintLayout>