diff --git a/app/build.gradle b/app/build.gradle index 5b2618b..072a42c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 25 - versionName "8.220812" + versionCode 26 + versionName "8.220815" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java index 090f2e9..c23d3c7 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -1085,7 +1085,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic } private Bitmap getBitMap() { - Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.location_north_fill); + Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.locaiton_auto_pictures); int width = bitmap.getWidth(); int height = bitmap.getHeight(); int newWidth = 55; diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java index 55684ab..64bec43 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -235,10 +235,12 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen ivPicVideoImage.setVisibility(View.VISIBLE); ivPicRoadImage.setVisibility(View.GONE); radioPicture = 3; - } else if (type == 4) {//道路2秒 + radioBtnAutoSec.setChecked(true); + } else if (type == 4) {//道路1秒2张 ivPicRoadImage.setVisibility(View.VISIBLE); ivPicVideoImage.setVisibility(View.GONE); - radioPicture = 3; + radioPicture = 4; + radioBtnHalfSec.setChecked(true); } radioGroupPicture.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { @Override @@ -282,7 +284,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen ivLocation.setOnClickListener(this); camera = findViewById(R.id.camera); CameraOptions cameraOptions = camera.getCameraOptions(); - camera.setPreviewFrameRate(FRAMENESS); camera.setSnapshotMaxWidth(1920); camera.setSnapshotMaxHeight(1440); camera.setOnClickListener(this); @@ -621,8 +622,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen break; case R.id.btn_switch: picturesBuilder.append(TimestampUtil.time()).append(",").append("onClick 点击了切换按钮 ,"); - v.setEnabled(false); - handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息 benSwitch(); break; case R.id.iv_zoom_add://放大 @@ -752,6 +751,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen super.onResume(); camera.open(); tvMapView.onResume(); + camera.setPreviewFrameRate(FRAMENESS); } /** @@ -1110,9 +1110,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen // 设置当前界面亮度 private void setWindowBrightness(int brightness) { - Window window = getWindow(); - WindowManager.LayoutParams lp = window.getAttributes(); - lp.screenBrightness = brightness / 255.0f; - window.setAttributes(lp); +// Window window = getWindow(); +// WindowManager.LayoutParams lp = window.getAttributes(); +// lp.screenBrightness = brightness / 255.0f; +// window.setAttributes(lp); } } \ No newline at end of file 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 8ec29dd..ddc0e5c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -783,7 +783,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (getPhoneBean.getCode() == 200) { String code = getPhoneBean.getBody().getCode(); Integer telLength = getPhoneBean.getBody().getTelLength(); - if (!Constant.CODE.equals(code)) { + if (code!=null&&!Constant.CODE.equals(code)) { DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override 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 4759e34..8a08217 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -615,7 +615,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (getPhoneBean.getCode() == 200) { String code = getPhoneBean.getBody().getCode(); Integer telLength = getPhoneBean.getBody().getTelLength(); - if (!Constant.CODE.equals(code)) { + if (code!=null&&!Constant.CODE.equals(code)) { DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index bd952db..e229f41 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -514,52 +514,65 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } // 设置亮度和摄像机刷新率 - CustomDialog.show((AppCompatActivity) getActivity(), R.layout.camera_setting_pre, new CustomDialog.OnBindView() { - @Override - public void onBind(CustomDialog dialog, View v) { - SharedPreferences sharedPreferences = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE); - int brightness = sharedPreferences.getInt("brightness", 40); - EditText edtBrightness = v.findViewById(R.id.edt_camera_setting_brightness); - edtBrightness.setText(brightness+""); - - int framness = sharedPreferences.getInt("framness", 30); - EditText edtFramness = v.findViewById(R.id.edt_camera_setting_framness); - edtFramness.setText(framness+""); - - Button btnConfirm = v.findViewById(R.id.btn_camera_setting_confirm); - btnConfirm.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - SharedPreferences.Editor editor = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE).edit(); - if (!edtBrightness.getText().toString().isEmpty()) { - int b = Integer.parseInt(edtBrightness.getText().toString()); - editor.putInt("brightness", b); - } - if (!edtFramness.getText().toString().isEmpty()) { - int f = Integer.parseInt(edtFramness.getText().toString()); - editor.putInt("framness", f); - } - editor.commit(); - Toast.makeText(getActivity(), "设置完成", Toast.LENGTH_SHORT).show(); - - Intent intent = new Intent(getContext(), PicturesActivity.class); - File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath()); - intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath()); - intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()); - intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); - intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); - int gpsRssi = Constant.currentLocation.getGPSRssi(); - if (gpsRssi == 0) { - intent.putExtra(Constant.INTENT_BOOLEAN, false); - } else { - intent.putExtra(Constant.INTENT_BOOLEAN, true); - } - startActivityForResult(intent, 0x101); - dialog.doDismiss(); - } - }); - } - }).setFullScreen(true); +// CustomDialog.show((AppCompatActivity) getActivity(), R.layout.camera_setting_pre, new CustomDialog.OnBindView() { +// @Override +// public void onBind(CustomDialog dialog, View v) { +// SharedPreferences sharedPreferences = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE); +// int brightness = sharedPreferences.getInt("brightness", 40); +// EditText edtBrightness = v.findViewById(R.id.edt_camera_setting_brightness); +// edtBrightness.setText(brightness+""); +// +// int framness = sharedPreferences.getInt("framness", 30); +// EditText edtFramness = v.findViewById(R.id.edt_camera_setting_framness); +// edtFramness.setText(framness+""); +// +// Button btnConfirm = v.findViewById(R.id.btn_camera_setting_confirm); +// btnConfirm.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// SharedPreferences.Editor editor = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE).edit(); +// if (!edtBrightness.getText().toString().isEmpty()) { +// int b = Integer.parseInt(edtBrightness.getText().toString()); +// editor.putInt("brightness", b); +// } +// if (!edtFramness.getText().toString().isEmpty()) { +// int f = Integer.parseInt(edtFramness.getText().toString()); +// editor.putInt("framness", f); +// } +// editor.commit(); +// Toast.makeText(getActivity(), "设置完成", Toast.LENGTH_SHORT).show(); +// +// Intent intent = new Intent(getContext(), PicturesActivity.class); +// File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath()); +// intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath()); +// intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()); +// intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); +// intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); +// int gpsRssi = Constant.currentLocation.getGPSRssi(); +// if (gpsRssi == 0) { +// intent.putExtra(Constant.INTENT_BOOLEAN, false); +// } else { +// intent.putExtra(Constant.INTENT_BOOLEAN, true); +// } +// startActivityForResult(intent, 0x101); +// dialog.doDismiss(); +// } +// }); +// } +// }).setFullScreen(true); + Intent intent = new Intent(getContext(), PicturesActivity.class); + File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath()); + intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath()); + intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()); + intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); + intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); + int gpsRssi = Constant.currentLocation.getGPSRssi(); + if (gpsRssi == 0) { + intent.putExtra(Constant.INTENT_BOOLEAN, false); + } else { + intent.putExtra(Constant.INTENT_BOOLEAN, true); + } + startActivityForResult(intent, 0x101); break; case R.id.road_upload: roadBuilder.append(TimestampUtil.time()).append(",").append("点击了上传的按钮 ,"); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index e3b7582..a02ca76 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -302,8 +302,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen }); imgAutoMatchRoad = findViewById(R.id.iv_auto_match_road); - // 如果当前用户的level为1或2，自动采集功能才会开放 - if (Constant.LEVEL == 1||Constant.LEVEL==2) { + // 如果当前用户的level为1或2、3，自动采集功能才会开放 + if (Constant.LEVEL == 1||Constant.LEVEL==2||Constant.LEVEL==3) { imgAutoMatchRoad.setVisibility(View.VISIBLE); } imgAutoMatchRoad.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/drawable-hdpi/locaiton_auto_pictures.png b/app/src/main/res/drawable-hdpi/locaiton_auto_pictures.png new file mode 100644 index 0000000..03d5a6a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/locaiton_auto_pictures.png differ diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml index 260ff12..c4911c2 100644 --- a/app/src/main/res/layout/activity_pictures.xml +++ b/app/src/main/res/layout/activity_pictures.xml @@ -126,9 +126,10 @@ android:id="@+id/btn_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="20dp" + android:layout_marginTop="25dp" android:layout_marginEnd="25dp" android:text="切换" + android:padding="@dimen/default_widget_padding" android:src="@mipmap/switcher" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />