eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: opt ui

Browse Source
This commit is contained in:
杨建宽
2025-12-15 15:59:12 +08:00
parent 0531f5e0c4
commit 7650a835f2
9 changed files with 165 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module_gjc/src/main/res/layout/activity_gjc_assemble_allocate.xml
View File

@@ -162,26 +162,6 @@
android:textStyle="bold"
tools:text="合计：1票" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总件数："+viewModel.totalPc}'
android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="16sp"
android:textStyle="bold"
tools:text="总件数：100" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总重量："+viewModel.totalWeight}'
android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="16sp"
android:textStyle="bold"
tools:text="总重量：100" />
</LinearLayout>
<!-- 分配按钮 -->

14
module_gjc/src/main/res/layout/activity_gjc_handover.xml
View File

@@ -78,6 +78,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayAgentName}"
android:textColor="@color/color_33"
android:textSize="14sp" />
@@ -97,7 +98,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
tools:text="2025年12月20日"
android:text="@{viewModel.displayDeliveryDate}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -144,6 +145,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayFlightPlan}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -170,6 +172,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayAgentName}"
android:textColor="@color/color_33"
android:textSize="14sp" />
@@ -189,6 +192,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayWaybillNo}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -215,6 +219,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayPc}"
android:textColor="@color/color_33"
android:textSize="14sp" />
@@ -234,6 +239,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayWeight}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -260,7 +266,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{String.valueOf(viewModel.dataBean.chargeWeight != null ? viewModel.dataBean.chargeWeight : 0.0d)}"
android:text="@{viewModel.displayChargeWeight}"
android:textColor="@color/color_33"
android:textSize="14sp" />
@@ -280,6 +286,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayVolume}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -306,6 +313,7 @@
android:layout_weight="5"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayGoods}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -332,6 +340,7 @@
android:layout_weight="5"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayRemark}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -477,6 +486,7 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayAgentName}"
android:textColor="@color/color_33"
android:textSize="14sp" />

2
module_gjc/src/main/res/layout/activity_gjc_query.xml
View File

@@ -104,7 +104,7 @@
android:layout_height="36dp"
android:layout_marginLeft="16dp"
android:onClick="@{()-> viewModel.filterClick()}"
android:padding="2dp"
android:padding="5dp"
android:src="@drawable/img_filter" />
</LinearLayout>

4
module_gjc/src/main/res/layout/fragment_gjc_query_waybill.xml
View File

@@ -54,7 +54,7 @@
title='@{"代理人"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{(String)viewModel.maWbData.get("agentName")}' />
value='@{(String)viewModel.maWbData.get("agentCode")}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
@@ -83,7 +83,7 @@
title='@{"运单件数"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.maWbData.get("pc") != null ? String.valueOf(viewModel.maWbData.get("pc")) : ``}' />
value='@{viewModel.maWbData.get("pc") != null ? String.valueOf((int)Math.round(((Double)viewModel.maWbData.get("pc")))) : ``}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"

18
module_gjc/src/main/res/layout/item_gjc_query.xml
View File

@@ -50,7 +50,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:layout_weight="1.1"
android:gravity="center_vertical">
<TextView
@@ -114,7 +114,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_weight="1.2"
android:gravity="center_vertical">
<TextView
@@ -135,7 +135,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.3"
android:layout_weight="1.2"
android:gravity="center_vertical">
<TextView
@@ -147,7 +147,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{bean.opDate != null ? bean.opDate.toString() : ""}'
android:text='@{bean.opDate ?? ""}'
tools:text="2024-05-13 17:10:22" />
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -164,7 +164,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:layout_weight="1.1"
android:gravity="center_vertical">
<TextView
@@ -206,7 +206,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.7"
android:layout_weight="0.8"
android:gravity="center_vertical">
<TextView
@@ -227,7 +227,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.1"
android:layout_weight="1.2"
android:gravity="center_vertical">
<TextView
@@ -248,7 +248,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.3"
android:layout_weight="1.2"
android:gravity="center_vertical">
<TextView
@@ -260,7 +260,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{bean.fclose != null ? bean.fclose.toString() : ""}'
android:text='@{bean.fclose ?? ""}'
tools:text="2024-05-13 17:10:22" />
</androidx.appcompat.widget.LinearLayoutCompat>