新路交身份证号验证优化

app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/NewLJUtils.kt

@@ -436,17 +436,21 @@ class NewLJUtils private constructor() {
     fun confirmInvoice(ctx: Context, listener: OnGDResultListener) {
         val userInfo = SPUtils.instance.getUserInfo(ctx)
         if (userInfo == null){
+            ToastUtils.showToast(ctx, "账号未登录")
+            return
+        }
+        if (TextUtils.isEmpty(userInfo.idcard)){
             ToastUtils.showToast(ctx, "未查到身份证号码")
             return
         }
-        val idCardValidity = userInfo.idCardValidity
+        val idcard = userInfo.idcard
 
-        searchDriver(ctx, idCardValidity, object : OnGDDownloadResultListener {
+        searchDriver(ctx, idcard, object : OnGDDownloadResultListener {
             override fun onSuccess(var1: String) {
                 val invoiceBean: InvoiceBean = InvoiceBean().apply {
                     enterpriseCode=NewLJConstant.ENTER_PRISE_CODE
                     driverInvoiceCode = var1
-                    driverIdentification = idCardValidity
+                    driverIdentification = idcard
                 }
                 DataManager.getInstance().confirmInvoice(invoiceBean)
                     .subscribeOn(Schedulers.io())
@@ -521,11 +525,15 @@ class NewLJUtils private constructor() {
     fun startLocationService(act: AppCompatActivity) {
         val userInfo = SPUtils.instance.getUserInfo(act)
         if (userInfo == null){
+            ToastUtils.showToast(act, "账号未登录")
+            return
+        }
+        if (TextUtils.isEmpty(userInfo.idcard)){
             ToastUtils.showToast(act, "未查到身份证号码")
             return
         }
-        val idCardValidity = userInfo.idCardValidity
-        searchDriver(act, idCardValidity, object : OnGDDownloadResultListener {
+        val idcard = userInfo.idcard
+        searchDriver(act, idcard, object : OnGDDownloadResultListener {
             override fun onSuccess(var1: String) {
                 try {
                     //开启定位服务