Skip to content

Commit 05e96ef

Browse files
author
Liuliwei
committed
Add aspectj
1 parent 60cf144 commit 05e96ef

File tree

849 files changed

+236
-56795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

849 files changed

+236
-56795
lines changed

.idea/modules.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,51 @@ dependencies {
3131
compile project(':zcommon')
3232
// compile 'com.github.yuyuyu123:ZCommon:1.0.7.1'
3333
}
34+
35+
import org.aspectj.bridge.IMessage
36+
import org.aspectj.bridge.MessageHandler
37+
import org.aspectj.tools.ajc.Main
38+
39+
final def log = project.logger
40+
final def variants = project.android.applicationVariants
41+
42+
variants.all { variant ->
43+
if (!variant.buildType.isDebuggable()) {
44+
log.debug("Skipping non-debuggable build type '${variant.buildType.name}'.")
45+
return;
46+
}
47+
48+
JavaCompile javaCompile = variant.javaCompile
49+
javaCompile.doLast {
50+
String[] args = ["-showWeaveInfo",
51+
"-1.8",
52+
"-inpath", javaCompile.destinationDir.toString(),
53+
"-aspectpath", javaCompile.classpath.asPath,
54+
"-d", javaCompile.destinationDir.toString(),
55+
"-classpath", javaCompile.classpath.asPath,
56+
"-bootclasspath", project.android.bootClasspath.join(File.pathSeparator)
57+
]
58+
log.debug "ajc args: " + Arrays.toString(args)
59+
60+
MessageHandler handler = new MessageHandler(true);
61+
new Main().run(args, handler);
62+
for (IMessage message : handler.getMessages(null, true)) {
63+
switch (message.getKind()) {
64+
case IMessage.ABORT:
65+
case IMessage.ERROR:
66+
case IMessage.FAIL:
67+
log.error message.message, message.thrown
68+
break;
69+
case IMessage.WARNING:
70+
log.warn message.message, message.thrown
71+
break;
72+
case IMessage.INFO:
73+
log.info message.message, message.thrown
74+
break;
75+
case IMessage.DEBUG:
76+
log.debug message.message, message.thrown
77+
break;
78+
}
79+
}
80+
}
81+
}

app/src/main/java/com/zcommon/simple/MainActivity.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@
44
import android.graphics.Bitmap;
55
import android.graphics.BitmapFactory;
66
import android.os.Bundle;
7+
import android.util.Log;
78
import android.view.View;
89
import android.widget.ImageView;
910

11+
import com.cc.android.zcommon.aspect.TestAnnoTrace;
1012
import com.cc.android.zcommon.base.RxBasePermissionActivity;
1113
import com.cc.android.zcommon.img.CameraAndPictureActivity;
1214

1315

14-
public class MainActivity extends RxBasePermissionActivity implements RxBasePermissionActivity.OnSinglePermissionRequestCallBack{
16+
public class MainActivity extends RxBasePermissionActivity
17+
implements RxBasePermissionActivity.OnSinglePermissionRequestCallBack{
1518

19+
private static final String TAG = "MainActivity";
1620
private ImageView img;
1721

1822
@Override
@@ -53,4 +57,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
5357
img.setImageBitmap(bitmap);
5458
}
5559
}
60+
61+
@TestAnnoTrace(value = "test", type = 1)
62+
public void testAop(View view) {
63+
Log.e(TAG, "Hello, I am MainActivity");
64+
}
5665
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,17 @@
88
android:gravity="center_horizontal"
99
tools:context="com.zcommon.simple.MainActivity">
1010

11+
<Button
12+
android:layout_width="match_parent"
13+
android:layout_height="wrap_content"
14+
android:onClick="takePhoto"
15+
android:text="TakePhoto" />
16+
1117
<Button
1218
android:layout_width="match_parent"
1319
android:layout_height="wrap_content"
14-
android:onClick="takePhoto"
15-
android:text="TakePhoto" />
20+
android:onClick="testAop"
21+
android:text="Test Aop" />
1622

1723

1824
<ImageView

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ buildscript {
1313
classpath 'com.novoda:bintray-release:0.5.0'
1414
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' // Add this line
1515

16+
//aspect
17+
classpath 'org.aspectj:aspectjtools:1.9.1'
18+
classpath 'org.aspectj:aspectjweaver:1.9.1'
1619
// NOTE: Do not place your application dependencies here; they belong
1720
// in the individual module build.gradle files
1821
}

zcommon/build.gradle

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ dependencies {
6060
api "com.github.bumptech.glide:glide:$GLIDE_VERSION"
6161
annotationProcessor "com.github.bumptech.glide:compiler:$GLIDE_VERSION"
6262
// api "com.github.bumptech.glide:okhttp3-integration:$GLIDE_VERSION"
63+
compile 'org.aspectj:aspectjrt:1.9.1'
6364
}
6465

6566
publish {
@@ -86,3 +87,43 @@ tasks.withType(Javadoc) {//防止编码问题
8687
// rename('classes.jar','ZCommon.jar')
8788
//}
8889
//makeJar.dependsOn(build)
90+
91+
92+
import org.aspectj.bridge.IMessage
93+
import org.aspectj.bridge.MessageHandler
94+
import org.aspectj.tools.ajc.Main
95+
96+
android.libraryVariants.all { variant ->
97+
JavaCompile javaCompile = variant.javaCompile
98+
javaCompile.doLast {
99+
String[] args = ["-showWeaveInfo",
100+
"-1.8",
101+
"-inpath", javaCompile.destinationDir.toString(),
102+
"-aspectpath", javaCompile.classpath.asPath,
103+
"-d", javaCompile.destinationDir.toString(),
104+
"-classpath", javaCompile.classpath.asPath,
105+
"-bootclasspath", android.bootClasspath.join(
106+
File.pathSeparator)]
107+
108+
MessageHandler handler = new MessageHandler(true)
109+
new Main().run(args, handler)
110+
111+
def log = project.logger
112+
for (IMessage message : handler.getMessages(null, true)) {
113+
switch (message.getKind()) {
114+
case IMessage.ABORT:
115+
case IMessage.ERROR:
116+
case IMessage.FAIL:
117+
log.error message.message, message.thrown
118+
break
119+
case IMessage.WARNING:
120+
case IMessage.INFO:
121+
log.info message.message, message.thrown
122+
break
123+
case IMessage.DEBUG:
124+
log.debug message.message, message.thrown
125+
break
126+
}
127+
}
128+
}
129+
}
Binary file not shown.

zcommon/build/generated/source/buildConfig/androidTest/debug/com/cc/android/zcommon/test/BuildConfig.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

zcommon/build/generated/source/r/androidTest/debug/android/arch/core/R.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

zcommon/build/generated/source/r/androidTest/debug/android/arch/lifecycle/R.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

zcommon/build/generated/source/r/androidTest/debug/android/arch/lifecycle/livedata/core/R.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

zcommon/build/generated/source/r/androidTest/debug/android/arch/lifecycle/viewmodel/R.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

zcommon/build/generated/source/r/androidTest/debug/android/support/compat/R.java

Lines changed: 0 additions & 133 deletions
This file was deleted.

0 commit comments

Comments
 (0)