Commit 47d2a0aed7dee1a6be23a0c5bfa07e60d25d915e

Authored by 杨帅
1 parent f9678a39

1 修复ARouter冲突

library_baidumap/src/main/java/com/cnlive/baidumap/BaiduMapMainActivity.java
@@ -7,7 +7,6 @@ import com.alibaba.android.arouter.facade.annotation.Route; @@ -7,7 +7,6 @@ import com.alibaba.android.arouter.facade.annotation.Route;
7 import com.baidu.mapapi.CoordType; 7 import com.baidu.mapapi.CoordType;
8 import com.baidu.mapapi.SDKInitializer; 8 import com.baidu.mapapi.SDKInitializer;
9 import com.example.moudle_baidumap.R; 9 import com.example.moudle_baidumap.R;
10 -@Route(path = "/moudle_baidumap/BaiduMapMainActivity")  
11 public class BaiduMapMainActivity extends AppCompatActivity { 10 public class BaiduMapMainActivity extends AppCompatActivity {
12 11
13 @Override 12 @Override
moudle_pedometer/build.gradle
@@ -13,14 +13,9 @@ android { @@ -13,14 +13,9 @@ android {
13 versionCode rootProject.ext.versionCode 13 versionCode rootProject.ext.versionCode
14 versionName rootProject.ext.versionName 14 versionName rootProject.ext.versionName
15 multiDexEnabled true 15 multiDexEnabled true
16 -// javaCompileOptions {  
17 -// annotationProcessorOptions {  
18 -// arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"]  
19 -// }  
20 -// }  
21 javaCompileOptions { 16 javaCompileOptions {
22 annotationProcessorOptions { 17 annotationProcessorOptions {
23 - arguments = [ moduleName : project.getName() ] 18 + arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"]
24 } 19 }
25 } 20 }
26 21