update plugin

(cherry picked from commit a5cdd91)

Author: xiaoqi

.idea/misc.xml

@@ -0,0 +1,58 @@
+buildscript {
+
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'org.aspectj:aspectjtools:1.8.13'
+    }
+}
+
+import org.aspectj.bridge.IMessage
+import org.aspectj.bridge.MessageHandler
+import org.aspectj.tools.ajc.Main
+
+final def log = project.logger
+final def variants = project.android.applicationVariants
+
+variants.all { variant ->
+
+    JavaCompile javaCompile = variant.javaCompile
+    javaCompile.doLast {
+        String[] args = ["-showWeaveInfo",
+                         "-1.5",
+                         "-inpath", javaCompile.destinationDir.toString(),
+                         "-aspectpath", javaCompile.classpath.asPath,
+                         "-d", javaCompile.destinationDir.toString(),
+                         "-classpath", javaCompile.classpath.asPath,
+                         "-bootclasspath", project.android.bootClasspath.join(File.pathSeparator)]
+        log.debug "ajc args: " + Arrays.toString(args)
+
+        MessageHandler handler = new MessageHandler(true);
+        new Main().run(args, handler);
+        for (IMessage message : handler.getMessages(null, true)) {
+            switch (message.getKind()) {
+                case IMessage.ABORT:
+                case IMessage.ERROR:
+                case IMessage.FAIL:
+                    log.error message.message, message.thrown
+                    break;
+                case IMessage.WARNING:
+                    log.warn message.message, message.thrown
+                    break;
+                case IMessage.INFO:
+                    log.info message.message, message.thrown
+                    break;
+                case IMessage.DEBUG:
+                    log.debug message.message, message.thrown
+                    break;
+            }
+        }
+    }
+}
+
+
+
+dependencies {
+    compile 'org.aspectj:aspectjrt:1.8.13'
+}

SavePlugin.gradle

@@ -20,6 +20,7 @@ buildscript {
         // in the individual module build.gradle files
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.noober.plugin:savehelper-plugin:1.0.0'
+        classpath 'org.aspectj:aspectjtools:1.8.13'
     }
 }
 
