From 072df758dbbe6231d5c118cefec6de8dbf14b379 Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Sun, 22 Mar 2026 16:04:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20opt=20=E8=BF=9B=E6=B8=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/settings.local.json | 4 +++- .vfox/sdks/java | 2 +- .../aerologic/page/log/list/LogQueryViewHolder.kt | 3 --- .../com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt | 7 ------- .../lukouguoji/gjj/dialog/IntImpQueryFilterDialogModel.kt | 4 ++-- .../com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt | 8 ++++---- .../src/main/res/layout/dialog_int_imp_query_filter.xml | 8 ++++---- module_gjj/src/main/res/layout/item_int_imp_query.xml | 4 ++-- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 28bff4f..5a4f348 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -100,7 +100,9 @@ "Bash(export JAVA_HOME=/Users/kid/.vfox/sdks/java)", "mcp__apifox__read_project_oas_kcl8s7", "mcp__apifox__refresh_project_oas_kcl8s7", - "mcp__apifox__read_project_oas_ref_resources_kcl8s7" + "mcp__apifox__read_project_oas_ref_resources_kcl8s7", + "mcp__apifox__read_project_oas_x3v6fh", + "mcp__apifox__read_project_oas_ref_resources_x3v6fh" ], "deny": [], "ask": [] diff --git a/.vfox/sdks/java b/.vfox/sdks/java index 66eae31..ee5ec11 120000 --- a/.vfox/sdks/java +++ b/.vfox/sdks/java @@ -1 +1 @@ -/Users/kid/.vfox/cache/java/v-17+35-amzn/java-17+35-amzn \ No newline at end of file +/Users/kid/.version-fox/cache/java/v-17+35-amzn/java-17+35-amzn \ No newline at end of file diff --git a/app/src/main/java/com/lukouguoji/aerologic/page/log/list/LogQueryViewHolder.kt b/app/src/main/java/com/lukouguoji/aerologic/page/log/list/LogQueryViewHolder.kt index 755413f..a4c1148 100644 --- a/app/src/main/java/com/lukouguoji/aerologic/page/log/list/LogQueryViewHolder.kt +++ b/app/src/main/java/com/lukouguoji/aerologic/page/log/list/LogQueryViewHolder.kt @@ -11,8 +11,5 @@ class LogQueryViewHolder(view: View) : BaseViewHolder { diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpQueryFilterDialogModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpQueryFilterDialogModel.kt index d627c64..fe40fed 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpQueryFilterDialogModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpQueryFilterDialogModel.kt @@ -22,7 +22,7 @@ class IntImpQueryFilterDialogModel( val spCode: MutableLiveData, val spCodeList: MutableLiveData>, val flightNo: MutableLiveData, - val dest: MutableLiveData, + val origin: MutableLiveData, val awbType: MutableLiveData, val businessType: MutableLiveData, val goodsCn: MutableLiveData, @@ -75,7 +75,7 @@ class IntImpQueryFilterDialogModel( fun onResetClick() { spCode.value = "" flightNo.value = "" - dest.value = "" + origin.value = "" awbType.value = "" businessType.value = "" goodsCn.value = "" diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt index 9c3616f..2b1be8c 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt @@ -62,7 +62,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { // ==================== 筛选条件 ==================== val spCode = MutableLiveData("") val flightNo = MutableLiveData("") - val dest = MutableLiveData("") + val origin = MutableLiveData("") val awbType = MutableLiveData("") val businessType = MutableLiveData("") val goodsCn = MutableLiveData("") @@ -84,7 +84,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { spCode = spCode, spCodeList = spCodeList, flightNo = flightNo, - dest = dest, + origin = origin, awbType = awbType, businessType = businessType, goodsCn = goodsCn, @@ -104,7 +104,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { "wbNo" to waybillNo.value!!.ifEmpty { null }, "spCode" to spCode.value!!.ifEmpty { null }, "fno" to flightNo.value!!.ifEmpty { null }, - "dest" to dest.value!!.ifEmpty { null }, + "origin" to origin.value!!.ifEmpty { null }, "awbType" to awbType.value!!.ifEmpty { null }, "businessType" to businessType.value!!.ifEmpty { null }, "goods" to goodsCn.value!!.ifEmpty { null } @@ -118,7 +118,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { "wbNo" to waybillNo.value!!.ifEmpty { null }, "spCode" to spCode.value!!.ifEmpty { null }, "fno" to flightNo.value!!.ifEmpty { null }, - "dest" to dest.value!!.ifEmpty { null }, + "origin" to origin.value!!.ifEmpty { null }, "awbType" to awbType.value!!.ifEmpty { null }, "businessType" to businessType.value!!.ifEmpty { null }, "goods" to goodsCn.value!!.ifEmpty { null } diff --git a/module_gjj/src/main/res/layout/dialog_int_imp_query_filter.xml b/module_gjj/src/main/res/layout/dialog_int_imp_query_filter.xml index 49ad912..999280a 100644 --- a/module_gjj/src/main/res/layout/dialog_int_imp_query_filter.xml +++ b/module_gjj/src/main/res/layout/dialog_int_imp_query_filter.xml @@ -63,13 +63,13 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" /> - + diff --git a/module_gjj/src/main/res/layout/item_int_imp_query.xml b/module_gjj/src/main/res/layout/item_int_imp_query.xml index a83324a..f6c6265 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_query.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_query.xml @@ -88,7 +88,7 @@ @@ -109,7 +109,7 @@