修复模板合并无法使用占位符, 完善文件模板

Author: dengzii

resources/fileTemplates/Template Application.java.ft

@@ -1,6 +1,7 @@
-package ${PACKAGE_NAME}.${FEATURE_NAME}.${MODULE_NAME};
+package ${PACKAGE_NAME};
 
-public class ${APPLICATION_NAME} extends BaseApplication{
+#parse("File Header.java")
+public class ${APPLICATION_NAME}App extends BaseApplication{
 
     public void onCreate(){
 

resources/fileTemplates/Template AucApiClass.java.ft

@@ -0,0 +1,8 @@
+package ${PACKAGE_NAME};
+
+import com.blankj.utilcode.util.ApiUtils;
+
+#parse("File Header.java")
+public abstract class ${FEATURE_NAME}Api extends ApiUtils.BaseApi {
+
+}

resources/fileTemplates/Template AucApiImplClass.java.ft

@@ -0,0 +1,11 @@
+package ${PACKAGE_NAME};
+
+import ${PACKAGE_NAME}.export.${FEATURE_NAME}Api;
+import com.blankj.utilcode.util.ApiUtils;
+
+#parse("File Header.java")
+@ApiUtils.Api
+public class Feature1ApiImpl extends ${FEATURE_NAME}Api {
+
+
+}

resources/fileTemplates/Template MainActivity.java.ft

@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.annotation.Nullable;
 import android.os.Bundle;
 
+#parse("File Header.java")
 public class MainActivity extends AppCompatActivity {
 
         @Override

resources/fileTemplates/Template build.gradle.ft

@@ -1,3 +1,3 @@
-dependencies{
+dependencies {
 
 }

src/com/dengzii/plugin/template/model/FileTreeDsl.kt

@@ -58,20 +58,28 @@ class FileTreeDsl() : FileTreeNode() {
     fun FileTreeNode.include(other: FileTreeNode, override: Boolean = false) {
         if (!isDir) return
         other.children.forEach {
-            val clone = it.clone()
+            val includeChild = it.clone()
             if (other.placeholders != null) {
-                if (clone.placeholders == null) {
-                    clone.placeholders = mutableMapOf()
+                if (includeChild.placeholders == null) {
+                    includeChild.placeholders = mutableMapOf()
+                }
+                other.placeholders?.forEach { k, v ->
+                    if (getFileTemplateInherit()?.containsKey(k) != true) {
+                        includeChild.placeholders?.put(k, v)
+                    }
                 }
-                clone.placeholders?.putAll(other.placeholders!!)
             }
             if (other.fileTemplates != null) {
-                if (clone.fileTemplates == null) {
-                    clone.fileTemplates = mutableMapOf()
+                if (includeChild.fileTemplates == null) {
+                    includeChild.fileTemplates = mutableMapOf()
+                }
+                other.fileTemplates?.forEach { k, v ->
+                    if (fileTemplates?.containsKey(k) != true) {
+                        includeChild.fileTemplates?.put(k, v)
+                    }
                 }
-                clone.fileTemplates?.putAll(other.fileTemplates!!)
             }
-            addChild(clone, override)
+            addChild(includeChild, override)
         }
     }
 

src/com/dengzii/plugin/template/model/FileTreeNode.kt

@@ -129,8 +129,12 @@ open class FileTreeNode() {
         return getRealName(this.name)
     }
 
-    fun getRealName(fileName: String = this.name): String {
-        return fileName.replacePlaceholder(getPlaceholderInherit(), !isDir)
+    private fun getRealName(fileName: String = this.name): String {
+        return if (isDir) {
+            fileName.replacePlaceholder(getPlaceholderInherit(), false).toLowerCase()
+        } else {
+            fileName.replacePlaceholder(getPlaceholderInherit(), true)
+        }
     }
 
     fun getFileTemplateInherit(): MutableMap<String, String>? {
@@ -368,7 +372,11 @@ open class FileTreeNode() {
                 }
             }
         })
-        str.append(getRealName()).append("\n")
+        str.append(getRealName())
+        if (isDir) {
+//            str.append("\tplaceholder: ").append(placeholders)
+        }
+        str.append("\n")
 
         if (!realChildren.isNullOrEmpty()) {
             head.push(when {

src/com/dengzii/plugin/template/template/AucTemplate.kt

@@ -15,17 +15,18 @@ object AucTemplate {
     private val aucFileTemplates: () -> MutableMap<String, String> = {
         mutableMapOf(
                 Pair("AndroidManifest.xml", "Template Manifest.xml"),
-                Pair("Application.java", "Template Application.java"),
                 Pair("build.gradle", "Template build.gradle"),
-                Pair("\${APPLICATION_NAME}.java", "Template Application.java")
+                Pair("MainActivity.java", "Template MainActivity.java"),
+                Pair("\${FEATURE_NAME}App.java", "Template Application.java"),
+                Pair("\${FEATURE_NAME}Api.java", "Template AucApiClass.java"),
+                Pair("\${FEATURE_NAME}ApiImpl.java", "Template AucApiImplClass.java")
         )
     }
 
     private val aucPlaceholders: () -> MutableMap<String, String> = {
         mutableMapOf(
-                Pair("PACKAGE_NAME", "com/example"),
-                Pair("FEATURE_NAME", "feature"),
-                Pair("APPLICATION_NAME", "App")
+                Pair("PACKAGE_NAME", "com.example"),
+                Pair("FEATURE_NAME", "Feature1")
         )
     }
 
@@ -113,9 +114,19 @@ object AucTemplate {
         addFileTemplates(aucFileTemplates())
         addPlaceholders(aucPlaceholders())
         dir("\${FEATURE_NAME}") {
-            include(APP)
-            include(PKG)
-            include(EXPORT)
+
+            include(APP {
+                placeholders?.remove("\${FEATURE_NAME}")
+                placeholders?.remove("\${PACKAGE_NAME}")
+            })
+            include(PKG {
+                placeholders?.remove("\${FEATURE_NAME}")
+                placeholders?.remove("\${PACKAGE_NAME}")
+            })
+            include(EXPORT {
+                placeholders?.remove("\${FEATURE_NAME}")
+                placeholders?.remove("\${PACKAGE_NAME}")
+            })
         }
     }
 }