Merge remote-tracking branch 'origin/master'

r17171709 · Jun 12, 2017 · 92876d8 · 92876d8
2 parents b592bd2 + f6b7968
commit 92876d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ImageLibrary/build.gradle b/ImageLibrary/build.gradle
@@ -7,7 +7,7 @@ group='com.github.renyu'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    buildToolsVersion "26.0.0"
 
     defaultConfig {
         minSdkVersion 19
@@ -35,7 +35,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-    compile 'com.github.r17171709:AndroidCommonLibrary:v1.0.2'
+    compile 'com.github.r17171709:AndroidCommonLibrary:v1.0.8'
     // CircleIndicator  A lightweight viewpager indicator like in nexus 5 launcher
     compile 'me.relex:circleindicator:1.2.2@aar'
     // PhotoDraweeView  PhotoView For Fresco

diff --git a/ImageLibrary/src/main/java/com/renyu/imagelibrary/camera/CameraFragment.java b/ImageLibrary/src/main/java/com/renyu/imagelibrary/camera/CameraFragment.java
@@ -88,7 +88,7 @@ public void loadData() {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         FileUtils.createOrExistsDir(InitParams.IMAGE_PATH);
         dirPath=InitParams.IMAGE_PATH+"/"+System.currentTimeMillis()+".jpg";
-        FileUtils.createFileByDeleteOldFile(dirPath);
+        FileUtils.createFileByDeleteOldFile(new File(dirPath));
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    buildToolsVersion "26.0.0"
     defaultConfig {
         applicationId "com.renyu.androidimagelibrary"
         minSdkVersion 19
@@ -26,5 +26,6 @@ dependencies {
     })
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
-    compile 'com.github.r17171709:AndroidImageLibrary:v1.0.2'
+    //    compile 'com.github.r17171709:AndroidImageLibrary:v1.0.2'
+    compile project(':ImageLibrary')
 }