From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/res/layout/item_package.xml | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/item_package.xml b/app/src/main/res/layout/item_package.xml
index 6748f7b..4559cbe 100644
--- a/app/src/main/res/layout/item_package.xml
+++ b/app/src/main/res/layout/item_package.xml
@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="12dp"
+ android:padding="2dp"
android:gravity="center_vertical">
<ImageView
@@ -13,11 +13,47 @@
android:src="@drawable/circle"/>
<TextView
- android:id="@+id/tv_package_info"
- android:layout_width="match_parent"
+ android:id="@+id/tv_package_id"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:visibility="gone"/>
+
+ <ImageView
+ android:id="@+id/iv_company_logo"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginEnd="6dp"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:textSize="16sp"
- android:textColor="#333333"/>
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/tv_company"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="12sp"
+ android:textColor="#333333"
+ android:textStyle="bold"/>
+
+ <TextView
+ android:id="@+id/tv_create_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="12sp"
+ android:textColor="#666666"
+ android:layout_marginTop="4dp"/>
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/tv_tracking_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="25sp"
+ android:textColor="#333333"
+ android:layout_marginStart="12dp"
+ android:textStyle="bold"/>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.9.3