bugfix 拍照后预览闪退

cmcy · Nov 11, 2020 · 9affacd · 9affacd
1 parent 757a8b9
commit 9affacd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA"/>
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/medialib/src/main/java/com/cmcy/medialib/PhotoPreviewActivity.java b/medialib/src/main/java/com/cmcy/medialib/PhotoPreviewActivity.java
@@ -60,12 +60,15 @@ protected void initView()
 
 			observeOnDataChange = Observable.just(url+"").subscribeOn(Schedulers.io())
 					.map(url -> {
-						File sourceFile = Glide.with(PhotoPreviewActivity.this).asFile().load(url).submit().get();
-
-						if(sourceFile == null || !sourceFile.exists()){
-							return "";
+						if(Utils.isHttpHead(url)){
+							File sourceFile = Glide.with(PhotoPreviewActivity.this).asFile().load(url).submit().get();
+							if(sourceFile == null || !sourceFile.exists()){
+								return "";
+							}
+							return sourceFile.getAbsolutePath();
+						}else {
+							return url;
 						}
-						return sourceFile.getAbsolutePath();
 					}).observeOn(AndroidSchedulers.mainThread()).subscribe(path -> {
 						File resource = new File(path);
 						imageViewPreview.setImage(ImageSource.uri(Uri.fromFile(resource)));