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

Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk

Browse Source
This commit is contained in:
董宏宇
2021-05-18 11:50:52 +08:00
parent 2014441a62 83331bbaa5
commit a7c36a7910
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -146,7 +146,7 @@ MOGO_OCH_TAXI_VERSION=1.0.0
######## 外部依赖引用
# 车聊聊
CARCHATTING_VERSION=2.2.321
CARCHATTING_VERSION=2.2.324
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.1.11
# websocket

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

@@ -2,8 +2,9 @@
<LinearLayout 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="@dimen/dp_822"
android:layout_width="@dimen/module_v2x_road_event_window_width_vr"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center">
<androidx.constraintlayout.widget.ConstraintLayout

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

@@ -2,14 +2,14 @@
<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="@dimen/dp_822"
android:layout_height="@dimen/module_v2x_event_window_height_vr"
android:layout_width="@dimen/module_v2x_road_event_window_width_vr"
android:layout_height="@dimen/module_v2x_road_event_window_height_vr"
android:layout_marginTop="@dimen/dp_8">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvRoadEventList"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_event_window_height_vr"
android:layout_height="@dimen/module_v2x_road_event_window_height_vr"
android:minHeight="@dimen/module_v2x_event_window_height"
android:orientation="horizontal"
android:overScrollMode="never"

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_v2x_event_window_height_vr">227px</dimen>
<dimen name="module_v2x_road_event_window_width_vr">1100px</dimen>
<dimen name="module_v2x_road_event_window_height_vr">227px</dimen>
<dimen name="module_v2x_road_event_height">187px</dimen>
<dimen name="module_v2x_road_event_bg_radius">30px</dimen>
<dimen name="module_v2x_road_event_icon_width">133px</dimen>

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

@@ -97,7 +97,8 @@
<!--适配 V2X 弹窗-VR-->
<dimen name="module_v2x_event_button_size_detail_vr">80px</dimen>
<dimen name="module_v2x_event_window_height_vr">182px</dimen>
<dimen name="module_v2x_road_event_window_width_vr">882px</dimen>
<dimen name="module_v2x_road_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>