feat: new icons for 国际出港

.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": []

.tool-versions

@@ -0,0 +1 @@
+java 17.0.16+8-amzn

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,
                         "出港运抵"
                     )
                 )

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
     }

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

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

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<GncCunFangBean>
+            val list = pageModel.rv?.commonAdapter()?.items as? List<GncCunFangBean> ?: 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")

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<GoodsTransportBean>
+            val list = pageModel.rv?.commonAdapter()?.items as? List<GoodsTransportBean> ?: 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")