@@ -46,7 +47,7 @@ ext {
     userOrg = 'noober'
     groupId = 'com.noober'
     uploadName = 'AutoSaver'
-    publishVersion = '2.2.6'
+    publishVersion = '3.0.0'
     desc = "A light weight framework can automatically generate 'OnSaveInstanceState' code"
     website = 'https://github.com/JavaNoober/AutoSave'
 //    gradlew clean build bintrayUpload -PbintrayUser=xiaoqiandroid -PbintrayKey=xxxxxxxxxxxxxxxx -PdryRun=false

build.gradle

@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 #org.gradle.jvmargs=-Xmx1536m
 #org.gradle.jvmargs= -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005;
-org.gradle.jvmargs=-Xmx512m
+org.gradle.jvmargs=-Xmx4096m
 org.gradle.parallel=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle.properties

@@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
 apply plugin: 'myplugin'
 
-
 android {
     compileSdkVersion 26
     buildToolsVersion '26.0.2'
@@ -34,12 +33,12 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:26.0.1'
 //    testImplementation 'junit:junit:4.12'
-    implementation 'com.noober:savehelper:2.2.6'
-    kapt 'com.noober:processor:2.2.6'
-    implementation 'com.noober:savehelper-api:2.2.6'
-//    implementation project(':savehelper')
-//    implementation project(':savehelper-api')
-//    kapt project(':savehelper-processor')
+//    implementation 'com.noober:savehelper:2.2.6'
+//    kapt 'com.noober:processor:2.2.6'
+//    implementation 'com.noober:savehelper-api:2.2.6'
+    implementation project(':savehelper')
+    implementation project(':savehelper-api')
+    kapt project(':savehelper-processor')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 

sample/build.gradle

@@ -10,13 +10,15 @@
         <activity
             android:name=".SampleActivity"
             android:persistableMode="persistAcrossReboots">
+
+        </activity>
+        <activity android:name=".TestActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".TestActivity"></activity>
         <activity android:name=".KotlinActivity">
 
         </activity>

sample/src/main/AndroidManifest.xml

@@ -12,11 +12,11 @@
 public class BaseActivity extends AppCompatActivity {
 
 
-	@Override
-	protected void onRestoreInstanceState(Bundle savedInstanceState) {
-		super.onRestoreInstanceState(savedInstanceState);
-		SaveHelper.recover(this, savedInstanceState);
-	}
+//	@Override
+//	protected void onRestoreInstanceState(Bundle savedInstanceState) {
+//		super.onRestoreInstanceState(savedInstanceState);
+//		SaveHelper.recover(this, savedInstanceState);
+//	}
 
 	@Override
 	protected void onSaveInstanceState(Bundle outState) {

sample/src/main/java/com/recover/autosavesample/BaseActivity.java

@@ -24,10 +24,10 @@ class KotlinActivity : AppCompatActivity() {
     }
 
 
-    override fun onSaveInstanceState(outState: Bundle?) {
-        Log.e("KotlinActivity",  "onSaveInstanceState")
-        a = 2
-        SaveHelper.save(this,  outState)
-        super.onSaveInstanceState(outState)
-    }
+//    override fun onSaveInstanceState(outState: Bundle?) {
+//        Log.e("KotlinActivity",  "onSaveInstanceState")
+//        a = 2
+//        SaveHelper.save(this,  outState)
+//        super.onSaveInstanceState(outState)
+//    }
 }

sample/src/main/java/com/recover/autosavesample/KotlinActivity.kt

@@ -0,0 +1,43 @@
+//package com.recover.autosavesample;
+//
+//import android.util.Log;
+//
+//import org.aspectj.lang.ProceedingJoinPoint;
+//import org.aspectj.lang.annotation.Around;
+//import org.aspectj.lang.annotation.Aspect;
+//
+///**
+// * Created by xiaoqi on 2018/3/13
+// */
+//
+//@Aspect
+//public class SaveAspectj {
+//
+//	public static final String TAG = "Statistics";
+//
+////	@Around("execution(@com.noob.databurialpoint.Statistics * *(..)) && @annotation(statistics)")
+////	public void aroundJoinPoint(ProceedingJoinPoint joinPoint, Statistics statistics) throws Throwable {
+////		calculate(statistics);
+////		joinPoint.proceed();//执行原方法
+////	}
+////
+////	private void calculate(Statistics statistics){
+////		if(statistics != null){
+////			Log.e(TAG, "对" + statistics.function().getFunctionName() + "进行统计");
+////			// select * from FunctionsTable where operatorId=statistics.getFunctionId()
+////			//if(size > 0){
+////			// int counts = operateCounts ++
+////			// update FunctionsTable set operateCounts = counts
+////			// }else {
+////			// insert into FunctionsTable values (xxx, statistics.getFunctionId(), 1)
+////			// }
+////		}
+////	}
+//
+//	@Around("execution(* android.app.Activity.onCreate(..))")
+//	public void onClickLitener(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
+////        Log.e(TAG, "OnClick");
+//        Log.e(TAG, "OnClick");
+//        proceedingJoinPoint.proceed();
+//	}
+//}

sample/src/main/java/com/recover/autosavesample/SaveAspectj.java

@@ -8,6 +8,7 @@
 import android.widget.TextView;
 
 import com.noober.api.NeedSave;
+import com.noober.savehelper.SaveHelper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,7 +20,7 @@ public class TestActivity extends BaseActivity {
 	private Button button;
 	private final static String testContent = "This is a test code:";
 
-//	@NeedSave
+	@NeedSave
 	String testString = "11111111";
 
 	@NeedSave