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 @@ + app:layout_constraintWidth_percent="0.3" /> @@ -41,14 +41,7 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> -