diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index 69c28da..c0f974b 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -99,6 +99,7 @@ public class MainActivity extends BaseActivity { } + private void initPermission() { XXPermissions.with(this) // 申请安装包权限 @@ -134,7 +135,7 @@ public class MainActivity extends BaseActivity { Constant.initRootFolder(Constant.USHERED); HttpInterface.initHttpInter(Constant.USHERED); initCheckVersion(); - } else { + }else { initTime(); } //initTime(); @@ -142,12 +143,11 @@ public class MainActivity extends BaseActivity { initPermission(); } } - @Override public void onDenied(List permissions, boolean never) { if (never) { DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - DialogSettings.cancelable = false; + DialogSettings.cancelable=false; MessageDialog.show(MainActivity.this, "提示", permissions.toString() + " 被永久拒绝授权请手动授权,", "确定").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { @@ -179,7 +179,7 @@ public class MainActivity extends BaseActivity { dismissLoadingDialog(); if (response.getCode() == 200) { int version = response.getBody().getVersion(); - if (versionCode < version) {//TODO 改成 + if (versionCode ();//存储轨迹的marker - if (poiEntity.getId() != null) { - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); - if (fileListByUUID != null) { - List lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID); - for (int i = 0; i < lineStringByFileList.size(); i++) { - LatLng latLng = lineStringByFileList.get(i); - if (latLng != null) { - BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.ic_baseline); - Marker marker = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor).alpha(0.9f) - .flat(true) - .clockwise(false)); - removables.add(marker); + if (poiEntity!=null){ + if (poiEntity.getId() != null) { + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); + if (fileListByUUID != null) { + List lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID); + for (int i = 0; i < lineStringByFileList.size(); i++) { + LatLng latLng = lineStringByFileList.get(i); + if (latLng != null) { + BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.ic_baseline); + Marker marker = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor).alpha(0.9f) + .flat(true) + .clockwise(false)); + removables.add(marker); + } } } } } + //相机预览监听 camera.addCameraListener(new CameraListener() { @Override @@ -379,6 +382,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene ivMap.setLayoutParams(layoutParamsMap); } private void initLine() { + if (poiEntity!=null){ String geoWkt = poiEntity.getGeoWkt(); if (geoWkt != null) { String geo = Geohash.getInstance().decode(geoWkt); @@ -408,6 +412,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene polyline.setZIndex(2); } } + } } // 将秒转化成小时分钟秒 diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java index 8c03480..65f6d29 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java @@ -46,7 +46,6 @@ public class PoiTaskAdapter extends RecyclerView.Adapter