diff --git a/app/build.gradle b/app/build.gradle index 2a18611..e96dc94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,8 @@ +// 对于app组件需要构建输出apk,依赖的gradle插件是application apply plugin: 'com.android.application' //apply plugin: 'com.android.library' +// butterknife依赖注解处理 +apply plugin: 'android-apt' android { compileSdkVersion 23 @@ -24,9 +27,10 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile fileTree(dir: 'libs', include: ['*.jar']) -// compile 'com.jakewharton:butterknife:7.0.1' + compile 'com.jakewharton:butterknife:8.1.0' + apt 'com.jakewharton:butterknife-compiler:8.1.0' + compile project(':baselibrary') compile project(':orderlibrary') //订单管理组件 compile project(':tasks:pointmanager') //网点管理组件 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bdece22..dd5dd2b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,6 +8,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> + diff --git a/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java b/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java index f45d4df..bacd8e6 100644 --- a/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java +++ b/app/src/main/java/com/qianmi/modulebuildapk/MainActivity.java @@ -8,11 +8,12 @@ import android.widget.Button; import android.widget.TextView; +// 依赖baselib组件相关逻辑 import com.qianmi.baselibrary.AppConfig; import com.qianmi.baselibrary.BaseActivity; import com.qianmi.baselibrary.utils.ToastUtil; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -20,11 +21,11 @@ public class MainActivity extends BaseActivity { - @Bind(R.id.btnOrderManager) + @BindView(R.id.btnOrderManager) Button btnOrderManager; - @Bind(R.id.btnPointManager) + @BindView(R.id.btnPointManager) Button btnPointManager; - @Bind(R.id.tip) + @BindView(R.id.tip) TextView tip; diff --git a/baselibrary/build.gradle b/baselibrary/build.gradle index 8a1d2c2..1f8ff46 100644 --- a/baselibrary/build.gradle +++ b/baselibrary/build.gradle @@ -1,4 +1,5 @@ //apply plugin: 'com.android.application' +// 基础lib组件,插件声明为library apply plugin: 'com.android.library' apply plugin: 'android-apt' diff --git a/baselibrary/src/main/AndroidManifest.xml b/baselibrary/src/main/AndroidManifest.xml index be3b3e9..351c21c 100644 --- a/baselibrary/src/main/AndroidManifest.xml +++ b/baselibrary/src/main/AndroidManifest.xml @@ -26,5 +26,6 @@ android:label="@string/app_name" android:supportsRtl="true"> + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1b5bc75..f3dd307 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.1.2' + // butterknife涉及注解处理,故依赖android-apt classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' } } diff --git a/orderlibrary/build.gradle b/orderlibrary/build.gradle index 8339c8c..be16ece 100644 --- a/orderlibrary/build.gradle +++ b/orderlibrary/build.gradle @@ -21,5 +21,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' + // order组件依赖base组件,编译依赖关系在这里说明 compile project(':baselibrary') } diff --git a/orderlibrary/src/main/AndroidManifest.xml b/orderlibrary/src/main/AndroidManifest.xml index c40e039..b34a1d7 100644 --- a/orderlibrary/src/main/AndroidManifest.xml +++ b/orderlibrary/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true"> + diff --git a/orderlibrary/src/main/java/com/qianmi/small/orderlibrary/OrderActivity.java b/orderlibrary/src/main/java/com/qianmi/small/orderlibrary/OrderActivity.java index 10dc7ae..cab5928 100644 --- a/orderlibrary/src/main/java/com/qianmi/small/orderlibrary/OrderActivity.java +++ b/orderlibrary/src/main/java/com/qianmi/small/orderlibrary/OrderActivity.java @@ -9,6 +9,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; +// 依赖base组件,相关类在这里声明 import com.qianmi.baselibrary.AppConfig; import com.qianmi.baselibrary.BaseActivity; import com.qianmi.baselibrary.utils.ToastUtil; @@ -51,6 +52,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) public void onClick(View v) { if (v.getId() == R.id.btnGotoPoint) { try { + // 跳转到另外一个组件的activity Intent intent = getStartActivityIntent(AppConfig.PointManagerModuleActivity); startActivity(intent); } catch (ActivityNotFoundException e) { diff --git a/settings.gradle b/settings.gradle index 897c4da..fb10d3c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,2 @@ - - - +// 声明工程包含的组件,除app外,其他都是lib组件 include ':app', ':baselibrary', ':tasks:ordermanager', ':tasks:pointmanager', ':orderlibrary' \ No newline at end of file diff --git a/tasks/ordermanager/AndroidManifest.xml b/tasks/ordermanager/AndroidManifest.xml index dd2affc..da17106 100644 --- a/tasks/ordermanager/AndroidManifest.xml +++ b/tasks/ordermanager/AndroidManifest.xml @@ -10,6 +10,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> + diff --git a/tasks/ordermanager/build.gradle b/tasks/ordermanager/build.gradle index 4374d20..de785fe 100644 --- a/tasks/ordermanager/build.gradle +++ b/tasks/ordermanager/build.gradle @@ -1,3 +1,4 @@ +// 专门用于测试order组件的app组件,声明插件 apply plugin: 'com.android.application' //apply plugin: 'com.android.library' @@ -7,6 +8,7 @@ android { sourceSets { main { + // 这里的声明是干啥的? manifest.srcFile 'AndroidManifest.xml' } } @@ -20,6 +22,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) + + // 依赖base组件 compile project(':baselibrary') + // 既然是为了测试order组件的工程,依赖order组件 compile project(':orderlibrary') } diff --git a/tasks/ordermanager/src/main/java/com/qianmi/ordermanager/OrderTestActivity.java b/tasks/ordermanager/src/main/java/com/qianmi/ordermanager/OrderTestActivity.java index 1ac103e..f39d4cc 100644 --- a/tasks/ordermanager/src/main/java/com/qianmi/ordermanager/OrderTestActivity.java +++ b/tasks/ordermanager/src/main/java/com/qianmi/ordermanager/OrderTestActivity.java @@ -5,7 +5,9 @@ import android.os.Bundle; import android.view.View; +// 依赖base组件 import com.qianmi.baselibrary.BaseActivity; +// 依赖order组件 import com.qianmi.small.orderlibrary.OrderActivity; diff --git a/tasks/pointmanager/build.gradle b/tasks/pointmanager/build.gradle index 603db88..6c266f7 100644 --- a/tasks/pointmanager/build.gradle +++ b/tasks/pointmanager/build.gradle @@ -1,4 +1,5 @@ //apply plugin: 'com.android.application' +// lib组件插件 apply plugin: 'com.android.library' android { @@ -23,6 +24,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' + // 依赖base组件 compile project(':baselibrary') } diff --git a/tasks/pointmanager/src/main/AndroidManifest.xml b/tasks/pointmanager/src/main/AndroidManifest.xml index 8d5f430..4c96ee1 100644 --- a/tasks/pointmanager/src/main/AndroidManifest.xml +++ b/tasks/pointmanager/src/main/AndroidManifest.xml @@ -8,6 +8,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> + diff --git a/tasks/pointmanager/src/main/java/com/qianmi/pointmanager/PointActivity.java b/tasks/pointmanager/src/main/java/com/qianmi/pointmanager/PointActivity.java index 145707f..505f3a8 100644 --- a/tasks/pointmanager/src/main/java/com/qianmi/pointmanager/PointActivity.java +++ b/tasks/pointmanager/src/main/java/com/qianmi/pointmanager/PointActivity.java @@ -3,6 +3,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +// 依赖base组件 import com.qianmi.baselibrary.BaseActivity;