修改拍照界面
This commit is contained in:
@@ -48,7 +48,7 @@
|
||||
android:background="@android:color/transparent"
|
||||
app:layout_constraintHeight_default="percent"
|
||||
app:layout_constraintHeight_percent="0.4"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintWidth_default="percent"
|
||||
app:layout_constraintWidth_percent="0.4" />
|
||||
@@ -80,26 +80,36 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_add"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginEnd="25dp"
|
||||
android:src="@mipmap/zoom_add"
|
||||
<LinearLayout
|
||||
android:id="@+id/layer_map_controller"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@+id/btn_stop_picture"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
app:layout_constraintBottom_toTopOf="@id/btn_stop_picture"
|
||||
app:layout_constraintRight_toRightOf="parent">
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_add"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:src="@drawable/ic_baseline_add_24"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
app:layout_constraintBottom_toTopOf="@+id/btn_stop_picture"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_del"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:src="@mipmap/zoom_del"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_del"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
android:src="@drawable/ic_baseline_sub_24"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
|
||||
|
||||
<!--<CheckBox
|
||||
android:id="@+id/cb_map_type"
|
||||
@@ -113,88 +123,95 @@
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />-->
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_location"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:src="@mipmap/location_auto_pic"
|
||||
android:padding="8dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
|
||||
<ImageView
|
||||
android:id="@+id/iv_location"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
android:src="@drawable/ic_baseline_location_searching_24"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/btn_switch"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:layout_marginTop="35dp"
|
||||
android:src="@drawable/selector_picture_map_change"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_marginRight="@dimen/default_widget_padding"
|
||||
android:text="切换"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_setting"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
android:text="设置"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_switch"
|
||||
app:layout_constraintRight_toRightOf="parent"></Button>
|
||||
|
||||
<Switch
|
||||
android:id="@+id/location_switch"
|
||||
android:text="启用定位"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:checked="true"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_setting"
|
||||
app:layout_constraintRight_toRightOf="parent"></Switch>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_navi_distance"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:src="@drawable/selector_navi_distance"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="按距离自动导航"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_margin="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/location_switch"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_road_direction"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:visibility="gone"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="起点方向捕捉"
|
||||
android:src="@drawable/selector_direction"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_margin="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/img_navi_distance"></ImageView>
|
||||
android:layout_marginTop="@dimen/fab_margin"
|
||||
android:orientation="vertical">
|
||||
<ImageView
|
||||
android:id="@+id/btn_switch"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:src="@drawable/selector_camera_switch"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:text="切换"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_location_type"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="定位方式"
|
||||
android:src="@drawable/selector_location_type"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_margin="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/img_road_direction"></ImageView>
|
||||
<ImageView
|
||||
android:id="@+id/img_navi_distance"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:src="@drawable/selector_navi_distance"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="按距离自动导航"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_road_direction"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:visibility="gone"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="起点方向捕捉"
|
||||
android:src="@drawable/selector_direction"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/img_navi_distance"></ImageView>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_location_type"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="定位方式"
|
||||
android:src="@drawable/selector_location_type"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/img_road_direction"></ImageView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_setting"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
android:text="设置"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_switch"
|
||||
app:layout_constraintRight_toRightOf="parent"></Button>
|
||||
|
||||
<Switch
|
||||
android:id="@+id/location_switch"
|
||||
android:text="启用定位"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:checked="true"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_setting"
|
||||
app:layout_constraintRight_toRightOf="parent"></Switch>
|
||||
</LinearLayout>
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/radio_group_picture"
|
||||
|
||||
@@ -78,27 +78,36 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_add"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginEnd="25dp"
|
||||
android:src="@mipmap/zoom_add"
|
||||
<LinearLayout
|
||||
android:id="@+id/layer_map_controller"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@+id/btn_stop_picture"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
app:layout_constraintBottom_toTopOf="@id/btn_stop_picture"
|
||||
app:layout_constraintRight_toRightOf="parent">
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_add"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:src="@drawable/ic_baseline_add_24"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
app:layout_constraintBottom_toTopOf="@+id/btn_stop_picture"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_del"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:src="@mipmap/zoom_del"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_del"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
android:src="@drawable/ic_baseline_sub_24"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
|
||||
|
||||
<!--<CheckBox
|
||||
android:id="@+id/cb_map_type"
|
||||
@@ -112,49 +121,59 @@
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />-->
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_location"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:src="@mipmap/mine_location"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
|
||||
<ImageView
|
||||
android:id="@+id/iv_location"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
android:src="@drawable/ic_baseline_location_searching_24"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/btn_switch"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="25dp"
|
||||
android:layout_marginEnd="25dp"
|
||||
android:text="切换"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:src="@mipmap/switcher"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_setting"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="设置"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_switch"
|
||||
app:layout_constraintRight_toRightOf="parent"></Button>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_location_type"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="定位方式"
|
||||
android:src="@drawable/selector_location_type"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="@dimen/fab_margin"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_margin="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_setting"></ImageView>
|
||||
android:orientation="vertical">
|
||||
<ImageView
|
||||
android:id="@+id/btn_switch"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="切换"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:src="@drawable/selector_camera_switch"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_setting"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="设置"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_switch"
|
||||
app:layout_constraintRight_toRightOf="parent"></Button>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_location_type"
|
||||
android:layout_width="@dimen/default_round_widget"
|
||||
android:layout_height="@dimen/default_round_widget"
|
||||
android:background="@drawable/selector_round_bg"
|
||||
android:text="定位方式"
|
||||
android:src="@drawable/selector_location_type"
|
||||
android:padding="@dimen/default_widget_padding"
|
||||
android:layout_marginTop="@dimen/default_widget_padding"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_setting"></ImageView>
|
||||
</LinearLayout>
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/radio_group_picture"
|
||||
|
||||
Reference in New Issue
Block a user