yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ml' into dev_merge_shunyi_vr_map

Browse Source
This commit is contained in:
liujing
2020-12-21 15:45:36 +08:00
parent 181ab87807 28506234ad
commit 4534b61cf1
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-extensions/src/main/res/values/dimens.xml
View File

@@ -88,7 +88,7 @@
<!-- module_map_layout_navi_info_panel.xml-->
<dimen name="module_ext_top_view_width">1058px</dimen>
<dimen name="module_ext_top_view_width_in_vr_mode">760px</dimen>
<dimen name="module_ext_top_view_width_in_vr_mode">822px</dimen>
<dimen name="module_ext_top_view_no_link_width_in_vr_mode">700px</dimen>
<dimen name="module_ext_navi_info_panel_width">544px</dimen>
<dimen name="module_ext_navi_info_panel_height">117px</dimen>

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_tip_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 86 KiB

26
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
View File

@@ -2,20 +2,20 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_120"
android:background="@drawable/v2x_bg_pop_up"
android:clipChildren="true"
app:roundLayoutRadius="@dimen/dp_20">
android:layout_width="@dimen/dp_822"
android:layout_height="@dimen/dp_182"
android:background="@drawable/v2x_tip_bg"
android:clipChildren="true">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivEventImg"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_42"
android:scaleType="fitXY"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:miv_failureHolder="@drawable/v2x_icon_live_logo"
app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
app:miv_placeHolder="@drawable/v2x_icon_live_logo"
@@ -37,7 +37,8 @@
android:id="@+id/tvEventTypeTitle"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_40"
android:layout_alignBottom="@+id/ivEventImg"
android:layout_marginStart="@dimen/dp_31"
android:layout_marginBottom="@dimen/dp_42"
android:background="@drawable/bg_v2x_event_type_red_vr"
android:gravity="center"
android:paddingLeft="@dimen/dp_10"
@@ -108,11 +109,12 @@
android:id="@+id/rightLinear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_34"
android:layout_marginBottom="@dimen/dp_26"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvEventAddress"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@@ -202,8 +204,10 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/rightLinear"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/ivEventImg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.363"
tools:text="东城区北三环中路辅路小黄庄路口当前位置属于测试数据,看一下换行" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
View File

@@ -2,9 +2,9 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_28">
android:layout_width="@dimen/dp_822"
android:layout_height="@dimen/dp_182"
android:layout_marginTop="@dimen/dp_8">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvRoadEventList"

2
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -87,7 +87,7 @@
<!--适配 V2X 弹窗-VR-->
<dimen name="module_v2x_event_button_size_detail_vr">80px</dimen>
<dimen name="module_v2x_event_window_height_vr">120px</dimen>
<dimen name="module_v2x_event_window_height_vr">182px</dimen>
<dimen name="module_v2x_event_button_size_vr">64px</dimen>
<dimen name="module_v2x_event_icon_size_vr">60px</dimen>