From 957364872aca93361b664583058e73e666ac9421 Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Fri, 6 Aug 2021 23:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9poi=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../navinfo/outdoor/fragment/PoiFragment.java | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
index 8bb5ad4..a92ac80 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -591,7 +591,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
             case R.id.rl_panorama:
                 Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE");
                 file = PhotoUtils.showPhotoFile("a", latLng);;
-
                 intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
                 startActivityForResult(intentPanorama, 101);
                 break;
@@ -854,15 +853,16 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
 
             }*/
         } else if (requestCode == 102 && resultCode == RESULT_OK) {
-            Bundle extras = data.getExtras();//从Intent中获取附加值
+
             if (file==null||!file.exists()){
                 Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
                 return;
+            }else {
+                String s = PhotoUtils.showPhotoAndGetPath(file, ivName);
+                tvName.setTag(s);
             }
-            Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像
-            String takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "b", Geohash.getInstance().encode(latLng.latitude, latLng.longitude));
-            tvName.setTag(takePhotoPath2);
-            ivName.setImageBitmap(bitmap);//显示图像
+            file=null;
+
            /* int height = bitmap.getHeight();
             int width = bitmap.getWidth();
             if (height > width) {
@@ -879,16 +879,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
 
             }*/
         } else if (requestCode == 103 && resultCode == RESULT_OK) {
-            Bundle extras = data.getExtras();//从Intent中获取附加值
             if (file==null||!file.exists()){
                 Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
                 return;
+            }else {
+                String s = PhotoUtils.showPhotoAndGetPath(file, ivInternal);
+                tvInternal.setTag(s);
             }
-            Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像
-            String takePhotoPath3 = PhotoPathUtil.getTakePhotoPath(data, "c", Geohash.getInstance().encode(latLng.latitude, latLng.longitude));
-            tvInternal.setTag(takePhotoPath3);
-            ivInternal.setImageBitmap(bitmap);//显示图像
-            file = null;
+            file=null;
             /*int height = bitmap.getHeight();
             int width = bitmap.getWidth();
             if (height > width) {
@@ -905,15 +903,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
 
             }*/
         } else if (requestCode == 104 && resultCode == RESULT_OK) {
-            Bundle extras = data.getExtras();//从Intent中获取附加值
             if (file==null||!file.exists()){
                 Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
                 return;
+            }else {
+                String s = PhotoUtils.showPhotoAndGetPath(file, ivCard);
+                tvCard.setTag(s);
             }
-            Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像
-            String takePhotoPath4 = PhotoPathUtil.getTakePhotoPath(data, "d", Geohash.getInstance().encode(latLng.latitude, latLng.longitude));
-            tvCard.setTag(takePhotoPath4);
-            ivCard.setImageBitmap(bitmap);//显示图像
             file = null;
          /*   int height = bitmap.getHeight();
             int width = bitmap.getWidth();
@@ -931,15 +927,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
 
             }*/
         } else if (requestCode == 105 && resultCode == RESULT_OK) {
-            Bundle extras = data.getExtras();//从Intent中获取附加值
             if (file==null||!file.exists()){
                 Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
                 return;
+            }else {
+                String s = PhotoUtils.showPhotoAndGetPath(file, ivElse);
+                tvElse.setTag(s);
             }
-            Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像
-            String takePhotoPath5 = PhotoPathUtil.getTakePhotoPath(data, "e", Geohash.getInstance().encode(latLng.latitude, latLng.longitude));
-            tvElse.setTag(takePhotoPath5);
-            ivElse.setImageBitmap(bitmap);//显示图像
             file = null;
 /*            int height = bitmap.getHeight();
             int width = bitmap.getWidth();