update to 2.2.6

Author: xiaoqi

.idea/misc.xml

@@ -21,24 +21,24 @@
     2.0.4 修复枚举类型保存的时候不能识别的问题
 
     2.1.0 增加对PersistableBundle的支持,NeedSave注解中设置isPersistable = true则说明该参数保存到PersistableBundle
-
+    2.2.6 增加对自定义view的数据保存以及恢复
 
 引入方式,在app的gradle中加入下面依赖即可：
 
 
-    implementation 'com.noober:savehelper:2.1.0'
-    implementation 'com.noober:savehelper-api:2.1.0'
-    annotationProcessor 'com.noober:processor:2.1.0'
+    implementation 'com.noober:savehelper:2.2.6'
+    implementation 'com.noober:savehelper-api:2.2.6'
+    annotationProcessor 'com.noober:processor:2.2.6'
 
 kotlin的依赖方式
 
     apply plugin: 'kotlin-kapt'
     apply plugin: 'kotlin-android-extensions'
     apply plugin: 'kotlin-android'
 
-    implementation 'com.noober:savehelper:2.1.0'
-    kapt 'com.noober:processor:2.1.0'
-    implementation 'com.noober:savehelper-api:2.1.0'
+    implementation 'com.noober:savehelper:2.2.6'
+    kapt 'com.noober:processor:2.2.6'
+    implementation 'com.noober:savehelper-api:2.2.6'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
 混淆配置：
@@ -140,6 +140,43 @@ android 内存被回收是一个开发者的常见问题。当我们**跳转到
 
 这样就不会因为这种太多的重复的操作去导致代码逻辑的混乱,同时也避免了敲代码时因为key写错导致的错误。
 
+自定义view的变量保存示例：
+
+        public class CustomView extends View {
+        
+            @NeedSave
+            int a;
+        
+            public CustomView(Context context) {
+                super(context);
+            }
+        
+            public CustomView(Context context, @Nullable AttributeSet attrs) {
+                super(context, attrs);
+            }
+        
+        
+            public CustomView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+                super(context, attrs, defStyleAttr);
+            }
+        
+        
+            @Override
+            protected void dispatchSaveInstanceState(SparseArray<Parcelable> container) {
+                SaveHelper.save(this, container);
+                super.dispatchSaveInstanceState(container);
+            }
+        
+            @Override
+            protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
+                super.dispatchRestoreInstanceState(container);
+                SaveHelper.recover(this, container);
+            }
+        }
+
+
+重写dispatchSaveInstanceState，dispatchRestoreInstanceState即可。  
+注意SaveHelper.save(this, container)要在super.dispatchSaveInstanceState(container);**之前调用**
 # 效果展示
 我们来看一下测试代码：
 ## 不进行数据保存操作

.idea/modules.xml

@@ -26,6 +26,10 @@ allprojects {
             name 'Google'
         }
     }
+    tasks.withType(Javadoc) {
+        options.addStringOption('Xdoclint:none', '-quiet')
+        options.addStringOption('encoding', 'UTF-8')
+    }
 }
 
 task clean(type: Delete) {
@@ -37,7 +41,7 @@ ext {
     userOrg = 'noober'
     groupId = 'com.noober'
     uploadName = 'AutoSaver'
-    publishVersion = '2.1.1'
+    publishVersion = '2.2.6'
     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

README.md

@@ -10,7 +10,8 @@
 # Specifies the JVM arguments used for the daemon process.
 # 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= -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005;
+org.gradle.jvmargs=-Xmx512m
 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

build.gradle

@@ -31,10 +31,10 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation 'com.android.support:appcompat-v7:26.0.1'
-    testImplementation 'junit:junit:4.12'
-    implementation 'com.noober:savehelper:2.1.0'
-    kapt 'com.noober:processor:2.1.0'
-    implementation 'com.noober:savehelper-api:2.1.0'
+//    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')

gradle.properties

@@ -10,16 +10,16 @@
         <activity
             android:name=".SampleActivity"
             android:persistableMode="persistAcrossReboots">
-
-        </activity>
-        <activity android:name=".TestActivity"></activity>
-        <activity android:name=".KotlinActivity">
             <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>
     </application>
 
 </manifest>

sample/build.gradle

@@ -34,38 +34,15 @@ public CustomView(Context context, @Nullable AttributeSet attrs, int defStyleAtt
     }
 
 
-    @Nullable
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        Log.e("CustomView", "onSaveInstanceState");
-        return super.onSaveInstanceState();
-    }
-
     @Override
     protected void dispatchSaveInstanceState(SparseArray<Parcelable> container) {
-
         SaveHelper.save(this, container);
-        a = 2;
-
-        Bundle bundle = new Bundle();
-        bundle.putInt("A", a);
-        container.put(1, bundle);
         super.dispatchSaveInstanceState(container);
-        Log.e("CustomView", "dispatchSaveInstanceState");
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        super.onRestoreInstanceState(state);
-        Log.e("CustomView", "onRestoreInstanceState");
     }
 
     @Override
     protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
         super.dispatchRestoreInstanceState(container);
         SaveHelper.recover(this, container);
-        Bundle bundle = (Bundle) container.get(1);
-        a = bundle.getInt("A");
-        Log.e("CustomView", "dispatchRestoreInstanceState");
     }
 }

