From 9ab188f239e276114b02118e7e1cf64364c66122 Mon Sep 17 00:00:00 2001 From: lijia Date: Wed, 10 Jul 2024 15:51:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../push/TagAliasOperatorHelper.java | 2 +- .../ui/LauncherActivity.kt | 1 - .../account/authperson/AuthDrivingActivity.kt | 4 +++ .../ui/account/authperson/AuthFaceActivity.kt | 1 + .../authperson/EditQualificationActivity.kt | 8 ++--- .../ui/home/HomeFragment.kt | 32 ++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java index c7e4a6b..60dbb67 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java @@ -80,7 +80,7 @@ public class TagAliasOperatorHelper { }else{ String logs = "Failed to modify alias, errorCode:" + jPushMessage.getErrorCode(); Log.e(TAG, logs); - ToastUtils.showToast(context,logs); +// ToastUtils.showToast(context,logs); // MMKV.defaultMMKV().putString(AdvActivity.ALIAS_DATA, ""); } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt index 118497f..d8cd490 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt @@ -59,7 +59,6 @@ class LauncherActivity : BaseActivity() { override fun initDate() { val isFirstOpenApp = SPUtils.instance.getIsFirstOpenApp(mContext) if (isFirstOpenApp) { - MapsInitializer.updatePrivacyShow(this, true, true) CommonPopUtils.getInstance().showCenterAgreement(mContext) { SPUtils.instance.setIsFirstOpenApp(mContext, false) AMapLocationClient.updatePrivacyShow(mContext, true, true) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt index d393b7f..bfd877a 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt @@ -352,6 +352,10 @@ class AuthDrivingActivity : BaseActivity() { showToast("请完善车辆信息") return@subMit } + if (upDrivingInfoBean.roadLicensePhotoUrl.isNullOrEmpty()) { + showToast("请上传道路运输许可证") + return@subMit + } if (upDrivingInfoBean.vehicleNum != backLicCarNum) { CommonPopUtils.getInstance().showCommCenterPop( diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt index 0cc9a7c..bc098a2 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt @@ -34,6 +34,7 @@ class AuthFaceActivity : BaseActivity() { setTitleBar("实名认证") { if (isSupp == true) {//个人中心进来 setResult(RESULT_OK) + finish() } else { ActivityUtils.startActivity(mContext, HomeActivity::class.java) } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt index ac46901..3bc0ae5 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt @@ -124,10 +124,10 @@ class EditQualificationActivity : BaseActivity qualificationCertificateEffectiveEnd = binding.tvDate.text.toString() -// if (qualificationCertificateEffectiveEnd.isNullOrEmpty()) { -// showToast("请完善信息") -// return@run -// } + if (qualificationCertificatePhotoUrl .isNullOrEmpty()) { + showToast("请完善信息") + return@run + } DataManager.getInstance().reUpDriverQualificationCertificate(upQuaInfo) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt index c97f6a1..d4d5e88 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt @@ -2,9 +2,11 @@ package com.arpa.hndahesudintocctmsdriver.ui.home import android.Manifest import android.graphics.Color +import android.os.Build import android.os.Bundle import android.view.View import android.widget.LinearLayout +import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.arpa.hndahesudintocctmsdriver.R @@ -201,9 +203,9 @@ class HomeFragment : BaseFragment(), RefreshCallBack { }) ) - //获取当前位置 - getLocation() + getLocation() + ALProcess.verification(mContext) //证件过期判断+轨迹上传判断 DataManager.getInstance().getUserInfo() .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) @@ -329,9 +331,29 @@ class HomeFragment : BaseFragment(), RefreshCallBack { } private fun getLocation(){ - GDLocationUtils.instance.getLocation(mContext){ - if (it.errorCode == 0) { - binding.tvCity.text = it.city.substring(0,2) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //获取当前位置 + PermissionX.init(this) + .permissions( + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION, + ) + .request { allGranted, grantedList, deniedList -> + if (allGranted) { + getLocation() + } else { + Toast.makeText( + mContext, + "开启权限失败,请在应用设置-权限-定位-始终允许", + Toast.LENGTH_SHORT + ).show() + } + } + }else{ + GDLocationUtils.instance.getLocation(mContext){ + if (it.errorCode == 0) { + binding.tvCity.text = it.city.substring(0,2) + } } } }