From 2d2d325866283db4631d872304ce98000afa84ec Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 6 May 2024 17:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E8=AF=81=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=A4=A7=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 15 +-- .../oss/OssServiceUtil.java | 6 +- .../ui/HomeActivity.kt | 16 +-- .../account/authperson/AuthDriverActivity.kt | 91 +++++++------ .../account/authperson/AuthPersonActivity.kt | 120 ++++++++++-------- .../account/authperson/EditDriverActivity.kt | 32 ++++- .../account/authperson/EditPersonActivity.kt | 49 +++++-- .../ui/mine/activity/SettingActivity.kt | 5 - .../ui/mine/activity/WalletActivity.kt | 1 - .../waybill/activity/WaybillSuccActivity.kt | 19 ++- .../waybill/activity/WaybillUpPicActivity.kt | 2 +- .../utils/CommonPopUtils.kt | 44 ++++++- .../utils/OcrUtils.kt | 45 +++++++ .../main/res/layout/activity_auth_driver.xml | 50 ++++++-- .../main/res/layout/activity_auth_person.xml | 55 ++++++-- app/src/main/res/layout/activity_home.xml | 8 +- .../main/res/layout/activity_waybill_load.xml | 45 ++++--- .../res/layout/activity_waybill_unload.xml | 48 ++++--- .../com/arpa/mylibrary/pop/PopNorBottomPic.kt | 12 ++ .../com/arpa/mylibrary/utils/PopsUtils.kt | 17 ++- .../src/main/res/layout/choice_norcar_img.xml | 53 ++++++-- 21 files changed, 512 insertions(+), 221 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 5d8d1e3..0c0c338 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,20 +3,7 @@ - - - - - - - - - - - - - - + diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/oss/OssServiceUtil.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/oss/OssServiceUtil.java index d076fe0..e6331ba 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/oss/OssServiceUtil.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/oss/OssServiceUtil.java @@ -238,7 +238,7 @@ public class OssServiceUtil { } //初始化 - number = 1; + number = 0; success.clear(); failure.clear(); for (int i = 0; i < localFiles.size(); i++) { @@ -255,7 +255,7 @@ public class OssServiceUtil { oss.asyncPutObject(put, new OSSCompletedCallback() { @Override public void onSuccess(PutObjectRequest request, final PutObjectResult result) { - + number++; String aliPath = OssConfigBean.BUCKET_BASE_URL + OssConfigBean.BUCKET_OBJECT + name; success.add(aliPath); if (number == localFiles.size()) { @@ -270,7 +270,7 @@ public class OssServiceUtil { //返回 上传路径,以及失败的路径 callback.onOssSuccess(success, failure); } - number++; + } @Override diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/HomeActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/HomeActivity.kt index afff431..ee8ab62 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/HomeActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/HomeActivity.kt @@ -58,7 +58,7 @@ class HomeActivity : BaseActivity(), OnTabSelectListener, override fun initView(savedInstanceState: Bundle?) { - + EventBus.getDefault().register(this); binding.homeTabLayout.run { setTabData(mTabEntities) @@ -150,19 +150,15 @@ class HomeActivity : BaseActivity(), OnTabSelectListener, override fun onPageScrollStateChanged(state: Int) { } - override fun onStart() { - super.onStart() - EventBus.getDefault().register(this); - } - - override fun onStop() { - super.onStop() - EventBus.getDefault().unregister(this); - } @Subscribe fun eventStatu(event: GoWaybillEvent) { binding.homeTabLayout.currentTab = event.statu binding.homeNoScrollViewPager.currentItem = event.statu } + override fun onDestroy() { + super.onDestroy() + EventBus.getDefault().unregister(this); + } + } \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt index 10056b7..3c024c2 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.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.bean.UpDriverInfoBean @@ -139,56 +140,74 @@ class AuthDriverActivity : BaseActivity() { private fun selFrontPic() { - OcrUtils.getInstance().ocrDriver(mContext, this) { picPath, result -> - if (result?.data?.face == null) { - ToastUtils.showToast(mContext, "请选择正确证件照片") - return@ocrDriver - } - result?.data?.face?.data.let { - ImageLoader.getInstance() - .loadRoundImage(mContext, picPath.locPic, 12, binding.ivFront) - driverInfoBean.licensePhotoFaceUrl = picPath.picPath - it?.run { - driverInfoBean.run { - licenseFirstGetDate = initialIssueDate - licenseApproveOrganization = - issueAuthority //发证机关 - } - binding.run { - etName.setText(it.name) - etId.setText(it.licenseNumber) - tvCarType.text = it.approvedType - if (validPeriod.contains("至")) { - val split = validPeriod.split("至") - tvStart.text = split[0] - tvEnd.text = - if (split.size == 2) split[1] else "" + if (driverInfoBean.licensePhotoFaceUrl.isNullOrEmpty()){ + OcrUtils.getInstance().ocrDriver(mContext, this) { picPath, result -> + if (result?.data?.face == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrDriver + } + result?.data?.face?.data.let { + ImageLoader.getInstance() + .loadRoundImage(mContext, picPath.locPic, 12, binding.ivFront) + driverInfoBean.licensePhotoFaceUrl = picPath.picPath + binding.tvChangeFront.visibility = View.VISIBLE + it?.run { + driverInfoBean.run { + licenseFirstGetDate = initialIssueDate + licenseApproveOrganization = + issueAuthority //发证机关 + } + binding.run { + etName.setText(it.name) + etId.setText(it.licenseNumber) + tvCarType.text = it.approvedType + if (validPeriod.contains("至")) { + val split = validPeriod.split("至") + tvStart.text = split[0] + tvEnd.text = + if (split.size == 2) split[1] else "" + } } } } } + }else{ + CommonPopUtils.getInstance().showOnePic( + mContext, + binding.ivFront, driverInfoBean.licensePhotoFaceUrl + ) } + } private fun selBackPic() { - OcrUtils.getInstance().ocrDriver(mContext, this) { picPath, result -> - if (result?.data?.back == null) { - ToastUtils.showToast(mContext, "请选择正确证件照片") - return@ocrDriver - } - result?.data?.back?.data.let { - ImageLoader.getInstance() - .loadRoundImage(mContext, picPath.locPic, 12, binding.ivBack) - driverInfoBean.licensePhotoBackUrl = picPath.picPath - it?.run { - backLicName = it.name - driverInfoBean.licenseRecordNumber = recordNumber + if (driverInfoBean.licensePhotoBackUrl.isNullOrEmpty()){ + OcrUtils.getInstance().ocrDriver(mContext, this) { picPath, result -> + if (result?.data?.back == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrDriver + } + result?.data?.back?.data.let { + ImageLoader.getInstance() + .loadRoundImage(mContext, picPath.locPic, 12, binding.ivBack) + driverInfoBean.licensePhotoBackUrl = picPath.picPath + binding.tvChangeBack.visibility = View.VISIBLE + it?.run { + backLicName = it.name + driverInfoBean.licenseRecordNumber = recordNumber + } } } + }else{ + CommonPopUtils.getInstance().showOnePic( + mContext, + binding.ivBack, driverInfoBean.licensePhotoBackUrl + ) } + } } \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt index 75d715f..4976a49 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt @@ -1,6 +1,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle +import android.view.View import com.alibaba.idst.nui.DateUtil.DEFAULT_FORMAT_DATE import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig @@ -10,6 +11,7 @@ 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.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils import com.arpa.hndahesudintocctmsdriver.utils.SPUtils import com.arpa.mylibrary.base.BaseActivity @@ -103,70 +105,88 @@ class AuthPersonActivity : BaseActivity() { } ivFront.setOnClickListener { - OcrUtils.getInstance() - .ocrPerson(mContext, this@AuthPersonActivity) { picPath, result -> - if (result?.data?.face == null) { - ToastUtils.showToast(mContext, "请选择正确证件照片") - return@ocrPerson - } + if (perInfoBean.idcardFrontUrl.isNullOrBlank()){ + OcrUtils.getInstance() + .ocrPerson(mContext, this@AuthPersonActivity) { picPath, result -> + if (result?.data?.face == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrPerson + } - ImageLoader.getInstance() - .loadRoundImage(mContext, picPath.locPic, 12, ivFront) - perInfoBean.idcardFrontUrl = picPath.picPath - result?.data?.face?.data.let { - it?.run { - perInfoBean.run { - idcardNo = idNumber - idcardName = name - idcardAddress = address - idcardEthnicity = ethnicity - idcardSex = if (sex == "男") "0" else "1" + ImageLoader.getInstance() + .loadRoundImage(mContext, picPath.locPic, 12, ivFront) + tvFrontSeeBig.visibility = View.VISIBLE + perInfoBean.idcardFrontUrl = picPath.picPath + result?.data?.face?.data.let { + it?.run { + perInfoBean.run { + idcardNo = idNumber + idcardName = name + idcardAddress = address + idcardEthnicity = ethnicity + idcardSex = if (sex == "男") "0" else "1" + } + } + binding.run { + etName.setText(it?.name) + etId.setText(it?.idNumber) } } - binding.run { - etName.setText(it?.name) - etId.setText(it?.idNumber) - } } - } + }else{ + CommonPopUtils.getInstance().showOnePic( + mContext, + ivFront, perInfoBean.idcardFrontUrl + ) + } + } ivBack.setOnClickListener { - OcrUtils.getInstance() - .ocrPerson(mContext, this@AuthPersonActivity) { picPath, result -> + if (perInfoBean.idcardBackUrl.isNullOrBlank()){ + OcrUtils.getInstance() + .ocrPerson(mContext, this@AuthPersonActivity) { picPath, result -> - if (result?.data?.back == null) { - ToastUtils.showToast(mContext, "请选择正确证件照片") - return@ocrPerson - } + if (result?.data?.back == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrPerson + } - perInfoBean.idcardBackUrl = picPath.picPath - ImageLoader.getInstance() - .loadRoundImage(mContext, picPath.locPic, 12, ivBack) - result?.data?.back?.let { - if (it.data.validPeriod?.contains("-") == true) { - val split = it.data.validPeriod.split("-") - binding.run { - tvStart.text = - TimeUtil.changeDateFormat(split[0]) - tvEnd.text = - if (split.size == 2) TimeUtil.changeDateFormat( - split[1] - ) else "" + perInfoBean.idcardBackUrl = picPath.picPath + ImageLoader.getInstance() + .loadRoundImage(mContext, picPath.locPic, 12, ivBack) + tvBackSeeBig.visibility = View.VISIBLE + result?.data?.back?.let { + if (it.data.validPeriod?.contains("-") == true) { + val split = it.data.validPeriod.split("-") + binding.run { + tvStart.text = + TimeUtil.changeDateFormat(split[0]) + tvEnd.text = + if (split.size == 2) TimeUtil.changeDateFormat( + split[1] + ) else "" + } + } + + if (it.data.validPeriod?.contains("长期") == true) { + val split = it.data.validPeriod.split("长期") + binding.run { + tvStart.text = + TimeUtil.changeDateFormat(split[0]) + tvEnd.text = "长期" + } } } - if (it.data.validPeriod?.contains("长期") == true) { - val split = it.data.validPeriod.split("长期") - binding.run { - tvStart.text = - TimeUtil.changeDateFormat(split[0]) - tvEnd.text = "长期" - } - } } + }else{ + CommonPopUtils.getInstance().showOnePic( + mContext, + ivBack, perInfoBean.idcardBackUrl + ) + } - } } } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt index 3f91b3c..26c5656 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.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.databinding.ActivityAuthDriverBinding @@ -69,10 +70,20 @@ class EditDriverActivity : BaseActivity() { } ivFront.setOnClickListener { - selFrontPic() + + seeBigPic(binding.ivFront, driverInfoBean.licensePhotoFaceUrl) } ivBack.setOnClickListener { + + seeBigPic(binding.ivBack, driverInfoBean.licensePhotoBackUrl) + } + + tvChangeFront.setOnClickListener { + selFrontPic() + } + + tvChangeBack.setOnClickListener { selBackPic() } @@ -97,8 +108,8 @@ class EditDriverActivity : BaseActivity() { tvCarType.isEnabled = false tvStart.isEnabled = false tvEnd.isEnabled = false - ivFront.isEnabled = false - ivBack.isEnabled = false +// ivFront.isEnabled = false +// ivBack.isEnabled = false } } @@ -109,6 +120,12 @@ class EditDriverActivity : BaseActivity() { tvStart.text = driverInfoBean.licenseEffectiveStart tvEnd.text = driverInfoBean.licenseEffectiveEnd tvCarType.text = driverInfoBean.licenseType + + tvChangeFront.visibility = + if (driverInfoBean.licensePhotoFaceUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE + tvChangeBack.visibility = + if (driverInfoBean.licensePhotoBackUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE + ImageLoader.getInstance() .loadRoundImage( mContext, @@ -184,6 +201,7 @@ class EditDriverActivity : BaseActivity() { private fun selFrontPic() { + OcrUtils.getInstance().ocrDriver(mContext, this) { picPath, result -> if (result?.data?.face == null) { ToastUtils.showToast(mContext, "请选择正确证件照片") @@ -220,6 +238,7 @@ class EditDriverActivity : BaseActivity() { private fun selBackPic() { + OcrUtils.getInstance().ocrDriver(mContext, this) { picPath, result -> if (result?.data?.back == null) { ToastUtils.showToast(mContext, "请选择正确证件照片") @@ -238,6 +257,13 @@ class EditDriverActivity : BaseActivity() { } + private fun seeBigPic(imageView: ImageView,picPath:String){ + CommonPopUtils.getInstance().showOnePic( + mContext, + imageView, picPath + ) + } + override fun onBackPressed() { super.onBackPressed() setResult(RESULT_OK) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt index 361d1ee..53923b1 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt @@ -9,6 +9,7 @@ import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthPersonBinding import com.arpa.hndahesudintocctmsdriver.net.BaseObserver import com.arpa.hndahesudintocctmsdriver.net.DataManager import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack +import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils import com.arpa.hndahesudintocctmsdriver.utils.UserUtils import com.arpa.mylibrary.base.BaseActivity @@ -37,7 +38,7 @@ class EditPersonActivity : BaseActivity() { private var firstMissingInfo = -1 override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证"){ + setTitleBar("实名认证") { setResult(RESULT_OK) finish() } @@ -68,8 +69,11 @@ class EditPersonActivity : BaseActivity() { } if (!tvEnd.text.toString().contains("长期")) { - if (TimeUtil.compareDate(tvEnd.text.toString(), - SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))) { + if (TimeUtil.compareDate( + tvEnd.text.toString(), + SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) + ) + ) { ToastUtils.showToast(mContext, "身份证已过期,请及时更换最新证件") } } @@ -79,11 +83,11 @@ class EditPersonActivity : BaseActivity() { .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) - BaseSPUtils.put(mContext,AppConfig.USER_CARID,perInfoBean.idcardNo) + BaseSPUtils.put(mContext, AppConfig.USER_CARID, perInfoBean.idcardNo) showToast("修改成功") val goNextPersonInfo = UserUtils.instance.goNextPersonInfo(perInfoBean) if (goNextPersonInfo != null) { - ActivityUtils.startActivity(mContext,goNextPersonInfo) + ActivityUtils.startActivity(mContext, goNextPersonInfo) } setResult(RESULT_OK) finish() @@ -108,9 +112,13 @@ class EditPersonActivity : BaseActivity() { } } - ivFront.setOnClickListener { + tvFrontSeeBig.setOnClickListener { OcrUtils.getInstance() - .ocrPerson(mContext, this@EditPersonActivity) { picPath, result -> + .ocrPerson( + mContext, + perInfoBean.idcardFrontUrl, + this@EditPersonActivity + ) { picPath, result -> if (result?.data?.face == null) { ToastUtils.showToast(mContext, "请选择正确证件照片") return@ocrPerson @@ -135,8 +143,7 @@ class EditPersonActivity : BaseActivity() { } } } - - ivBack.setOnClickListener { + tvBackSeeBig.setOnClickListener { OcrUtils.getInstance() .ocrPerson(mContext, this@EditPersonActivity) { picPath, result -> if (result?.data?.back == null) { @@ -173,6 +180,22 @@ class EditPersonActivity : BaseActivity() { } } + + ivFront.setOnClickListener { + CommonPopUtils.getInstance().showOnePic( + mContext, + ivFront, perInfoBean.idcardFrontUrl + ) + + } + + ivBack.setOnClickListener { + CommonPopUtils.getInstance().showOnePic( + mContext, + ivBack, perInfoBean.idcardBackUrl + ) + + } } @@ -196,14 +219,18 @@ class EditPersonActivity : BaseActivity() { etId.isEnabled = false tvStart.isEnabled = false tvEnd.isEnabled = false - ivFront.isEnabled = false - ivBack.isEnabled = false +// ivFront.isEnabled = false +// ivBack.isEnabled = false } } binding.run { etName.setText(perInfoBean.idcardName) etId.setText(perInfoBean.idcardNo) tvStart.text = perInfoBean.idcardEffectiveStart + tvFrontSeeBig.visibility = + if (perInfoBean.idcardFrontUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE + tvBackSeeBig.visibility = + if (perInfoBean.idcardBackUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE tvEnd.text = if (perInfoBean.idcardIsEndless == "1") "长期" else perInfoBean.idcardEffectiveEnd ImageLoader.getInstance() diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt index da7ca0e..1620f77 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt @@ -2,17 +2,12 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine.activity import android.os.Bundle import android.view.View -import cn.jpush.android.api.JPushInterface import cn.jpush.android.ups.JPushUPSManager -import cn.jpush.android.ups.TokenResult -import cn.jpush.android.ups.UPSTurnCallBack import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.databinding.ActivitySettingBinding -import com.arpa.hndahesudintocctmsdriver.push.PushHelper import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.hndahesudintocctmsdriver.utils.UserUtils import com.arpa.mylibrary.base.BaseActivity -import com.arpa.mylibrary.callback.PushAliasListener /** * @ClassName SettingActivity diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/WalletActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/WalletActivity.kt index c109d4e..86b194f 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/WalletActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/WalletActivity.kt @@ -13,7 +13,6 @@ import com.arpa.hndahesudintocctmsdriver.net.DataManager import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.hndahesudintocctmsdriver.ui.account.authperson.EditBankCardActivity import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils -import com.arpa.glex.bean.UserDetail import com.arpa.glex.bean.WalletInfo import com.arpa.glex.bean.WaterInfo import com.arpa.hndahesudintocctmsdriver.base.AppConfig diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillSuccActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillSuccActivity.kt index 8ad21f8..58bada3 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillSuccActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillSuccActivity.kt @@ -5,6 +5,7 @@ import android.view.View import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig import com.arpa.hndahesudintocctmsdriver.databinding.ActivityWaybillSuccBinding +import com.arpa.hndahesudintocctmsdriver.event.GoWaybillEvent import com.arpa.hndahesudintocctmsdriver.event.RefreshEvent import com.arpa.hndahesudintocctmsdriver.ui.HomeActivity import com.arpa.mylibrary.base.BaseActivity @@ -88,17 +89,21 @@ class WaybillSuccActivity : BaseActivity() { private fun goLeftOrRight(type: Int?, isLeft: Boolean) { if (isLeft) { when (type) { - 0 -> ActivityUtils.finishToActivityAndGoNew( - mContext, - HomeActivity::class.java, - WaybillLoadActivity::class.java, - intent.extras, - false - ) + 0 -> { + ActivityUtils.finishToActivityAndGoNew( + mContext, + HomeActivity::class.java, + WaybillLoadActivity::class.java, + intent.extras, + false + ) + + } 1, 2 -> { ActivityUtils.finishToActivity(HomeActivity::class.java, false) EventBus.getDefault().post(RefreshEvent(type)) + EventBus.getDefault().post(GoWaybillEvent(0)) } } } else { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt index 8d22983..9bb0480 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt @@ -122,7 +122,7 @@ class WaybillUpPicActivity : BaseActivity() { ) var myAdapter = GridImageAdapter(mContext, mData) - myAdapter.selectMax = 6 + myAdapter.selectMax = if (type==2) 6 else 1 myAdapter.setOnItemClickListener(object : OnItemClickListener { override fun onItemClick(v: View?, position: Int) { PopsUtils.getInstance() diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt index 3355a28..7b9e652 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt @@ -4,17 +4,17 @@ import android.content.Context import android.graphics.Color import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView +import com.arpa.glex.bean.WalletInfo import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.bean.AppVersion import com.arpa.hndahesudintocctmsdriver.bean.CarBean +import com.arpa.hndahesudintocctmsdriver.bean.CashConfig import com.arpa.hndahesudintocctmsdriver.callback.OnResultListener import com.arpa.hndahesudintocctmsdriver.mypop.AgreementAlert import com.arpa.hndahesudintocctmsdriver.mypop.OnCarSelectListener import com.arpa.hndahesudintocctmsdriver.mypop.PopBottomCar -import com.arpa.hndahesudintocctmsdriver.weight.pop.UpAppPop -import com.arpa.glex.bean.WalletInfo -import com.arpa.hndahesudintocctmsdriver.bean.CashConfig import com.arpa.hndahesudintocctmsdriver.weight.pop.InputMoneyPop2 +import com.arpa.hndahesudintocctmsdriver.weight.pop.UpAppPop import com.arpa.mylibrary.base.SingletonNoPHolder import com.arpa.mylibrary.utils.ConvertUtils import com.lxj.xpopup.XPopup @@ -47,7 +47,7 @@ class CommonPopUtils private constructor() { XPopup.Builder(context) .isViewMode(true) // .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个 - .asCustom(PopBottomCar(context, cars, isCap,selDriverId,selCarId, listener)) + .asCustom(PopBottomCar(context, cars, isCap, selDriverId, selCarId, listener)) .show() @@ -154,6 +154,33 @@ class CommonPopUtils private constructor() { .show() } + /** + * 展示一张大图 + * @param context Context + * @param imageView ImageView? + * @param picUrl String + */ + fun showOnePic( + context: Context, + imageView: ImageView? = null, + picUrl: String + ) { + XPopup.Builder(context) + .asImageViewer( + imageView, + picUrl, + false, + -1, + -1, + ConvertUtils.dp2px(10F), + false, + Color.rgb(32, 36, 46), + SmartGlideImageLoader(R.mipmap.ic_launcher_round), + null + ) + .show() + } + /** * app版本检查 * @param context Context @@ -179,13 +206,18 @@ class CommonPopUtils private constructor() { * @param userInfo UserDetail * @param listener OnInputConfirmListener */ - fun showPickMoney(context: Context, walletInfo:WalletInfo, cashConfig: CashConfig, listener: OnInputConfirmListener) { + fun showPickMoney( + context: Context, + walletInfo: WalletInfo, + cashConfig: CashConfig, + listener: OnInputConfirmListener + ) { XPopup.Builder(context) .dismissOnBackPressed(true) .dismissOnTouchOutside(true) .asCustom( InputMoneyPop2( - context,walletInfo, cashConfig, listener + context, walletInfo, cashConfig, listener ) ) .show() diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OcrUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OcrUtils.kt index 879bf82..3b386a7 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OcrUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OcrUtils.kt @@ -30,6 +30,51 @@ class OcrUtils private constructor() { companion object : SingletonNoPHolder(::OcrUtils) + /** + * 身份证识别 + * */ + fun ocrPerson(context: Context,picUrl: String = "", activity: AppCompatActivity, listener: OnOcrPicResultListener) { + PopsUtils.getInstance().showSimSelPic2(context,picUrl) { result -> + LoadingUtils.instance.showLoading(activity) + //上传oss得到图片地址 + OssServiceUtil.getInstance().run { + asyncPutImage(result[0].realPath, null) + setResultCallBack { data, oldPath -> + DataManager.getInstance().recognizeIdcard(oldPath) + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(context, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + LoadingUtils.instance.dissLoading() + t.data?.let { + listener.onSuccResult( + PicPath(result[0].realPath, oldPath), it + ) + } + } + + override fun onCodeError( + mContext: Context?, + t: CommonResponseBean + ) { +// super.onCodeError(mContext, t) + LoadingUtils.instance.dissLoading() + if (t.code == 500) { +// if (t.msg.contains("code: 400, The image type does not match the API operation")) { + ToastUtils.showToast(mContext, "图片识别失败，请重新上传") +// } else { +// ToastUtils.showToast(mContext, t.msg) +// } + } + } + })) + } + } + } + } + + + /** * 身份证识别 * */ diff --git a/app/src/main/res/layout/activity_auth_driver.xml b/app/src/main/res/layout/activity_auth_driver.xml index e6124db..0bd9b1d 100644 --- a/app/src/main/res/layout/activity_auth_driver.xml +++ b/app/src/main/res/layout/activity_auth_driver.xml @@ -59,24 +59,58 @@ android:textSize="@dimen/sp_16"> - + android:layout_marginBottom="@dimen/dp_22"> + + + - + android:layout_marginBottom="@dimen/dp_22"> + + + + diff --git a/app/src/main/res/layout/activity_auth_person.xml b/app/src/main/res/layout/activity_auth_person.xml index efb6dbf..a53c4e0 100644 --- a/app/src/main/res/layout/activity_auth_person.xml +++ b/app/src/main/res/layout/activity_auth_person.xml @@ -50,25 +50,64 @@ android:textColor="@color/black" android:textSize="@dimen/sp_16"> - - + android:layout_marginBottom="@dimen/dp_22"> - + + + + + + + + + > + + + + + diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index fdd9a4c..89ed109 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -10,15 +10,15 @@ android:elevation="3dp" android:id="@+id/home_tabLayout" android:layout_width="match_parent" - android:layout_height="@dimen/dp_56" + android:layout_height="@dimen/dp_60" android:layout_alignParentBottom="true" android:background="@color/colorWhite" - app:tl_iconHeight="@dimen/dp_21" - app:tl_iconWidth="@dimen/dp_21" + app:tl_iconHeight="@dimen/dp_24" + app:tl_iconWidth="@dimen/dp_24" app:tl_indicator_height="0dp" app:tl_textSelectColor="#454545" app:tl_textUnselectColor="#A8ABB0" - app:tl_textsize="@dimen/sp_12" /> + app:tl_textsize="@dimen/sp_14" /> - + > + - + + + - - + > + + + + + + - (R.id.btn_paizhao) var xiangce = findViewById