解决打包冲突

huangyanbin · Jan 10, 2018 · b83f3c4 · b83f3c4
1 parent 479b7f7
commit b83f3c4
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 213 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -33,5 +33,4 @@ dependencies {
     compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
     compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.31'
-    compile project(path: ':calendar')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -24,8 +24,6 @@
         <activity android:name=".TableListActivity"/>
         <activity android:name=".TanTanActivity"/>
         <activity android:name=".PagerModeActivity"/>
-        <activity android:name=".CalendarMonthActivity"/>
-        <activity android:name=".CalendarWeekActivity"/>
         <activity android:name=".ManyActivity"/>
     </application>
 

diff --git a/app/src/main/java/com/bin/david/smarttable/CalendarMonthActivity.java b/app/src/main/java/com/bin/david/smarttable/CalendarMonthActivity.java
diff --git a/app/src/main/java/com/bin/david/smarttable/CalendarWeekActivity.java b/app/src/main/java/com/bin/david/smarttable/CalendarWeekActivity.java
diff --git a/app/src/main/java/com/bin/david/smarttable/MainActivity.java b/app/src/main/java/com/bin/david/smarttable/MainActivity.java
@@ -31,8 +31,6 @@ protected void onCreate(Bundle savedInstanceState) {
         items.add(new MainItem(ManyActivity.class,"测试150列"));
        items.add(new MainItem(TableListActivity.class,"测试手势冲突"));
         items.add(new MainItem(TanTanActivity.class,"探探效果"));
-        items.add(new MainItem(CalendarMonthActivity.class,"RecyclerView日历(月模式)"));
-        items.add(new MainItem(CalendarWeekActivity.class,"RecyclerView日历(星期模式)"));
         itemAdapter = new ItemAdapter(items);
         recyclerView.setAdapter(itemAdapter);
         itemAdapter.openLoadAnimation();

diff --git a/app/src/main/res/layout/activity_calendar.xml b/app/src/main/res/layout/activity_calendar.xml
diff --git a/app/src/main/res/layout/item_month_calendar.xml b/app/src/main/res/layout/item_month_calendar.xml
diff --git a/app/src/main/res/layout/item_week_calendar.xml b/app/src/main/res/layout/item_week_calendar.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':form', ':calendar'
+include ':app', ':form'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':app', ':form', ':calendar'
		include ':app', ':form'