diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt index a7efef4..6964aa1 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt @@ -2,6 +2,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle import android.view.View +import android.widget.ImageView import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig import com.arpa.hndahesudintocctmsdriver.bean.DiCarColor @@ -44,12 +45,20 @@ class EditTrailerActivity : BaseActivity() { plateColor = "黄色" } ivFront.setOnClickListener { + if (showPic(upDrivingInfoBean.licenseFaceUrl, ivFront)) + return@setOnClickListener selFrontPic() } ivBack.setOnClickListener { + if (showPic(upDrivingInfoBean.licenseBackUrl, ivBack)) + return@setOnClickListener selBackPic() } + + tvChangeFront.setOnClickListener { selFrontPic() } + tvChangeBack.setOnClickListener { selBackPic() } + tvCarType.setOnClickListener { //车辆类型 DicUtils.getInstance() @@ -121,8 +130,8 @@ class EditTrailerActivity : BaseActivity() { etUseNature.isEnabled = false tvEnd.isEnabled = false tvCarColor.isEnabled = false - ivFront.isEnabled = false - ivBack.isEnabled = false +// ivFront.isEnabled = false +// ivBack.isEnabled = false } } binding.run { @@ -131,6 +140,11 @@ class EditTrailerActivity : BaseActivity() { ImageLoader.getInstance() .loadRoundImage(mContext, data.licenseBackUrl, 12, ivBack) ImageLoader.getInstance() + tvChangeFront.visibility = + if (data.licenseFaceUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE + tvChangeBack.visibility = + if (data.licenseBackUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE + etHdzzz.setText(data.approvedLoad) etCarNum.setText(data.vehicleNum) @@ -188,6 +202,7 @@ class EditTrailerActivity : BaseActivity() { binding.run { etCarNum.setText(it.licensePlateNumber) etUseNature.setText(it.useNature) + tvChangeFront.visibility = View.VISIBLE } } } @@ -220,6 +235,7 @@ class EditTrailerActivity : BaseActivity() { if (it.permittedWeight.contains("kg")) it.permittedWeight.split("kg")[0] else "" } binding.run { + tvChangeBack.visibility = View.VISIBLE etHdzzz.setText(upDrivingInfoBean.approvedLoad) tvInfo.text = it.overallDimension } @@ -252,7 +268,17 @@ class EditTrailerActivity : BaseActivity() { } } } + private fun showPic(url: String, image: ImageView): Boolean { + if (!url.isNullOrEmpty()) { + CommonPopUtils.getInstance().showOnePic( + mContext, + image, url + ) + return true + } + return false + } private fun subMint() { diff --git a/app/src/main/res/layout/activity_auth_trailer.xml b/app/src/main/res/layout/activity_auth_trailer.xml index b7fb9d7..3461180 100644 --- a/app/src/main/res/layout/activity_auth_trailer.xml +++ b/app/src/main/res/layout/activity_auth_trailer.xml @@ -38,8 +38,7 @@ android:id="@+id/tvInfo" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="@dimen/dp_20" - /> + android:textSize="@dimen/dp_20" /> + + + + + - + android:textSize="@dimen/sp_15"> + android:orientation="horizontal" + android:visibility="gone"> + android:textSize="@dimen/sp_15"> @@ -307,8 +335,6 @@ - -