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

增加室内整理工具更新信息逻辑

Browse Source
This commit is contained in:
qiji4215
2023-07-17 14:49:21 +08:00
parent 1253cc10be
commit 6210f41b69
15 changed files with 155 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,72 +165,6 @@
android:onClick="@{()->mainActivity.onClickMenu()}" />
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/main_activity_flow_indoor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/top_right_drawer_btns_mr"
app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_media_flag,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next,main_activity_menu_indoor_group"
app:flow_horizontalGap="6dp"
app:flow_wrapMode="aligned"
app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Group
android:id="@+id/main_activity_menu_indoor_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_media_flag,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next" />
<ImageButton
android:id="@+id/main_activity_snapshot_finish"
style="@style/top_right_drawer_btns_style"
android:clickable="true"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_finish"
tools:ignore="MissingConstraints" />
<ImageButton
android:id="@+id/main_activity_trace_snapshot_points"
style="@style/top_right_drawer_btns_style"
android:focusable="true"
android:src="@drawable/map_trace_select_point"
tools:ignore="MissingConstraints" />
<ImageButton
android:id="@+id/main_activity_snapshot_media_flag"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_mediaflag"
tools:ignore="MissingConstraints" />
<ImageButton
android:id="@+id/main_activity_snapshot_rewind"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_forward"
tools:ignore="MissingConstraints" />
<ImageButton
android:id="@+id/main_activity_snapshot_pause"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_pause"
tools:ignore="DuplicateIds,MissingConstraints" />
<ImageButton
android:id="@+id/main_activity_snapshot_next"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_next"
tools:ignore="DuplicateIds,MissingConstraints" />
<androidx.constraintlayout.widget.Barrier
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -394,6 +328,67 @@
android:layout_height="wrap_content"
app:constraint_referenced_ids="main_activity_right_fragment,main_activity_middle_fragment" />
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/main_activity_flow_indoor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/five"
app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_media_flag,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next,main_activity_menu_indoor_group"
app:flow_horizontalGap="6dp"
app:flow_wrapMode="aligned"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet" />
<androidx.constraintlayout.widget.Group
android:id="@+id/main_activity_menu_indoor_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_media_flag,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next" />
<ImageButton
android:id="@+id/main_activity_snapshot_finish"
style="@style/top_right_drawer_btns_style"
android:clickable="true"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_finish" />
<ImageButton
android:id="@+id/main_activity_trace_snapshot_points"
style="@style/top_right_drawer_btns_style"
android:focusable="true"
android:src="@drawable/map_trace_select_point" />
<ImageButton
android:id="@+id/main_activity_snapshot_media_flag"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_mediaflag" />
<ImageButton
android:id="@+id/main_activity_snapshot_rewind"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_forward" />
<ImageButton
android:id="@+id/main_activity_snapshot_pause"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_pause" />
<ImageButton
android:id="@+id/main_activity_snapshot_next"
style="@style/top_right_drawer_btns_style"
android:enabled="false"
android:focusable="true"
android:src="@drawable/map_trace_next" />
<View
android:id="@+id/main_activity_bottom_sheet"
android:layout_width="60dp"
@@ -536,6 +531,7 @@
main_activity_bottom_sheet_bg,
main_bottom_task,main_bottom_home" />
<FrameLayout
android:id="@+id/console_fragment_layout"
android:layout_width="0dp"

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

@@ -150,6 +150,7 @@
android:layout_gravity="right|bottom"
android:layout_margin="10dp"
android:paddingLeft="@dimen/five"
android:visibility="invisible"
android:textColor="@color/white"
android:text="录像"
android:button="@drawable/chk_icon_camera_record_or_takephoto_xml"

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

@@ -278,7 +278,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="轨迹回放"
android:text="室内整理"
android:textColor="@color/white"
android:textSize="15sp"
app:layout_constraintLeft_toLeftOf="@id/console_track_icon_bg"

12
app/src/main/res/menu/personal_center_menu.xml
View File

@@ -7,6 +7,7 @@
<item
android:id="@+id/personal_center_menu_offline_map"
android:icon="@drawable/baseline_map_24"
android:visible="false"
android:title="离线地图" />
<item
android:id="@+id/personal_center_menu_obtain_data"
@@ -16,7 +17,7 @@
<item
android:id="@+id/personal_center_menu_import_data"
android:icon="@drawable/ic_baseline_import_export_24"
android:visible="true"
android:visible="false"
android:title="导入数据" />
<item
android:id="@+id/personal_center_menu_import_yuan_data"
@@ -25,14 +26,19 @@
<item
android:id="@+id/personal_center_menu_scan_qr_code"
android:icon="@drawable/ic_baseline_scatter_plot_24"
android:title="扫一扫" />
android:title="扫码连电脑" />
<item
android:id="@+id/personal_center_menu_scan_indoor_data"
android:icon="@drawable/ic_baseline_scatter_plot_24"
android:title="室内整理" />
<item
android:visible="false"
android:icon="@drawable/ic_baseline_sim_card_download_24"
android:title="备份数据" />
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
android:title="版本：ONE_QE_V1.1.0_20230630_A" />
android:title="版本：ONE_QE_V1.2.0_20230707_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">