From 94526a9054c4381912e22c818121fd53b9453ad4 Mon Sep 17 00:00:00 2001
From: wangdongsheng <wds811@126.com>
Date: Fri, 3 Sep 2021 10:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E7=9A=84?=
 =?UTF-8?q?=E5=B8=A7=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/outdoor/activity/PictureActivity.java     | 2 +-
 .../com/navinfo/outdoor/adapter/StaySubmitAdapter.java    | 1 -
 app/src/main/res/layout/activity_picture.xml              | 8 ++++++--
 app/src/main/res/layout/activity_pictures.xml             | 4 ++--
 4 files changed, 9 insertions(+), 6 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 e586796..6718736 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java
@@ -212,7 +212,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
          * app:cameraVideoSizeMaxWidth="2000"
          * app:cameraVideoSizeMaxArea="2000000"
          */
-        camera.setVideoBitRate(2100000);
+        camera.setVideoBitRate(2073600);
         //获取地图
         tencentMap = ivMap.getMap();
         //tenementMap.setOnMapLoadedCallback();
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
index 6e67b3d..619d03a 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
@@ -35,7 +35,6 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
     }
 
     public void setAllRoad(List<PoiEntity> allRoad) {
-
         this.allRoad.clear();
         this.allRoad.addAll(allRoad);
         notifyDataSetChanged();
diff --git a/app/src/main/res/layout/activity_picture.xml b/app/src/main/res/layout/activity_picture.xml
index 2f631a7..72fb064 100644
--- a/app/src/main/res/layout/activity_picture.xml
+++ b/app/src/main/res/layout/activity_picture.xml
@@ -11,8 +11,12 @@
         android:layout_height="match_parent">
         <com.otaliastudios.cameraview.CameraView
             android:id="@+id/camera"
-            app:cameraVideoSizeMaxWidth="2500"
-            app:cameraVideoSizeMaxArea="2750000"
+            app:cameraVideoSizeMaxArea="3686400"
+            app:cameraVideoSizeMinArea="1166400"
+            app:cameraVideoSizeMaxHeight="1920"
+            app:cameraVideoSizeMinHeight="1080"
+            app:cameraVideoSizeMaxWidth="1920"
+            app:cameraVideoSizeMinWidth="1080"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:keepScreenOn="true"
diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml
index 1c2f7a5..04528bb 100644
--- a/app/src/main/res/layout/activity_pictures.xml
+++ b/app/src/main/res/layout/activity_pictures.xml
@@ -16,8 +16,8 @@
             android:id="@+id/camera"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:cameraPictureSizeMaxArea="1000000"
-            app:cameraPictureSizeMinArea="600000"
+            app:cameraPictureSizeMaxArea="921600"
+            app:cameraPictureSizeMinArea="518400"
             app:cameraPictureSizeMaxWidth="960"
             app:cameraPictureSizeMinHeight="720"
             app:cameraPictureSizeMinWidth="720"