diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcInspectionBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcInspectionBean.kt index 3ceafaf..9191791 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcInspectionBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcInspectionBean.kt @@ -2,6 +2,9 @@ package com.lukouguoji.module_base.bean import androidx.databinding.ObservableBoolean import com.lukouguoji.module_base.interfaces.ICheck +import com.lukouguoji.module_base.ktx.noNull +import dev.utils.DevFinal +import dev.utils.common.DateUtils /** * 国际出港收运检查数据Bean @@ -74,4 +77,32 @@ class GjcInspectionBean : ICheck { else -> "#9E9E9E" // 灰色-未审核 } } + + /** + * 预计起飞时间 - 仅时分格式 (HH:mm) + */ + val scheduledTackOffHM: String + get() { + return DateUtils.parseString( + scheduledTackOff, + DevFinal.TIME.yyyyMMddHHmmss_HYPHEN, + "HH:mm" + ).noNull(scheduledTackOff) + } + + /** + * 验证预计起飞时间是否为次日 + */ + fun verifyScheduledTackOffNextDay(): Boolean { + if (fdate.isEmpty() || scheduledTackOff.isEmpty()) { + return false + } + return try { + val calendarFDate = DateUtils.getCalendar(fdate, DevFinal.TIME.yyyyMMdd_HYPHEN) + val calendarTakeOff = DateUtils.getCalendar(scheduledTackOff, DevFinal.TIME.yyyyMMddHHmmss_HYPHEN) + DateUtils.getDay(calendarTakeOff) > DateUtils.getDay(calendarFDate) + } catch (e: Exception) { + false + } + } } diff --git a/module_gjc/src/main/res/layout/item_gjc_inspection.xml b/module_gjc/src/main/res/layout/item_gjc_inspection.xml index 097fe53..9cfe480 100644 --- a/module_gjc/src/main/res/layout/item_gjc_inspection.xml +++ b/module_gjc/src/main/res/layout/item_gjc_inspection.xml @@ -5,6 +5,8 @@ + + @@ -67,7 +69,7 @@ + +