From 7b2bc00afcfcdc59ea0964d7828503476c98c8b1 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Thu, 23 Jul 2026 10:47:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9D=83=E9=99=90=E8=BF=87=E6=BB=A4trim?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=EF=BC=8C=E4=BA=8B=E6=95=85=E7=AD=BE=E8=AF=81?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=B2=E8=B0=83=E6=95=B4=E4=B8=BAGNJ?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87=E5=9B=9E=E9=80=80=E7=9F=A2?= =?UTF-8?q?=E9=87=8F=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 首页菜单权限过滤增加 trim()，兜底后端下发权限串带首尾空格导致精确匹配失败 - 综合事故签证权限常量由 AppComprehensiveAccidentVisa 改为 AppGNJAccidentVisa - 国内出港分拨首页返回按钮图标由栅格图 img_back_action 回退为矢量图（新增 img_back_action_old.xml 备份） - .claude/settings.local.json 新增 sync-air-cargo 脚本执行权限 Co-Authored-By: Claude Opus 4.6 --- .claude/settings.local.json | 3 ++- .../com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt | 3 ++- .../java/com/lukouguoji/module_base/common/Constant.kt | 2 +- .../src/main/res/drawable/img_back_action_old.xml | 9 +++++++++ .../src/main/res/layout/activity_distribution_home.xml | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 module_base/src/main/res/drawable/img_back_action_old.xml diff --git a/.claude/settings.local.json b/.claude/settings.local.json index cafd4ff..7d4ef25 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -149,7 +149,8 @@ "Bash(sed -n '82,115p' module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt)", "Bash(sed -n '212,240p' module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt)", "mcp__plugin_claude-mem_mcp-search__search", - "Read(//Users/kid/.claude/**)" + "Read(//Users/kid/.claude/**)", + "Bash(bash /Users/kid/Development/Fusion/Projects/aerologic-app/.claude/skills/sync-air-cargo/scripts/sync.sh)" ], "deny": [], "ask": [] diff --git a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt index 8fa3bbc..f09c9d6 100644 --- a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt @@ -989,7 +989,8 @@ class HomeFragment : Fragment() { */ getAuthsObj()?.let { authsObj -> val authArr = authsObj.getJSONArray(id) - val authSet = authArr?.map { it.toString() }?.toSet() ?: emptySet() + // trim：兜底后端下发的权限串可能带首尾空格（如 "AppDomImpManiFest "），避免精确匹配失败 + val authSet = authArr?.map { it.toString().trim() }?.toSet() ?: emptySet() return list.filter { m -> authSet.contains(m.id) } } return list diff --git a/module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt b/module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt index ebde432..4344557 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt @@ -300,7 +300,7 @@ interface Constant { const val AccidentVisa = "AppAccidentVisa" //事故签证 // 事故签证 - const val ComprehensiveAccidentVisa = "AppComprehensiveAccidentVisa" + const val ComprehensiveAccidentVisa = "AppGNJAccidentVisa" // 单证交接 const val DocumentHandover = "AppDocHandoverLog" diff --git a/module_base/src/main/res/drawable/img_back_action_old.xml b/module_base/src/main/res/drawable/img_back_action_old.xml new file mode 100644 index 0000000..832441c --- /dev/null +++ b/module_base/src/main/res/drawable/img_back_action_old.xml @@ -0,0 +1,9 @@ + + + diff --git a/module_gnc/src/main/res/layout/activity_distribution_home.xml b/module_gnc/src/main/res/layout/activity_distribution_home.xml index 324990e..d62b77a 100644 --- a/module_gnc/src/main/res/layout/activity_distribution_home.xml +++ b/module_gnc/src/main/res/layout/activity_distribution_home.xml @@ -105,7 +105,7 @@ + android:src="@drawable/img_back_action_old" />