Merge branch 'dev'

Author: longforus

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 
 
+## [v1.4.4](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2020-9-27)
+- Fix Bug: Import R File package name incorrect
+
 ## [v1.4.3](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2020-6-4)
 - Adapte Android studio 4.0
 

build.gradle

@@ -15,7 +15,7 @@ plugins {
     id 'org.jetbrains.intellij' version '0.4.2'
 }
 
-version '1.4.3'
+version '1.4.4'
 group 'com.longforus'
 
 apply plugin: 'java'
@@ -77,14 +77,15 @@ dependencies {
     testCompile fileTree(dir: "$StudioCompilePath/plugins/java/lib", include: ['*.jar'])
     testCompile fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
 //    compile "com.jetbrains.intellij.java:java-psi:192.7142.36"
-    compileOnly "com.android.tools.build:gradle:3.6.1"
+//    compileOnly "com.android.tools.build:gradle:3.6.1"
+    compileOnly "com.android.tools.build:gradle:4.0.1"
 //    compileOnly "com.jetbrains.intellij.java:java:192.7142.36"
     //    compile 'com.squareup:javapoet:1.11.0'
     //    testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
 patchPluginXml {
-    changeNotes """<h3>Adapte Android studio 4.0.</h3>
+    changeNotes """<h3>Fix Bug: Import R File package name incorrect</h3>
 <br/>
 <a href="https://github.com/longforus/MvpAutoCodePlus/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>"""
 }

src/main/java/com/longforus/mvpautocodeplus/ui/ConfigForm.java

@@ -44,7 +44,6 @@ public class ConfigForm {
     public JRadioButton mCurrentProjectRadioButton;
 
     private void createUIComponents() {
-        // TODO: place custom component creation code here
     }
 
     {

src/main/kotlin/com/longforus/mvpautocodeplus/MainAction.kt

@@ -15,7 +15,10 @@ import com.intellij.util.PlatformIcons
 import com.longforus.mvpautocodeplus.config.ItemConfigBean
 import com.longforus.mvpautocodeplus.maker.*
 import com.longforus.mvpautocodeplus.ui.EnterKeywordDialog
+import org.jetbrains.android.dom.manifest.Manifest
 import org.jetbrains.android.facet.AndroidFacet
+import org.jetbrains.android.facet.AndroidRootUtil
+import org.jetbrains.android.util.AndroidUtils
 import org.jetbrains.kotlin.psi.KtFile
 import com.intellij.openapi.application.runWriteAction as runWriteAction1
 
@@ -25,14 +28,18 @@ import com.intellij.openapi.application.runWriteAction as runWriteAction1
  * Description :
  */
 
-class MainAction : AnAction("Generate MVP Code", "auto make mvp code", PlatformIcons.CLASS_ICON), WriteActionAware {
+open class MainAction : AnAction("Generate MVP Code", "auto make mvp code", PlatformIcons.CLASS_ICON), WriteActionAware {
     var project: Project? = null
-    lateinit var mSelectedState: PropertiesComponent
-    fun createFile(enterName: String, templateName: String, dir: PsiDirectory, superImplName: String, contract: PsiFile? = null, fileName: String = enterName): Pair<PsiFile?,
+    private lateinit var mSelectedState: PropertiesComponent
+    var curAppPackage:String? = null
+
+    private fun createFile(enterName: String, templateName: String, dir: PsiDirectory, superImplName: String, contract: PsiFile? = null, fileName: String = enterName): Pair<PsiFile?,
         PsiClass?> {
         var clazz: PsiClass? = null
         val template = TemplateMaker.getTemplate(templateName, project!!) ?: return null to null
-        val liveTemplateDefaultValues = TemplateParamFactory.getParam4TemplateName(templateName, enterName, superImplName, contract, mSelectedState)
+        val liveTemplateDefaultValues = TemplateParamFactory.getParam4TemplateName(templateName, enterName, superImplName, contract, mSelectedState).toMutableMap().also {
+            it["CUR_APP_PACKAGE"] = curAppPackage
+        }
         val psiFile = createFileFromTemplate(fileName, template, dir, null, false, liveTemplateDefaultValues, mSelectedState.getValue(COMMENT_AUTHOR))
         if (!templateName.contains("Contract")) {
             val openFile = FileEditorManager.getInstance(project!!).openFile(psiFile!!.virtualFile, false)
@@ -77,6 +84,13 @@ class MainAction : AnAction("Generate MVP Code", "auto make mvp code", PlatformI
             mSelectedState = it.state
             val module = ModuleUtil.findModuleForFile(dir.virtualFile, project!!)
             val facet = AndroidFacet.getInstance(module!!)
+            if (facet != null) {
+                AndroidRootUtil.getManifestFileForCompiler(facet)?.let {
+                    AndroidUtils.loadDomElement(facet.module, it, Manifest::class.java)?.let {
+                        curAppPackage = it.getPackage()?.value
+                    }
+                }
+            }
             runWriteAction1 {
                 if (it.isJava) {
                     doJavaCreate(it, dir, facet)
@@ -138,7 +152,7 @@ class MainAction : AnAction("Generate MVP Code", "auto make mvp code", PlatformI
     }
 
 
-    fun getSubDir(dir: PsiDirectory, dirName: String): PsiDirectory {
+    private fun getSubDir(dir: PsiDirectory, dirName: String): PsiDirectory {
         return if (dir.name == CONTRACT) {
             if (dirName == CONTRACT) {
                 dir
@@ -162,7 +176,7 @@ class MainAction : AnAction("Generate MVP Code", "auto make mvp code", PlatformI
         presentation.isEnabled = enabled
     }
 
-    protected fun isAvailable(dataContext: DataContext): Boolean {
+    private fun isAvailable(dataContext: DataContext): Boolean {
         val project = CommonDataKeys.PROJECT.getData(dataContext)
         val view = LangDataKeys.IDE_VIEW.getData(dataContext)
         return project != null && view != null && view.directories.isNotEmpty()

src/main/kotlin/com/longforus/mvpautocodeplus/TemplateCons.java

@@ -27,14 +27,13 @@ public interface TemplateCons {
             "    interface View : ${VN}${VG}{}\n" + "    interface ${P_OR_M} : ${PN}${PG}{}\n" + "}\n";
 
     String COMMON_IMPL_TP_CONTENT_JAVA =
-        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME};#end\n" + "\n" + "import ${CONTRACT};\n" + "import ${PACKAGE_NAME}.R;\n" + "#if (${IMPL} != \"\")import ${IMPL};#end\n" + "\n" + "\n" + "/**\n" +
+        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME};#end\n" + "\n" + "import ${CONTRACT};\n" + "import ${CUR_APP_PACKAGE}.R;\n" + "#if (${IMPL} != \"\")import ${IMPL};#end\n" + "\n" + "\n" + "/**\n" +
             " * @describe \n" + " * @author  ${USER}\n" + " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" +
             "public class ${NAME}${IMPL_TYPE} #if(${IMPL}!=\"\") extends ${IMPL}${VG}#end implements I${NAME}Contract.${TYPE} {\n" + "\n" + "}\n" + "\n";
 
-    //todo R文件的报名应该是清单里面的报名
 
     String COMMON_IMPL_TP_CONTENT_KOTLIN =
-        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME}#end\n" + "\n" + "import ${CONTRACT}\n" + "import ${PACKAGE_NAME}.R\n" + "#if (${IMPL} != \"\")import ${IMPL}#end\n" + "\n" + "/**\n" +
+        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME}#end\n" + "\n" + "import ${CONTRACT}\n" + "import ${CUR_APP_PACKAGE}.R\n" + "#if (${IMPL} != \"\")import ${IMPL}#end\n" + "\n" + "/**\n" +
             " * @describe \n" + " * @author  ${USER}\n" + " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" +
             "class ${NAME}${IMPL_TYPE} :#if (${IMPL_NP} != \"\") ${IMPL_NP}${VG}(),#end ${CONTRACT_NP}.${TYPE} {\n" + "\n" + "}\n" + "\n";
 }

src/main/kotlin/com/longforus/mvpautocodeplus/maker/LayoutCreator.kt

@@ -21,6 +21,10 @@ import org.jetbrains.android.util.AndroidUtils
  * @author  longforus
  * @date 2020/3/18  16:07
  */
+
+
+
+
 @Throws(Exception::class)
 fun doCreateLayoutFile(ic: ItemConfigBean,element: PsiClass?, project: Project, facet: AndroidFacet, isJava: Boolean,isActivity:Boolean = true): PsiElement? {
     return if (element == null) {
@@ -67,9 +71,9 @@ fun createLayoutFileForActivityOrFragment(ic: ItemConfigBean,facet: AndroidFacet
                 layoutFileOriginName, resDirectory.findSubdirectory("layout")!!,
                 rootLayoutName,
                 ResourceFolderType.LAYOUT.getName(), false)
-
+            //生成布局返回代码,暂时无法解决kotlin代码编辑的问题
 //            val layoutFileName = layoutFile?.name
-//            val onCreateMethods = activityClass.findMethodsByName("getLayoutId", false)//todo 生成viewBinding
+//            val onCreateMethods = activityClass.findMethodsByName("getLayoutId", false)//viewBinding点不好用
 //            if (onCreateMethods.size != 1) {
 //                return
 //            }