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

Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9

Browse Source 
# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
This commit is contained in:
wangcongtao
2021-01-05 19:27:13 +08:00
parent 40afbccfcc 8be440d6b2
commit e6600df3a3
570 changed files with 644 additions and 10499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
View File

@@ -197,14 +197,14 @@
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/btnTriggerPrejectedRoadEvent"
android:id="@+id/btnTriggerRecommendRouteEvent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:background="#3100E2"
android:padding="@dimen/dp_10"
android:text="触发基于目的地预测的道路事件"
android:text="触发基于目的地预测的线路推荐"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_22"
app:layout_constraintBottom_toBottomOf="parent"