sample/src/main/AndroidManifest.xml

@@ -78,11 +78,13 @@ public class SampleActivity extends AppCompatActivity {
 //	SecondSExample2 secondSExample2;
 
 
+//    CustomView customView;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
+//        customView = findViewById(R.id.view);
 		initData();
         Log.e("Sample", i + "");
         if(savedInstanceState != null){

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
@@ -10,8 +9,9 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.recover.autosavesample.SampleActivity">
-<com.recover.autosavesample.CustomView
-    android:id="@+id/view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+
+    <com.recover.autosavesample.CustomView
+        android:id="@+id/view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </RelativeLayout>

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

@@ -4,7 +4,7 @@ apply plugin: 'bintray-release'
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.squareup:javapoet:1.8.0'
-    compile project(':savehelper-api')
+    implementation project(':savehelper-api')
 }
 
 sourceCompatibility = "1.7"

sample/src/main/res/layout/activity_main.xml

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'bintray-release'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion '26.0.2'
 
     defaultConfig {
@@ -28,10 +28,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    //    provided 'com.android.support:appcompat-v7:+'
+//    provided 'com.android.support:appcompat-v7:+'
     testImplementation 'junit:junit:4.12'
 }
 

savehelper-processor/build.gradle

@@ -15,6 +15,8 @@ public class SaveHelper {
 
 	private final static String HELPER_END = "_SaveStateHelper";
 
+    private final static int VIEW_STATE_KEY = -999;
+
 	/**
 	 * equate to{@link SaveHelper#recover}, it's just renamed to make it easier to understand
 	 */
@@ -24,7 +26,7 @@ public static <T> void bind(T recover, Bundle savedInstanceState){
 	}
 
 	/**
-	 * added while need to recover data, used in {@link android.app.Activity#onCreate(Bundle)}
+	 * added while need to recover data, used in {android.app.Activity#onCreate(Bundle)}
 	 *
 	 * @param recover current Activity or Fragment
 	 * @param savedInstanceState Bundle
@@ -34,7 +36,7 @@ public static <T> void recover(T recover, Bundle savedInstanceState){
 	}
 
     /**
-     * equate to{@link SaveHelper#recover(Object, Bundle)}, used in {@link android.app.Activity#onCreate(Bundle, PersistableBundle)}
+     * equate to{@link SaveHelper#recover(Object, Bundle)}, used in {android.app.Activity#onCreate(Bundle, PersistableBundle)}
      * added in 2.1.0
      *
      * @param recover current Activity or Fragment
@@ -50,7 +52,7 @@ public static <T> void recover(T recover, Bundle savedInstanceState, Persistable
     }
 
     /**
-     * added while need to save data, used in {@link android.app.Activity#onSaveInstanceState(Bundle)}
+     * added while need to save data, used in {android.app.Activity#onSaveInstanceState(Bundle)}
      *
      * @param save current Activity or Fragment
      * @param outState Bundle
@@ -60,7 +62,7 @@ public static <T> void save(T save, Bundle outState){
 	}
 
     /**
-     * equate to{@link SaveHelper#save(Object, Bundle)}, used in {@link android.app.Activity#onSaveInstanceState(Bundle, PersistableBundle)}
+     * equate to{@link SaveHelper#save(Object, Bundle)}, used in {android.app.Activity#onSaveInstanceState(Bundle, PersistableBundle)}
      * added in 2.1.0
      *
      * @param save current Activity or Fragment
@@ -84,9 +86,14 @@ public static <T> void save(T save, Bundle outState, PersistableBundle persisten
 	 */
 	public static <T> void save(T save, SparseArray<Parcelable> container){
         if(container != null){
-            ISaveViewStateHelper<T> viewSaveHelper = findViewSaveHelper(save);
-            if(viewSaveHelper != null){
-                viewSaveHelper.save(save, container);
+            ISaveInstanceStateHelper<T> viewStateHelper = findSaveHelper(save);
+            if(viewStateHelper != null){
+                Bundle bundle = (Bundle) container.get(VIEW_STATE_KEY);
+                if(bundle == null){
+                    bundle = new Bundle();
+                }
+                viewStateHelper.save(bundle, null, save);
+                container.put(VIEW_STATE_KEY, bundle);
             }
         }
 	}
@@ -99,9 +106,12 @@ public static <T> void save(T save, SparseArray<Parcelable> container){
      */
     public static <T> void recover(T save, SparseArray<Parcelable> container){
         if(container != null){
-            ISaveViewStateHelper<T> viewSaveHelper = findViewSaveHelper(save);
-            if(viewSaveHelper != null){
-                viewSaveHelper.recover(save, container);
+            ISaveInstanceStateHelper<T> viewStateHelper = findSaveHelper(save);
+            if(viewStateHelper != null){
+                Bundle bundle = (Bundle) container.get(VIEW_STATE_KEY);
+                if(bundle != null){
+                    viewStateHelper.recover(bundle, null, save);
+                }
             }
         }
     }