From 8e8ddd0bb155c136e6cae013c807789b4d9eefe3 Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Tue, 3 Aug 2021 18:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=81=93=E8=B7=AF=E5=BD=95?=
 =?UTF-8?q?=E5=83=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../navinfo/outdoor/activity/PictureActivity.java |  3 +--
 .../outdoor/activity/PicturesActivity.java        |  6 ++----
 .../outdoor/fragment/PoiVideoFragment.java        |  2 +-
 app/src/main/res/layout/activity_pictures.xml     | 15 ++++-----------
 app/src/main/res/layout/poi_video_fragment.xml    |  2 +-
 5 files changed, 9 insertions(+), 19 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 887272e..85fa795 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java
@@ -131,8 +131,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
 
         this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         ivMap = (TextureMapView) findViewById(R.id.iv_map);
-        btnVideo = findViewById(R.id.btn_video);
-        btnVideo.setOnClickListener(this::onClick);
+
         btnSwitch = (Button) findViewById(R.id.btn_switch);
         btnSwitch.setOnClickListener(this::onClick);
 //        capturePicture = (ImageButton) findViewById(R.id.capturePicture);
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 64d3e72..fa8c908 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
@@ -121,8 +121,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
 
        // this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         ivMap = (TextureMapView) findViewById(R.id.iv_map);
-        btnVideo = findViewById(R.id.btn_video);
-        btnVideo.setOnClickListener(this::onClick);
         btnSwitch = (Button) findViewById(R.id.btn_switch);
         btnSwitch.setOnClickListener(this::onClick);
 //        capturePicture = (ImageButton) findViewById(R.id.capturePicture);
@@ -304,8 +302,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
         DisplayMetrics dm = new DisplayMetrics();
         getWindowManager().getDefaultDisplay().getMetrics(dm);
         FrameLayout.LayoutParams layoutParamsMap = (FrameLayout.LayoutParams) ivMap.getLayoutParams();//相机的宽高
-        layoutParamsMap.height = dm.widthPixels/3;
-        layoutParamsMap.width = dm.heightPixels/3;
+        layoutParamsMap.height = dm.heightPixels/3;
+        layoutParamsMap.width = dm.widthPixels/3;
         ivMap.setLayoutParams(layoutParamsMap);
 
     }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
index 293a0aa..723d1f6 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
@@ -164,7 +164,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                     return;
                 }
                 File videoFile = (File) v.getTag();
-                Intent intent = new Intent(getContext(), PictureActivity.class);
+                Intent intent = new Intent(getContext(), PicturesActivity.class);
                 intent.putExtra(Constant.INTENT_VIDEO_PATH, videoFile.getAbsolutePath());
                 startActivityForResult(intent, 0x101);
             }
diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml
index 20af540..e1f8019 100644
--- a/app/src/main/res/layout/activity_pictures.xml
+++ b/app/src/main/res/layout/activity_pictures.xml
@@ -20,14 +20,14 @@
 
         <com.tencent.tencentmap.mapsdk.maps.TextureMapView
             android:id="@+id/iv_map"
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="157dp"
             app:layout_constraintHeight_default="percent"
-            app:layout_constraintHeight_percent="0.4"
+            app:layout_constraintHeight_percent="0.3"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintWidth_default="percent"
-            app:layout_constraintWidth_percent="0.4" />
+            app:layout_constraintWidth_percent="0.3" />
     </FrameLayout>
 
 
@@ -41,14 +41,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/btn_video"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="停止"
-        android:visibility="gone"
-        app:layout_constraintRight_toRightOf="@id/btn_switch"
-        app:layout_constraintTop_toBottomOf="@id/btn_switch" />
+
 
     <CheckBox
         android:id="@+id/capuretVideo"
diff --git a/app/src/main/res/layout/poi_video_fragment.xml b/app/src/main/res/layout/poi_video_fragment.xml
index f614746..788353c 100644
--- a/app/src/main/res/layout/poi_video_fragment.xml
+++ b/app/src/main/res/layout/poi_video_fragment.xml
@@ -147,7 +147,7 @@
 
         <ImageView
             android:id="@+id/iv_poi_video_picture"
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="100dp"
             android:layout_marginTop="10dp"
             app:layout_constraintLeft_toLeftOf="@id/ll_pictures"