From 42f7839927747551a3192381c9d1f3f578939ddd Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期一, 06 七月 2026 15:44:00 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/fangxinxing/xxfxx/ui/main/TripActivity.kt | 3 ++-
app/src/main/java/com/fangxinxing/xxfxx/extension/StringExtension.kt | 4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/fangxinxing/xxfxx/extension/StringExtension.kt b/app/src/main/java/com/fangxinxing/xxfxx/extension/StringExtension.kt
index 5aed7d0..cb28bb9 100644
--- a/app/src/main/java/com/fangxinxing/xxfxx/extension/StringExtension.kt
+++ b/app/src/main/java/com/fangxinxing/xxfxx/extension/StringExtension.kt
@@ -3,6 +3,10 @@
import android.icu.util.Calendar
import java.text.SimpleDateFormat
+fun String?.ifEmptyOrNull(blob: () -> String): String {
+ return if (isNullOrEmpty()) blob.invoke() else this
+}
+
//扩展函数 日期字符串更改显示模板
fun String.extDateChangeFormat(oldFormat: String, newFormat: String): String {
return try {
diff --git a/app/src/main/java/com/fangxinxing/xxfxx/ui/main/TripActivity.kt b/app/src/main/java/com/fangxinxing/xxfxx/ui/main/TripActivity.kt
index b52ca9c..d3b6405 100644
--- a/app/src/main/java/com/fangxinxing/xxfxx/ui/main/TripActivity.kt
+++ b/app/src/main/java/com/fangxinxing/xxfxx/ui/main/TripActivity.kt
@@ -29,6 +29,7 @@
import com.fangxinxing.xxfxx.bean.OrderBean
import com.fangxinxing.xxfxx.bean.OrderSimpleData
import com.fangxinxing.xxfxx.bean.PassengersLocationInfo
+import com.fangxinxing.xxfxx.extension.ifEmptyOrNull
import com.fangxinxing.xxfxx.netUtls.Api
import com.fangxinxing.xxfxx.netUtls.callNet
import com.fangxinxing.xxfxx.netUtls.createView
@@ -238,7 +239,7 @@
iv_police.clickDelay {
orderBean.let {
- MyUtils.getInstans().CallPhone(this, it.data.emergencyCall)
+ MyUtils.getInstans().CallPhone(this, it.data.emergencyCall.ifEmptyOrNull { "110" })
}
}
iv_to_gd.clickDelay {
--
Gitblit v1.7.1