修复问题

Author: fastcode555

.github/workflows/build.yml

@@ -49,8 +49,8 @@ jobs:
           tag_name: v${{ env.version_name }}
           release_name: v${{ env.version_name }}
           body: |
-            新版功能生成dart model
-            1.add the plugin.translationKey=trn,after generate the translation will end width 'trn'
+            r.dart文件生成优化，如果已经有定义了另外的名字了，保持这个名字，而不再自动生成新的名字
+            r.dart file generation optimization, if another name has been defined, retain this name instead of automatically generating a new name
 
       - name: Upload Release Asset
         id: upload-release-asset

.idea/JsonBeanGenerator.iml

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'org.example'
-version '1.9.0-SNAPSHOT'
+version '1.9.1-SNAPSHOT'
 
 
 repositories {

.idea/modules.xml

@@ -20,7 +20,14 @@ class FlutterAssetGenerator(
     private val targetDir: String?
 ) :
     BaseAssetGenerator(mDirectory, ignoreDirs, targetDir) {
+
+    // 存储已定义的资源映射关系
+    private val existingAssetMap = mutableMapOf<String, String>()
+
     override fun generate() {
+        // 读取现有的资源定义
+        loadExistingAssets()
+        
         val builder = StringBuilder()
         val basePath = mDirectory.basePath()
         val isChildProject = basePath != mDirectory.project.basePath
@@ -81,17 +88,21 @@ class FlutterAssetGenerator(
 
         mDirectory.files.map {
             val assetName = it.virtualFile.name
+            val assetPath = "$currentDirVariableName${File.separator}$assetName"
+            
             if (isFont(it)) {
                 builder.append(
                     "  static const String ${
                         it.virtualFile.nameWithoutExtension.clearSymbol().toCamel()
                     } = '${it.virtualFile.nameWithoutExtension}';\n"
                 )
             } else {
+                // 使用已存在的名称或生成新的名称
+                val variableName = existingAssetMap[assetPath] 
+                    ?: it.virtualFile.nameWithoutExtension.clearSymbol().toCamel()
+                
                 builder.append(
-                    "  static const String ${
-                        it.virtualFile.nameWithoutExtension.clearSymbol().toCamel()
-                    } = '$currentDirVariableName${File.separator}$assetName';\n"
+                    "  static const String $variableName = '$assetPath';\n"
                 )
             }
         }
@@ -113,4 +124,30 @@ class FlutterAssetGenerator(
     private fun isContainFile(mDirectory: PsiDirectory): Boolean {
         return mDirectory.files.isNotEmpty() || mDirectory.subdirectories.isNotEmpty()
     }
+
+    private fun loadExistingAssets() {
+        val rDartFile = File(getRDartFilePath())
+        if (!rDartFile.exists()) return
+
+        // 匹配资源定义语句
+        val pattern = "static const String ([a-zA-Z0-9_]+) = '(.*?)'"
+        val regex = Regex(pattern)
+        
+        rDartFile.readText().lines().forEach { line ->
+            regex.find(line)?.let { result ->
+                val name = result.groupValues[1]
+                val path = result.groupValues[2]
+                existingAssetMap[path] = name
+            }
+        }
+    }
+
+    private fun getRDartFilePath(): String {
+        val newTargetDir = if (!targetDir.isNullOrEmpty()) {
+            targetDir 
+        } else {
+            "${File.separator}lib${File.separator}res"
+        }
+        return "${mDirectory.parent?.virtualFile?.path}$newTargetDir${File.separator}r.dart"
+    }
 }