From fc4912aceee0faf888f15d00f51f843b04f348ff Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Sun, 28 Dec 2025 17:25:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20new=20icons=20for=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=87=BA=E6=B8=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/settings.local.json | 6 +++++- .tool-versions | 1 + .../aerologic/ui/fragment/HomeFragment.kt | 8 ++++---- build.gradle | 2 +- gradle.properties | 3 +++ .../drawable-xhdpi/img_gjc_chugang_diyun.png | Bin 0 -> 29360 bytes .../drawable-xhdpi/img_gjc_chugang_lihuo.png | Bin 0 -> 28651 bytes .../img_gjc_chugang_zhuangzai.png | Bin 0 -> 28079 bytes .../drawable-xhdpi/img_gjc_chuku_jiaojie.png | Bin 0 -> 28899 bytes .../gnj/page/yiku/edit/GnjYiKuEditActivity.kt | 1 + .../cunfang/list/PdaGncCunFangListViewModel.kt | 4 ++-- .../list/PdaGoodsTransportListViewModel.kt | 4 ++-- 12 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 .tool-versions create mode 100644 module_base/src/main/res/drawable-xhdpi/img_gjc_chugang_diyun.png create mode 100644 module_base/src/main/res/drawable-xhdpi/img_gjc_chugang_lihuo.png create mode 100644 module_base/src/main/res/drawable-xhdpi/img_gjc_chugang_zhuangzai.png create mode 100644 module_base/src/main/res/drawable-xhdpi/img_gjc_chuku_jiaojie.png diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 6e32389..a643f00 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -38,7 +38,11 @@ "Bash(xargs rm:*)", "Bash(git -C /Users/kid/Development/Fusion/Projects/aerologic-app stash)", "WebFetch(domain:api.apifox.cn)", - "Bash(sips:*)" + "Bash(sips:*)", + "Bash(vfox list:*)", + "Bash(vf list:*)", + "Bash(vfox use:*)", + "Bash(wait)" ], "deny": [], "ask": [] diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..3f33dca --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +java 17.0.16+8-amzn 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 f3db299..7462dcc 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 @@ -708,7 +708,7 @@ class HomeFragment : Fragment() { list.add( RightMenu( Constant.AuthName.GjcIntExpOutHandover, - com.lukouguoji.module_base.R.drawable.img_gjc_banxiangzuzhuang, + com.lukouguoji.module_base.R.drawable.img_gjc_chuku_jiaojie, "出库交接" ) ) @@ -716,7 +716,7 @@ class HomeFragment : Fragment() { list.add( RightMenu( Constant.AuthName.GjcIntExpLoad, - com.lukouguoji.module_base.R.drawable.img_gjc_banxiangzuzhuang, + com.lukouguoji.module_base.R.drawable.img_gjc_chugang_zhuangzai, "出港装载" ) ) @@ -724,7 +724,7 @@ class HomeFragment : Fragment() { list.add( RightMenu( Constant.AuthName.GjcIntExpTally, - com.lukouguoji.module_base.R.drawable.img_gjc_banxiangzuzhuang, + com.lukouguoji.module_base.R.drawable.img_gjc_chugang_lihuo, "出港理货" ) ) @@ -732,7 +732,7 @@ class HomeFragment : Fragment() { list.add( RightMenu( Constant.AuthName.GjcIntExpArrive, - com.lukouguoji.module_base.R.drawable.img_gjc_banxiangzuzhuang, + com.lukouguoji.module_base.R.drawable.img_gjc_chugang_diyun, "出港运抵" ) ) diff --git a/build.gradle b/build.gradle index 79822b3..fc3adfc 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:7.2.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle.properties b/gradle.properties index ac52990..89c22a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,9 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.java.home=/Users/kid/.version-fox/cache/java/v-17.0.16+8-amzn/java-17.0.16+8-amzn +kapt.use.worker.api=false +kapt.include.compile.classpath=false # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/module_base/src/main/res/drawable-xhdpi/img_gjc_chugang_diyun.png b/module_base/src/main/res/drawable-xhdpi/img_gjc_chugang_diyun.png new file mode 100644 index 0000000000000000000000000000000000000000..575851efcba2c69f93cc63f81b34ba60ffcb2554 GIT binary patch literal 29360 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 literal 0 HcmV?d00001 diff --git a/module_gnj/src/main/java/com/lukouguoji/gnj/page/yiku/edit/GnjYiKuEditActivity.kt b/module_gnj/src/main/java/com/lukouguoji/gnj/page/yiku/edit/GnjYiKuEditActivity.kt index 22c45c4..03dcc27 100644 --- a/module_gnj/src/main/java/com/lukouguoji/gnj/page/yiku/edit/GnjYiKuEditActivity.kt +++ b/module_gnj/src/main/java/com/lukouguoji/gnj/page/yiku/edit/GnjYiKuEditActivity.kt @@ -32,6 +32,7 @@ class GnjYiKuEditActivity : DetailsPageType.Add -> setBackArrow("国内进港移库新增") DetailsPageType.Modify -> setBackArrow("国内进港移库编辑") DetailsPageType.Details -> setBackArrow("国内进港移库详情") + null -> setBackArrow("国内进港移库") } binding.viewModel = viewModel diff --git a/module_p/src/main/java/com/sixin/module_p/ui/gnc/cunfang/list/PdaGncCunFangListViewModel.kt b/module_p/src/main/java/com/sixin/module_p/ui/gnc/cunfang/list/PdaGncCunFangListViewModel.kt index c0278ed..c596d17 100644 --- a/module_p/src/main/java/com/sixin/module_p/ui/gnc/cunfang/list/PdaGncCunFangListViewModel.kt +++ b/module_p/src/main/java/com/sixin/module_p/ui/gnc/cunfang/list/PdaGncCunFangListViewModel.kt @@ -129,9 +129,9 @@ class PdaGncCunFangListViewModel : BasePageViewModel(), IOnItemClickListener { fun findMatchInputCarNo(carNo: String){ if(carNo.length>=3){ - val list = pageModel.rv?.commonAdapter()?.items as List + val list = pageModel.rv?.commonAdapter()?.items as? List ?: return Log.i("TEST","findMatchInputCarNo ${list.size}") - for(i in list?.indices){ + for(i in list.indices){ list[i].carId.let { if(it.contains(carNo)){ Log.i("TEST","findMatchInputCarNo $i") diff --git a/module_p/src/main/java/com/sixin/module_p/ui/goods/transport/list/PdaGoodsTransportListViewModel.kt b/module_p/src/main/java/com/sixin/module_p/ui/goods/transport/list/PdaGoodsTransportListViewModel.kt index be51860..fc1b86d 100644 --- a/module_p/src/main/java/com/sixin/module_p/ui/goods/transport/list/PdaGoodsTransportListViewModel.kt +++ b/module_p/src/main/java/com/sixin/module_p/ui/goods/transport/list/PdaGoodsTransportListViewModel.kt @@ -110,9 +110,9 @@ class PdaGoodsTransportListViewModel : BasePageViewModel() { fun findMatchInputCarNo(carNo: String){ Log.i("TEST","findMatchInputCarNo $carNo") if(carNo.length>=3){ - val list = pageModel.rv?.commonAdapter()?.items as List + val list = pageModel.rv?.commonAdapter()?.items as? List ?: return Log.i("TEST","findMatchInputCarNo ${list.size}") - for(i in list?.indices){ + for(i in list.indices){ list[i].carId.let { if(it.contains(carNo)){ Log.i("TEST","findMatchInputCarNo $i")