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

更新资源文件，适配相机显示内容

Browse Source
This commit is contained in:
qiji4215
2023-04-25 15:46:32 +08:00
parent 9fb85862db
commit 95aefba06a
48 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@
android:layout_marginLeft="160dp"
android:layout_marginTop="20dp"
android:onClick="@{()->mainActivity.openCamera()}"
android:src="@mipmap/icon_page_video_a1"
android:src="@drawable/icon_page_video_a1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

66
app/src/main/res/layout/connect_out_camera.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/fl_layout"
android:background="@color/white"
android:background="@android:color/white"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="15dp"
@@ -43,7 +43,7 @@
android:layout_centerVertical="true"
android:text="默认外设相机拍照"
android:textColor="@android:color/black"
android:textSize="15sp" />
android:textSize="@dimen/default_font_size" />
<CheckBox
android:id="@+id/select_camera"
@@ -81,7 +81,7 @@
android:layout_marginBottom="1dp"
android:padding="@dimen/ten"
android:text="一键连接"
android:textSize="@dimen/card_title_font_2size" />
android:textSize="@dimen/default_font_size" />
</LinearLayout>
<FrameLayout
@@ -92,35 +92,23 @@
android:background="@color/bg_gray2">
<CheckBox
android:id="@+id/startorendtakepicture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:button="@drawable/chk_icon_camera_start_stop_xml"
android:checked="true"
android:enabled="false" />
<SurfaceView
android:id="@+id/video"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:background="@color/bg_gray2"
android:fitsSystemWindows="true"
android:visibility="gone" />
<CheckBox
android:id="@+id/takephoto_or_record"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:layout_margin="10dp"
android:button="@drawable/chk_icon_camera_record_or_takephoto_xml"
android:checked="true"
android:paddingLeft="@dimen/five"
android:text="录像"
android:textColor="@color/white" />
<ImageView
android:id="@+id/video_defalut"
android:layout_width="148.5dp"
android:layout_height="@dimen/camear_dialog_iv_hight"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/camear_dialog_iv_margin_top"
android:src="@mipmap/icon_camera_img" />
android:src="@drawable/icon_camera_img" />
<LinearLayout
android:layout_width="fill_parent"
@@ -134,7 +122,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/five"
android:src="@mipmap/icon_camera_time" />
android:src="@drawable/icon_camera_time" />
<TextView
android:layout_width="wrap_content"
@@ -147,14 +135,26 @@
</LinearLayout>
<SurfaceView
android:id="@+id/video"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:background="@color/bg_gray2"
android:fitsSystemWindows="true"
android:visibility="gone" />
<CheckBox
android:id="@+id/startorendtakepicture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:button="@drawable/chk_icon_camera_start_stop_xml"
android:checked="true"
android:enabled="false" />
<CheckBox
android:id="@+id/takephoto_or_record"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:layout_margin="10dp"
android:paddingLeft="@dimen/five"
android:textColor="@color/white"
android:text="录像"
android:button="@drawable/chk_icon_camera_record_or_takephoto_xml"
android:checked="true" />
</FrameLayout>
</RelativeLayout>