xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'OutDoor/master'

Browse Source
This commit is contained in:
wds 2021-08-03 19:00:09 +08:00
commit 30ad378cde
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java
View File

@ -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);

6
app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
View File

@ -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);
}

2
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@ -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);
}

15
app/src/main/res/layout/activity_pictures.xml
View File

@ -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"

2
app/src/main/res/layout/poi_video_fragment.xml
View File

@ -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"