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:18:11 +08:00
parent 6073010531
commit bcc4bada25
6 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module_base/src/main/res/drawable/bg_red_btn_bottom.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_red_radius_4" android:state_enabled="true" />
<item android:drawable="@drawable/bg_gray_radius_4" android:state_enabled="false" />
</selector>

7
module_base/src/main/res/drawable/bg_red_radius_4.xml
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android">
android:shape="rectangle">
<solid android:color="#EA0553" /> <solid android:color="#dc7771" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
</shape> </shape>

2
module_base/src/main/res/values/colors.xml
View File

@@ -39,4 +39,6 @@
<color name="line">#EEEEEE</color> <color name="line">#EEEEEE</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="bottom_tool_tips_text_color">#797979</color>
</resources> </resources>

7
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
View File

@@ -110,6 +110,13 @@ class IntExpArriveViewModel : BasePageViewModel() {
} }
} }
/**
* 删除申报
*/
fun deleteDeclareClick() {
}
/** /**
* 运抵申报 * 运抵申报
*/ */

67
module_gjc/src/main/res/layout/activity_int_exp_arrive.xml
View File

@@ -31,44 +31,44 @@
<!-- 航班日期 --> <!-- 航班日期 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请选择航班日期"}' hint='@{"请选择航班日期"}'
icon="@{@drawable/img_date}" icon="@{@drawable/img_date}"
type="@{SearchLayoutType.DATE}" type="@{SearchLayoutType.DATE}"
value="@={viewModel.flightDate}" /> value="@={viewModel.flightDate}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- 航班号 --> <!-- 航班号 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请输入航班号"}' hint='@{"请输入航班号"}'
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.flightNo}" /> value="@={viewModel.flightNo}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- 运单号 --> <!-- 运单号 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请输入运单号"}' hint='@{"请输入运单号"}'
icon="@{@drawable/scan_code}" icon="@{@drawable/scan_code}"
setOnIconClickListener="@{(v)-> viewModel.scanWaybill()}" setOnIconClickListener="@{(v)-> viewModel.scanWaybill()}"
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.waybillNo}" /> value="@={viewModel.waybillNo}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- 分单号 --> <!-- 分单号 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请输入分单号"}' hint='@{"请输入分单号"}'
icon="@{@drawable/scan_code}" icon="@{@drawable/scan_code}"
setOnIconClickListener="@{(v)-> viewModel.scanHaWb()}" setOnIconClickListener="@{(v)-> viewModel.scanHaWb()}"
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.hno}" /> value="@={viewModel.hno}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- 搜索按钮 --> <!-- 搜索按钮 -->
<LinearLayout <LinearLayout
@@ -79,7 +79,9 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
style="@style/iv_search_action" android:layout_width="36dp"
android:layout_height="36dp"
android:background="@null"
android:onClick="@{()-> viewModel.searchClick()}" android:onClick="@{()-> viewModel.searchClick()}"
android:src="@drawable/img_search" /> android:src="@drawable/img_search" />
@@ -98,11 +100,11 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv" android:id="@+id/rv"
itemLayoutId="@{viewModel.itemLayoutId}"
viewHolder="@{viewModel.itemViewHolder}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:overScrollMode="never" android:overScrollMode="never"
itemLayoutId="@{viewModel.itemLayoutId}"
viewHolder="@{viewModel.itemViewHolder}"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="3" tools:itemCount="3"
tools:listitem="@layout/item_int_exp_arrive" /> tools:listitem="@layout/item_int_exp_arrive" />
@@ -113,7 +115,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="@android:color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingHorizontal="15dp"> android:paddingHorizontal="15dp">
@@ -123,8 +125,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:onClick="@{()-> viewModel.checkAllClick()}"
android:onClick="@{()-> viewModel.checkAllClick()}"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/checkIcon" android:id="@+id/checkIcon"
@@ -137,7 +139,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/color_66"
android:textSize="18sp" /> android:textSize="18sp" />
</LinearLayout> </LinearLayout>
@@ -155,7 +157,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" />
@@ -164,7 +166,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="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -173,7 +175,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" />
@@ -187,13 +189,22 @@
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:layout_marginEnd="10dp" android:layout_marginEnd="15dp"
android:onClick="@{()-> viewModel.resetDeclareClick()}" android:onClick="@{()-> viewModel.resetDeclareClick()}"
android:text="状态重置" /> android:text="状态重置" />
<TextView <TextView
style="@style/tv_bottom_btn" style="@style/tv_bottom_btn"
android:background="#dc7771" android:layout_marginLeft="0dp"
android:layout_marginEnd="15dp"
android:onClick="@{()-> viewModel.deleteDeclareClick()}"
android:text="删除申报" />
<TextView
style="@style/tv_bottom_btn"
android:layout_marginLeft="0dp"
android:background="@drawable/bg_red_btn_bottom"
android:onClick="@{()-> viewModel.arriveReportClick()}" android:onClick="@{()-> viewModel.arriveReportClick()}"
android:text="运抵申报" /> android:text="运抵申报" />

53
module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml
View File

@@ -31,42 +31,42 @@
<!-- 航班日期 --> <!-- 航班日期 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请选择航班日期"}' hint='@{"请选择航班日期"}'
icon="@{@drawable/img_date}" icon="@{@drawable/img_date}"
type="@{SearchLayoutType.DATE}" type="@{SearchLayoutType.DATE}"
value="@={viewModel.flightDate}" /> value="@={viewModel.flightDate}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- 航班号 --> <!-- 航班号 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请输入航班号"}' hint='@{"请输入航班号"}'
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.flightNo}" /> value="@={viewModel.flightNo}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- 目的站 --> <!-- 目的站 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请输入目的站"}' hint='@{"请输入目的站"}'
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.fdest}" /> value="@={viewModel.fdest}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- ULD编号 --> <!-- ULD编号 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
hint='@{"请输入ULD编号"}' hint='@{"请输入ULD编号"}'
icon="@{@drawable/scan_code}" icon="@{@drawable/scan_code}"
setOnIconClickListener="@{(v)-> viewModel.scanUld()}" setOnIconClickListener="@{(v)-> viewModel.scanUld()}"
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.uldNo}" /> value="@={viewModel.uldNo}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<!-- 搜索按钮 --> <!-- 搜索按钮 -->
<LinearLayout <LinearLayout
@@ -77,7 +77,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" />
@@ -96,11 +97,11 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv" android:id="@+id/rv"
itemLayoutId="@{viewModel.itemLayoutId}"
viewHolder="@{viewModel.itemViewHolder}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:overScrollMode="never" android:overScrollMode="never"
itemLayoutId="@{viewModel.itemLayoutId}"
viewHolder="@{viewModel.itemViewHolder}"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="3" tools:itemCount="3"
tools:listitem="@layout/item_int_exp_out_handover" /> tools:listitem="@layout/item_int_exp_out_handover" />
@@ -111,7 +112,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="@android:color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingHorizontal="15dp"> android:paddingHorizontal="15dp">
@@ -121,8 +122,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:onClick="@{()-> viewModel.checkAllClick()}"
android:onClick="@{()-> viewModel.checkAllClick()}"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/checkIcon" android:id="@+id/checkIcon"
@@ -135,7 +136,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/color_66"
android:textSize="18sp" /> android:textSize="18sp" />
</LinearLayout> </LinearLayout>
@@ -153,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="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -162,7 +163,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="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -171,7 +172,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" />