From 2be3cf52518ee4c00aa137a1c8a062ff0ce85ea8 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Mon, 8 Dec 2025 11:26:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=87=BA=E6=B8=AF=E8=AE=A1=E9=87=8D=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_base/bean/GjcWeighingBean.kt       | 32 ++++++++++++++
 .../src/main/res/layout/item_gjc_weighing.xml | 42 ++++++++++++-------
 2 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt
index 0510a7d..43934c4 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt
@@ -1,5 +1,9 @@
 package com.lukouguoji.module_base.bean
 
+import com.lukouguoji.module_base.ktx.noNull
+import dev.utils.DevFinal
+import dev.utils.common.DateUtils
+
 /**
  * 国际出港待计重-列表数据Bean
  * 对应API: IntExpCheckIn/pageQuery
@@ -91,4 +95,32 @@ class GjcWeighingBean {
     var haWbList: List<Any>? = null         // 分单列表
     var storageUseList: List<Any>? = null   // 库位使用列表
     var attachList: List<Any>? = null       // 附件列表
+
+    /**
+     * 预计起飞时间 - 仅时分格式 (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_weighing.xml b/module_gjc/src/main/res/layout/item_gjc_weighing.xml
index b1e6f4d..b90d9b0 100644
--- a/module_gjc/src/main/res/layout/item_gjc_weighing.xml
+++ b/module_gjc/src/main/res/layout/item_gjc_weighing.xml
@@ -4,6 +4,8 @@
 
     <data>
 
+        <import type="android.view.View" />
+
         <variable
             name="bean"
             type="com.lukouguoji.module_base.bean.GjcWeighingBean" />
@@ -30,8 +32,8 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_marginLeft="10dp"
+            android:layout_weight="1"
             android:orientation="vertical">
 
             <!-- 第一行数据 -->
@@ -47,9 +49,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{4}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{4}"
                         android:text="运单号：" />
 
                     <TextView
@@ -69,9 +71,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{4}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{4}"
                         android:text="代理人：" />
 
                     <TextView
@@ -90,9 +92,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{3}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
                         android:text="特码：" />
 
                     <TextView
@@ -111,9 +113,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{5}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{5}"
                         android:text="预配件数：" />
 
                     <TextView
@@ -132,9 +134,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{5}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{5}"
                         android:text="预配重量：" />
 
                     <TextView
@@ -161,9 +163,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{5}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{5}"
                         android:text="计划航班：" />
 
                     <TextView
@@ -182,9 +184,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{3}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
                         android:text="航程：" />
 
                     <TextView
@@ -203,17 +205,26 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{5}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{5}"
                         android:text="预计起飞：" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.scheduledTackOff}"
+                        android:text="@{bean.scheduledTackOffHM}"
                         tools:text="09:12" />
 
+                    <TextView
+                        android:id="@+id/tvDayPlus"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:text="+1"
+                        android:textColor="@color/text_red"
+                        android:visibility="@{bean.verifyScheduledTackOffNextDay() ? View.VISIBLE : View.GONE}" />
+
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <!-- 业务类型 -->
@@ -224,9 +235,9 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{5}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{5}"
                         android:text="业务类型：" />
 
                     <TextView
@@ -245,14 +256,17 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                        completeSpace="@{5}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{5}"
                         android:text="品名(中)：" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:maxLines="1"
                         android:text='@{bean.goodsCn}'
                         tools:text="电子元器件" />
 
@@ -267,8 +281,8 @@
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_gravity="center"
-            android:src="@drawable/img_pda_right"
-            android:layout_marginLeft="10dp" />
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/img_pda_right" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 </layout>