modify

Author: ThirtyDegreesRay

README.md

@@ -11,71 +11,49 @@ BaseActivity中添加取出数据和存储数据代码：
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        //get data
+        //DataAutoAccessTool 取数据
         Bundle data;
+        boolean isFromIntent = true;
         data = getIntent().getExtras();
-        //judge data source
+        //判断数据源
         if (data == null) {
             data = savedInstanceState;
+            isFromIntent = false;
         }
-        DataAutoAccess.getData(this, data);
+        DataAutoAccessTool.getData(this, data, isFromIntent);
+
     }
 
+
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        //save data
-        DataAutoAccess.saveData(this, outState);
+        //系统由于内存不足而杀死activity，此时保存数据
+        DataAutoAccessTool.saveData(this, outState);
     }
 
 启动Activity时传入参数：
 
-    Intent intent = new Intent(this, TestActivity.class);
-    intent.putExtra("name", "DataAutoAccess");
-    intent.putExtra("description", "Android bundle data auto access.");
-    startActivity(intent);
+        Intent intent = new Intent(this, TestActivity.class);
+        intent.putExtra("name", "DataAutoAccess");
+        intent.putExtra("description", "Android bundle data auto access.");
+        startActivity(intent);
 
-给ExampleActivity中需要自动存储的变量添加注解：
+给TestActivity中需要自动存储的变量添加注解：
 
-    @AutoAccess(dataName = "name")
+    @DataAutoAccess(dataName = "name")
     private String name;
-    @AutoAccess(dataName = "description")
+    @DataAutoAccess(dataName = "description")
     private String description;
 
-经过以上配置之后，DataAutoAccess会自动从intent中取出数据，给name和description变量赋值，而且当activity由于系统内存不足被杀死时，也会自动保存变量值，在onCreate时取出进行赋值。
+经过以上配置之后，DataAutoAccessTool会自动从intent中取出数据，给name和description变量赋值，而且当activity由于系统内存不足被杀死时，也会自动保存变量值，在onCreate时取出进行自动赋值。
 
 
 ##Download
-Configure your project-level build.gradle to include the 'android-apt' plugin:
-
-    buildscript {
-        repositories {
-            mavenCentral()
-        }
-        dependencies {
-            classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        }
-    }
-    
-    allprojects {
-        repositories {
-            maven {
-                url "https://dl.bintray.com/thirtydegreesray/maven/"
-            }
-        }
-    }
-    
-Then, apply the 'android-apt' plugin in your module-level build.gradle and add the Data Auto Access dependencies:
 
-    apply plugin: 'android-apt'
-    
-    android {
-        ...
-    }
-    
     dependencies {
-        compile 'com.thirtydegreesray:dataautoaccess:1.2.0'
-        apt 'com.thirtydegreesray:dataautoaccess-compiler:1.2.0'
+        compile 'com.thirtydegreesray.dataautoaccess:Library:1.0.5'
     }
 
 ##License

Sample/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'android-apt'
 
 android {
     compileSdkVersion 24
@@ -30,6 +29,6 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:24.2.0'
     testCompile 'junit:junit:4.12'
-    compile project(':dataautoaccess')
-    apt project(':dataautoaccess-compiler')
+
+    compile project (':Library')
 }

Sample/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ExampleActivity" />
+        <activity android:name=".TestActivity" />
     </application>
 
 </manifest>

Sample/src/main/java/com/thirtydegreesray/sample/BaseActivity.java

@@ -4,30 +4,37 @@
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
-import com.thirtydegreesray.dataautoaccess.DataAutoAccess;
+import com.thirtydegreesray.dataautoaccess.DataAutoAccessTool;
 
 /**
  * Created by ThirtyDegreesRay on 2016/9/1 09:58
  */
 
 public class BaseActivity extends AppCompatActivity {
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //get data
+
+        //DataAutoAccessTool 取数据
         Bundle data;
+        boolean isFromIntent = true;
         data = getIntent().getExtras();
-        //judge data source
+        //判断数据源
         if (data == null) {
             data = savedInstanceState;
+            isFromIntent = false;
         }
-        DataAutoAccess.getData(this, data);
+        DataAutoAccessTool.getData(this, data, isFromIntent);
+
     }
 
+
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        //save data
-        DataAutoAccess.saveData(this, outState);
+        //系统由于内存不足而杀死activity，此时保存数据
+        DataAutoAccessTool.saveData(this, outState);
     }
 }

Sample/src/main/java/com/thirtydegreesray/sample/ExampleActivity.java

@@ -16,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     public void onDataAutoAccessClick(View view){
-        Intent intent = new Intent(this, ExampleActivity.class);
+        Intent intent = new Intent(this, TestActivity.class);
         intent.putExtra("name", "DataAutoAccess");
         intent.putExtra("description", "Android bundle data auto access.");
         startActivity(intent);

Sample/src/main/java/com/thirtydegreesray/sample/MainActivity.java

@@ -3,37 +3,17 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/app_bg"
-    android:padding="8dp"
-    android:gravity="center">
+    android:padding="8dp">
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textSize="20sp"
-        android:textColor="@android:color/black"
-        android:gravity="center"/>
+        android:textColor="@android:color/black"/>
     <TextView
         android:id="@+id/tv_description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textSize="16sp"
-        android:textColor="@android:color/black"
-        android:gravity="center"/>
-
-    <Button
-        android:layout_width="120dp"
-        android:layout_height="wrap_content"
-        android:text="SaveData"
-        android:onClick="onSaveDataClick"
-        android:layout_marginTop="20dp"/>
-    <Button
-        android:layout_width="120dp"
-        android:layout_height="wrap_content"
-        android:text="ChangeData"
-        android:onClick="onChangeDataClick"/>
-    <Button
-        android:layout_width="120dp"
-        android:layout_height="wrap_content"
-        android:text="GetData"
-        android:onClick="onGetDataClick"/>
+        android:textColor="@android:color/black"/>
 </LinearLayout>

Sample/src/main/java/com/thirtydegreesray/sample/TestClass.java

@@ -2,12 +2,13 @@
 
 buildscript {
     repositories {
-        mavenCentral()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.3'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
 
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'