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

feat: ui opt

Browse Source
This commit is contained in:
杨建宽
2025-12-05 11:54:49 +08:00
parent c0c19c8453
commit e1e16fbd9e
3 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt
View File

@@ -360,12 +360,14 @@ class HomeFragment : Fragment() {
} }
// 组装分配 // 组装分配
Constant.AuthName.GjcAssembleAllocateActivity -> { Constant.AuthName.GjcAssembleAllocateActivity -> {
ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_GJC_ASSEMBLE_ALLOCATE) ARouter.getInstance()
.build(ARouterConstants.ACTIVITY_URL_GJC_ASSEMBLE_ALLOCATE)
.navigation() .navigation()
} }
// 出库交接 // 出库交接
Constant.AuthName.GjcIntExpOutHandover -> { Constant.AuthName.GjcIntExpOutHandover -> {
ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_EXP_OUT_HANDOVER) ARouter.getInstance()
.build(ARouterConstants.ACTIVITY_URL_INT_EXP_OUT_HANDOVER)
.navigation() .navigation()
} }
// 出港运抵 // 出港运抵
@@ -655,6 +657,22 @@ class HomeFragment : Fragment() {
) )
) )
list.add(
RightMenu(
Constant.AuthName.GjcQueryListActivity,
R.mipmap.gjc_query_icon,
"出港查询"
)
)
list.add(
RightMenu(
Constant.AuthName.GjcYiKuListActivity,
R.mipmap.gjc_yi_ku_icon,
"出港移库"
)
)
list.add( list.add(
RightMenu( RightMenu(
Constant.AuthName.GjcAssembleAllocateActivity, Constant.AuthName.GjcAssembleAllocateActivity,
@@ -687,21 +705,6 @@ class HomeFragment : Fragment() {
// ) // )
// ) // )
list.add(
RightMenu(
Constant.AuthName.GjcYiKuListActivity,
R.mipmap.gjc_yi_ku_icon,
"出港移库"
)
)
list.add(
RightMenu(
Constant.AuthName.GjcQueryListActivity,
R.mipmap.gjc_query_icon,
"出港查询"
)
)
// list.add( // list.add(
// RightMenu( // RightMenu(

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

@@ -79,10 +79,12 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="1"> android:layout_weight="1">
<ImageView <ImageView
style="@style/iv_search_action" android:layout_width="36dp"
android:layout_height="36dp"
android:onClick="@{()-> viewModel.searchClick()}" android:onClick="@{()-> viewModel.searchClick()}"
android:src="@drawable/img_search" /> android:src="@drawable/img_search" />
@@ -112,7 +114,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@color/color_bottom_layout" android:background="@color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingHorizontal="15dp"> android:paddingHorizontal="15dp">
@@ -127,7 +129,7 @@
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/white" android:textColor="@color/c666666"
android:textSize="16sp" /> android:textSize="16sp" />
<ImageView <ImageView
@@ -152,7 +154,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text='@{"合计："+viewModel.totalCount+"票"}' android:text='@{"合计："+viewModel.totalCount+"票"}'
android:textColor="@color/white" android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
tools:text="合计：1票" /> tools:text="合计：1票" />
@@ -162,7 +164,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text='@{"总件数："+viewModel.totalPc}' android:text='@{"总件数："+viewModel.totalPc}'
android:textColor="@color/white" android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
tools:text="总件数：100" /> tools:text="总件数：100" />
@@ -172,7 +174,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text='@{"总重量："+viewModel.totalWeight}' android:text='@{"总重量："+viewModel.totalWeight}'
android:textColor="@color/white" android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
tools:text="总重量：100" /> tools:text="总重量：100" />

13
module_gjc/src/main/res/layout/activity_int_exp_move.xml
View File

@@ -92,7 +92,8 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
style="@style/iv_search_action" android:layout_width="36dp"
android:layout_height="36dp"
android:onClick="@{()-> viewModel.searchClick()}" android:onClick="@{()-> viewModel.searchClick()}"
android:src="@drawable/img_search" /> android:src="@drawable/img_search" />
</LinearLayout> </LinearLayout>
@@ -121,7 +122,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@color/color_bottom_layout" android:background="@color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingHorizontal="15dp"> android:paddingHorizontal="15dp">
@@ -132,7 +133,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="@{()-> viewModel.toggleSelectAll()}" android:onClick="@{()-> viewModel.toggleSelectAll()}"
android:text="全选" android:text="全选"
android:textColor="@color/white" android:textColor="@color/c666666"
android:textSize="16sp" /> android:textSize="16sp" />
<!-- 统计信息 --> <!-- 统计信息 -->
@@ -148,7 +149,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text='@{"合计："+viewModel.totalCount+"票"}' android:text='@{"合计："+viewModel.totalCount+"票"}'
android:textColor="@color/white" android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -157,7 +158,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text='@{"总件数："+viewModel.totalPieces}' android:text='@{"总件数："+viewModel.totalPieces}'
android:textColor="@color/white" android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -166,7 +167,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text='@{"总重量："+viewModel.totalWeight}' android:text='@{"总重量："+viewModel.totalWeight}'
android:textColor="@color/white" android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>