fix:修复 file provider 与拍照问题

Qixingchen · Feb 8, 2017 · 9cd660f · 9cd660f
1 parent 38eab19
commit 9cd660f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="moe.xing.getimage_app">
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/app/src/main/java/moe/xing/getimage_app/MainActivity.java b/app/src/main/java/moe/xing/getimage_app/MainActivity.java
@@ -74,6 +74,13 @@ public void onClick(final View v) {
         });
 
         mBinding.take.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                RxGetImage.getInstance().takeImage(false).subscribe(fileSubscriber);
+            }
+        });
+
+        mBinding.takeAndCorp.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 RxGetImage.getInstance().takeImage(true).subscribe(fileSubscriber);

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -35,10 +35,24 @@
                 android:layout_height="wrap_content"
                 android:text="获取多图"/>
 
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
             <Button
                 android:id="@+id/take"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="拍摄"/>
+
+            <Button
+                android:id="@+id/take_and_corp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:text="拍摄并裁剪"/>
 
 

diff --git a/lib/src/main/java/moe/xing/getimage/GetImageActivity.java b/lib/src/main/java/moe/xing/getimage/GetImageActivity.java
@@ -145,6 +145,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                         } else {
                             RxGetImage.getInstance().onAns(takenFile, getSubscriberID());
                             RxGetImage.getInstance().onComplete(getSubscriberID());
+                            finish();
                         }
                     } else {
                         RxGetImage.getInstance().onError(new Throwable("空文件"), getSubscriberID());