From 0a91a39c6fbe66e8383a2ecf5a70dd8f4b7f8ccb Mon Sep 17 00:00:00 2001 From: wds Date: Fri, 20 Aug 2021 18:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=95=E5=83=8F=E5=B8=A7?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/activity/PictureActivity.java | 37 ++++--------------- .../outdoor/activity/PicturesActivity.java | 29 --------------- app/src/main/res/layout/activity_picture.xml | 2 + 3 files changed, 10 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java index d3d5fd1..e7293c6 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -205,35 +205,14 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene stopVideo = findViewById(R.id.btn_stop_video); stopVideo.setOnClickListener(this::onClick); - //拍照权限 - camera.setLifecycleOwner(this); - camera.setEngine(Engine.CAMERA1); -// camera.setVideoBitRate(5); - camera.setPreviewFrameRate(5); // 设置预览视频的帧率 - - - // 设置视频可用的宽高size - SizeSelector width = SizeSelectors.maxWidth(1920); - SizeSelector height = SizeSelectors.maxHeight(1440); - SizeSelector dimensions = SizeSelectors.and(width, height); // Matches sizes bigger than 1000x2000. - // 获取屏幕信息 - int[] density = DensityUtil.getDeviceInfo(this); - int x = 1920, y = 1440; - if (density != null && density.length > 1) { - x = (density[0] >= density[1] ? density[0] : density[1]); - y = (density[0] >= density[1] ? density[1] : density[0]); - } - SizeSelector ratio = SizeSelectors.aspectRatio(AspectRatio.of(x, y), 0); // Matches 1:1 sizes. - - SizeSelector result = SizeSelectors.or( - SizeSelectors.and(ratio, dimensions), // Try to match both constraints - ratio, // If none is found, at least try to match the aspect ratio - SizeSelectors.biggest() // If none is found, take the biggest - ); - camera.setVideoSize(result); - camera.setVideoBitRate(1920 * 1440); -// camera.setAudioBitRate(); - + /** + * camera.setVideoBitRate(2000000); + * 设置帧率 + * 在清单文件核心代码 + * app:cameraVideoSizeMaxWidth="2000" + * app:cameraVideoSizeMaxArea="2000000" + */ + camera.setVideoBitRate(2000000); //获取地图 tencentMap = ivMap.getMap(); 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 3d6b790..f74a87b 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -186,35 +186,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen stopPicture = findViewById(R.id.btn_stop_picture); stopPicture.setOnClickListener(this::onClick); - //拍照权限 - camera.setLifecycleOwner(this); - camera.setEngine(Engine.CAMERA1); -// camera.setVideoBitRate(5); - camera.setPreviewFrameRate(5); // 设置预览视频的帧率 - - - // 设置视频可用的宽高size - SizeSelector width = SizeSelectors.maxWidth(1920); - SizeSelector height = SizeSelectors.maxHeight(1440); - SizeSelector dimensions = SizeSelectors.and(width, height); // Matches sizes bigger than 1000x2000. - // 获取屏幕信息 - int[] density = DensityUtil.getDeviceInfo(this); - int x = 1920, y = 1440; - if (density != null && density.length > 1) { - x = (density[0] >= density[1] ? density[0] : density[1]); - y = (density[0] >= density[1] ? density[1] : density[0]); - } - SizeSelector ratio = SizeSelectors.aspectRatio(AspectRatio.of(x, y), 0); // Matches 1:1 sizes. - - SizeSelector result = SizeSelectors.or( - SizeSelectors.and(ratio, dimensions), // Try to match both constraints - ratio, // If none is found, at least try to match the aspect ratio - SizeSelectors.biggest() // If none is found, take the biggest - ); - camera.setVideoSize(result); - camera.setVideoBitRate(1920 * 1440); -// camera.setAudioBitRate(); - //获取地图 tencentMap = ivMap.getMap(); //获取地图UI 设置对象 diff --git a/app/src/main/res/layout/activity_picture.xml b/app/src/main/res/layout/activity_picture.xml index 95752ac..0facc2e 100644 --- a/app/src/main/res/layout/activity_picture.xml +++ b/app/src/main/res/layout/activity_picture.xml @@ -11,6 +11,8 @@ android:layout_height="match_parent">