From 8f5322455f463d14bd847b80bf1ee374a82bc961 Mon Sep 17 00:00:00 2001
From: dahei <unitygames@163.com>
Date: Wed, 25 Jan 2017 14:12:22 +0800
Subject: [PATCH 1/2] fix #2

---
 .../java/com/qianmi/modulebuildapk/MainActivity.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java b/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java
index f45d4df..2b4b2d7 100644
--- a/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java
+++ b/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java
@@ -12,7 +12,7 @@
 import com.qianmi.baselibrary.BaseActivity;
 import com.qianmi.baselibrary.utils.ToastUtil;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -20,13 +20,12 @@
 public class MainActivity extends BaseActivity {
 
 
-    @Bind(R.id.btnOrderManager)
+    @BindView(R.id.tip)
+    TextView tip;
+    @BindView(R.id.btnOrderManager)
     Button btnOrderManager;
-    @Bind(R.id.btnPointManager)
+    @BindView(R.id.btnPointManager)
     Button btnPointManager;
-    @Bind(R.id.tip)
-    TextView tip;
-
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

From a11dcb2f776c78b274f53ecff76f357155855bd0 Mon Sep 17 00:00:00 2001
From: dahei <unitygames@163.com>
Date: Wed, 25 Jan 2017 15:03:08 +0800
Subject: [PATCH 2/2] update butterknife

---
 app/build.gradle                              |  2 --
 .../qianmi/modulebuildapk/MainActivity.java   | 21 ++++++++++---------
 baselibrary/build.gradle                      | 12 +++--------
 build.gradle                                  |  4 +++-
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2a18611..28c60da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-//apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
@@ -22,7 +21,6 @@ android {
 
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
diff --git a/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java b/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java
index 2b4b2d7..891bdcd 100644
--- a/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java
+++ b/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java
@@ -34,6 +34,17 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
     }
 
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == Activity.RESULT_OK) {
+            if (data.hasExtra(AppConfig.ORDER_INTENT_VALUE)) {
+                tip.setText(data.getStringExtra(AppConfig.ORDER_INTENT_VALUE));
+            }
+        }
+    }
+
     @OnClick({R.id.btnOrderManager, R.id.btnPointManager})
     public void onClick(View view) {
         switch (view.getId()) {
@@ -59,14 +70,4 @@ public void onClick(View view) {
         }
     }
 
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == Activity.RESULT_OK) {
-            if (data.hasExtra(AppConfig.ORDER_INTENT_VALUE)) {
-                tip.setText(data.getStringExtra(AppConfig.ORDER_INTENT_VALUE));
-            }
-        }
-    }
 }
diff --git a/baselibrary/build.gradle b/baselibrary/build.gradle
index 8a1d2c2..542ade8 100644
--- a/baselibrary/build.gradle
+++ b/baselibrary/build.gradle
@@ -1,4 +1,3 @@
-//apply plugin: 'com.android.application'
 apply plugin: 'com.android.library'
 apply plugin: 'android-apt'
 
@@ -26,13 +25,8 @@ ext {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-//    testCompile 'junit:junit:4.12'
     compile "com.android.support:appcompat-v7:${supportLibVersion}"
-//    compile "com.android.support:support-v4:${supportLibVersion}"
-//    compile "com.android.support:cardview-v7:${supportLibVersion}"
-//    compile "com.android.support:design:${supportLibVersion}"
-//    compile "com.android.support:support-annotations:${supportLibVersion}"
-    compile 'com.jakewharton:butterknife:8.1.0'
-    apt 'com.jakewharton:butterknife-compiler:8.1.0'
-
+    compile 'com.jakewharton:butterknife-compiler:8.4.0'
+    compile 'com.jakewharton:butterknife-annotations:8.4.0'
+    compile 'com.jakewharton:butterknife:8.4.0'
 }
diff --git a/build.gradle b/build.gradle
index 1b5bc75..4568530 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,11 +6,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+
     }
 }
 
+
 allprojects {
     repositories {
         jcenter()