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

style: 国际出港/进港小弹窗统一宽度及取消确定按钮

Browse Source 
表单式小弹窗统一为480dp宽，底部按钮统一取消/确定；
分配人员弹窗去掉航班行、分配人下拉改为铺满。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
杨建宽
2026-06-20 12:44:54 +08:00
parent 3fedef27a7
commit 128b7c3e4e
17 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
module_gjc/src/main/res/layout/dialog_gjc_assemble_allocate.xml
View File

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="500dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_radius_10" android:background="@drawable/bg_dialog_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -28,33 +28,26 @@
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
<!-- 航班信息显示 -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp"
android:text='@{"航班：" + model.flightInfo}'
android:textColor="@color/text_normal"
android:textSize="16sp"
android:textStyle="bold" />
<!-- 分配人下拉选择 --> <!-- 分配人下拉选择 -->
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginHorizontal="30dp"
android:gravity="center_vertical"> android:layout_marginTop="30dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="分配人：" android:text="分配人："
android:textColor="@color/text_normal"
android:textSize="16sp" /> android:textSize="16sp" />
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="240dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
type="@{SearchLayoutType.SPINNER}" type="@{SearchLayoutType.SPINNER}"
list="@{model.assembleCompanyList}" list="@{model.assembleCompanyList}"
value="@={model.allocator}" /> value="@={model.allocator}" />

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onConfirmClick()}" android:onClick="@{()->model.onConfirmClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onConfirmClick()}" android:onClick="@{()->model.onConfirmClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -78,7 +78,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onConfirmClick()}" android:onClick="@{()->model.onConfirmClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

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

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

4
module_gjj/src/main/res/layout/dialog_int_arr_manifest_delete.xml
View File

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onConfirmClick()}" android:onClick="@{()->model.onConfirmClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

4
module_gjj/src/main/res/layout/dialog_int_imp_in_storage.xml
View File

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

4
module_gjj/src/main/res/layout/dialog_int_imp_modify_storage.xml
View File

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

4
module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml
View File

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -78,7 +78,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

4
module_gjj/src/main/res/layout/dialog_int_imp_tally_delete.xml
View File

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onConfirmClick()}" android:onClick="@{()->model.onConfirmClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>

4
module_gjj/src/main/res/layout/dialog_int_imp_tally_reset.xml
View File

@@ -11,7 +11,7 @@
</data> </data>
<LinearLayout <LinearLayout
android:layout_width="600dp" android:layout_width="480dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_f2_radius_10" android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:onClick="@{()->model.onSaveClick()}" android:onClick="@{()->model.onSaveClick()}"
android:text="保存" /> android:text="确定" />
</LinearLayout> </LinearLayout>