fix: 合并代码

This commit is contained in:
xiaoyan 2023-11-20 10:49:48 +08:00
commit aaaef022ea

View File

@ -522,11 +522,11 @@ public class AutoTakePicture4PoiVideoActivity extends BaseActivity implements Vi
super.onPictureTaken(result);
System.out.println("收到拍照按钮jieguo:"+result.getSize().toString());
// poi录像不强制要求必须为横向拍照
// if (Objects.requireNonNull(camera.getSnapshotSize()).getWidth() < camera.getSnapshotSize().getHeight()) {
// ToastUtils.Message(AutoTakePicture4PoiVideoActivity.this, "不允许竖向拍摄...");
// systemTTS.playText("不允许竖向拍摄");
// return;
// }
if (Objects.requireNonNull(camera.getSnapshotSize()).getWidth() < camera.getSnapshotSize().getHeight()) {
ToastUtils.Message(AutoTakePicture4PoiVideoActivity.this, "不允许竖向拍摄...");
systemTTS.playText("不允许竖向拍摄");
return;
}
File tmpPicFolder = new File(tmpPicFoldPath);
if (!tmpPicFolder.exists()) {