From 8aa88879f297049f5e0072febcdea4d2585b8c52 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 1 Feb 2023 14:37:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/ChargingPileFragment.java | 20 +++++++++---------- .../fragment/ChargingStationFragment.java | 10 +++++----- .../outdoor/fragment/OtherFragment.java | 4 ++-- .../navinfo/outdoor/fragment/PoiFragment.java | 11 +++++----- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index e7dc0d9..2894918 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -1047,70 +1047,70 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC case R.id.rl_panorama: chargingPileBuilder.append("点击了全景照片进行拍照,"); Intent intentPanorama = new Intent(getActivity(), PhotographActivity.class); - File panoramaFile = PhotoUtils.showPhotoFile("a", latLng); + File panoramaFile = PhotoUtils.showPhotoFile("a", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentPanorama.putExtra(Constant.INTENT_PHOTO_PATH, panoramaFile.getPath()); startActivityForResult(intentPanorama, 101); break; case R.id.rl_coding: chargingPileBuilder.append("点击了充电桩编码进行拍照,"); Intent intentCoding = new Intent(getActivity(), PhotographActivity.class); - File codingFile = PhotoUtils.showPhotoFile("b", latLng); + File codingFile = PhotoUtils.showPhotoFile("b", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentCoding.putExtra(Constant.INTENT_PHOTO_PATH, codingFile.getPath()); startActivityForResult(intentCoding, 102); break; case R.id.rl_equipment: chargingPileBuilder.append("点击了设备标牌进行拍照,"); Intent intentEquipment = new Intent(getActivity(), PhotographActivity.class); - File equipmentFile = PhotoUtils.showPhotoFile("c", latLng); + File equipmentFile = PhotoUtils.showPhotoFile("c", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentEquipment.putExtra(Constant.INTENT_PHOTO_PATH, equipmentFile.getPath()); startActivityForResult(intentEquipment, 103); break; case R.id.rl_facility: chargingPileBuilder.append("点击了设备标牌进行拍照,"); Intent intentFacility = new Intent(getActivity(), PhotographActivity.class); - File facilityFile = PhotoUtils.showPhotoFile("c", latLng); + File facilityFile = PhotoUtils.showPhotoFile("c", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentFacility.putExtra(Constant.INTENT_PHOTO_PATH, facilityFile.getPath()); startActivityForResult(intentFacility, 104); break; case R.id.rl_scutcheon: chargingPileBuilder.append("点击了设备标牌进行拍照,"); Intent intentScutcheon = new Intent(getActivity(), PhotographActivity.class); - File scutcheonFile = PhotoUtils.showPhotoFile("c", latLng); + File scutcheonFile = PhotoUtils.showPhotoFile("c", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentScutcheon.putExtra(Constant.INTENT_PHOTO_PATH, scutcheonFile.getPath()); startActivityForResult(intentScutcheon, 105); break; case R.id.rl_device: chargingPileBuilder.append("点击了设备标牌进行拍照,"); Intent intentDevice = new Intent(getActivity(), PhotographActivity.class); - File deviceFile = PhotoUtils.showPhotoFile("c", latLng); + File deviceFile = PhotoUtils.showPhotoFile("c", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentDevice.putExtra(Constant.INTENT_PHOTO_PATH, deviceFile.getPath()); startActivityForResult(intentDevice, 106); break; case R.id.rl_usable: chargingPileBuilder.append("点击了可用状态进行拍照,"); Intent intentUsable = new Intent(getActivity(), PhotographActivity.class); - File usableFile = PhotoUtils.showPhotoFile("d", latLng); + File usableFile = PhotoUtils.showPhotoFile("d", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentUsable.putExtra(Constant.INTENT_PHOTO_PATH, usableFile.getPath()); startActivityForResult(intentUsable, 107); break; case R.id.rl_available: chargingPileBuilder.append("点击了可用专题进行拍照,"); Intent intentAvailable = new Intent(getActivity(), PhotographActivity.class); - File availableFile = PhotoUtils.showPhotoFile("d", latLng); + File availableFile = PhotoUtils.showPhotoFile("d", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentAvailable.putExtra(Constant.INTENT_PHOTO_PATH, availableFile.getPath()); startActivityForResult(intentAvailable, 108); break; case R.id.rl_parking: chargingPileBuilder.append("点击了停车位编号进行拍照,"); Intent intentParking = new Intent(getActivity(), PhotographActivity.class); - File parkingFile = PhotoUtils.showPhotoFile("e", latLng); + File parkingFile = PhotoUtils.showPhotoFile("e", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentParking.putExtra(Constant.INTENT_PHOTO_PATH, parkingFile.getPath()); startActivityForResult(intentParking, 109); break; case R.id.rl_number: chargingPileBuilder.append("点击了停车位编号进行拍照,"); Intent intentNumber = new Intent(getActivity(), PhotographActivity.class); - File numberFile = PhotoUtils.showPhotoFile("e", latLng); + File numberFile = PhotoUtils.showPhotoFile("e", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentNumber.putExtra(Constant.INTENT_PHOTO_PATH, numberFile.getPath()); startActivityForResult(intentNumber, 110); break; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 3a3dae7..b361164 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -1052,35 +1052,35 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. case R.id.rl_panorama: chargingStationBuilder.append(TimestampUtil.time()).append("点击了全景照片进行拍照 ,"); Intent intentPanorama = new Intent(getActivity(), PhotographActivity.class); - File PanoramaFile = PhotoUtils.showPhotoFile("a", latLng); + File PanoramaFile = PhotoUtils.showPhotoFile("a", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentPanorama.putExtra(Constant.INTENT_PHOTO_PATH, PanoramaFile.getPath()); startActivityForResult(intentPanorama, 101); break; case R.id.rl_name: chargingStationBuilder.append(TimestampUtil.time()).append("点击了名称照片进行拍照 ,"); Intent intentName = new Intent(getActivity(), PhotographActivity.class); - File nameFile = PhotoUtils.showPhotoFile("b", latLng); + File nameFile = PhotoUtils.showPhotoFile("b", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentName.putExtra(Constant.INTENT_PHOTO_PATH, nameFile.getPath()); startActivityForResult(intentName, 102); break; case R.id.rl_internal_photos: chargingStationBuilder.append(TimestampUtil.time()).append("点击了服务说明进行拍照 ,"); Intent intentInternal = new Intent(getActivity(), PhotographActivity.class); - File internalFile = PhotoUtils.showPhotoFile("c", latLng); + File internalFile = PhotoUtils.showPhotoFile("c", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentInternal.putExtra(Constant.INTENT_PHOTO_PATH, internalFile.getPath()); startActivityForResult(intentInternal, 103); break; case R.id.rl_else: chargingStationBuilder.append(TimestampUtil.time()).append("点击了充电站指引牌进行拍照 ,"); Intent intentElse = new Intent(getActivity(), PhotographActivity.class); - File elseFile = PhotoUtils.showPhotoFile("d", latLng); + File elseFile = PhotoUtils.showPhotoFile("d", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentElse.putExtra(Constant.INTENT_PHOTO_PATH, elseFile.getPath()); startActivityForResult(intentElse, 104); break; case R.id.rl_scutcheon: chargingStationBuilder.append(TimestampUtil.time()).append("点击了停车收费标牌进行拍照 ,"); Intent intentScutcheon = new Intent(getActivity(), PhotographActivity.class); - File scutcheonFile = PhotoUtils.showPhotoFile("e", latLng); + File scutcheonFile = PhotoUtils.showPhotoFile("e", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentScutcheon.putExtra(Constant.INTENT_PHOTO_PATH, scutcheonFile.getPath()); startActivityForResult(intentScutcheon, 105); break; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 1998b28..0af7bf9 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -512,14 +512,14 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis case R.id.rl_picture: otherBuilder.append(TimestampUtil.time()).append(",").append("点击了第一个照片进行拍照 ,"); Intent intentPicture = new Intent(getActivity(), PhotographActivity.class); - File file = PhotoUtils.showPhotoFile("a", latLng); + File file = PhotoUtils.showPhotoFile("a", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentPicture.putExtra(Constant.INTENT_PHOTO_PATH, file.getPath()); startActivityForResult(intentPicture, 101); break; case R.id.rl_pictures: otherBuilder.append(TimestampUtil.time()).append(",").append("点击了第二个照片进行拍照 ,"); Intent intentPictures = new Intent(getActivity(), PhotographActivity.class); - File files = PhotoUtils.showPhotoFile("b", latLng); + File files = PhotoUtils.showPhotoFile("b", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentPictures.putExtra(Constant.INTENT_PHOTO_PATH, files.getPath()); startActivityForResult(intentPictures, 102); break; 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 fee084a..b2ec9bd 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -343,6 +343,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe initShowPoi(); //拍照长按删除 onLongDel(); + } //拍照长按删除 @@ -815,35 +816,35 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe case R.id.rl_panorama: poiBuilder.append(TimestampUtil.time()).append(",").append("点击了全景图的进行拍照,"); Intent intentPanorama = new Intent(getActivity(), PhotographActivity.class); - File filePanorama = PhotoUtils.showPhotoFile("a", latLng); + File filePanorama = PhotoUtils.showPhotoFile("a", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentPanorama.putExtra(Constant.INTENT_PHOTO_PATH, filePanorama.getPath()); startActivityForResult(intentPanorama, 101); break; case R.id.rl_name: poiBuilder.append(TimestampUtil.time()).append(",").append("点击了名称的进行拍照,"); Intent intentName = new Intent(getActivity(), PhotographActivity.class); - File fileName = PhotoUtils.showPhotoFile("b", latLng); + File fileName = PhotoUtils.showPhotoFile("b", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentName.putExtra(Constant.INTENT_PHOTO_PATH, fileName.getPath()); startActivityForResult(intentName, 102); break; case R.id.rl_internal_photos: poiBuilder.append(TimestampUtil.time()).append(",").append("点击了内部照片的进行拍照,"); Intent intentInternal = new Intent(getActivity(), PhotographActivity.class); - File fileInternal = PhotoUtils.showPhotoFile("c", latLng); + File fileInternal = PhotoUtils.showPhotoFile("c", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentInternal.putExtra(Constant.INTENT_PHOTO_PATH, fileInternal.getPath()); startActivityForResult(intentInternal, 103); break; case R.id.rl_card: poiBuilder.append(TimestampUtil.time()).append(",").append("点击了名片的进行拍照,"); Intent intentCard = new Intent(getActivity(), PhotographActivity.class); - File fileCard = PhotoUtils.showPhotoFile("d", latLng); + File fileCard = PhotoUtils.showPhotoFile("d", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentCard.putExtra(Constant.INTENT_PHOTO_PATH, fileCard.getPath()); startActivityForResult(intentCard, 104); break; case R.id.rl_else: poiBuilder.append(TimestampUtil.time()).append(",").append("点击了其他的进行拍照,"); Intent intentElse = new Intent(getActivity(), PhotographActivity.class); - File fileElse = PhotoUtils.showPhotoFile("e", latLng); + File fileElse = PhotoUtils.showPhotoFile("e", new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude())); intentElse.putExtra(Constant.INTENT_PHOTO_PATH, fileElse.getPath()); startActivityForResult(intentElse, 105); break;