merge origin dev2_aiSdk
This commit is contained in:
@@ -237,6 +237,7 @@
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_22"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnTriggerWarningEvent"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -426,7 +427,21 @@
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:background="#00BCD4"
|
||||
android:padding="@dimen/dp_10"
|
||||
android:text="障碍物绕行"
|
||||
android:text="车路云场景预警-左侧"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_22"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnAdasDataWarn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:background="#8BC34A"
|
||||
android:padding="@dimen/dp_10"
|
||||
android:text="车路云场景预警-右侧"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_22"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
@@ -440,7 +455,7 @@
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:background="#009688"
|
||||
android:padding="@dimen/dp_10"
|
||||
android:text="行人预警,行人路线预测"
|
||||
android:text="车路云场景预警-前方行人"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_22"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
@@ -473,21 +488,6 @@
|
||||
android:textSize="@dimen/dp_22"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnAdasDataWarn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:background="#8BC34A"
|
||||
android:padding="@dimen/dp_10"
|
||||
android:text="adas预警数据发送"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_22"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</com.google.android.flexbox.FlexboxLayout>
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"type": 10013,
|
||||
"lat": 39.977148,
|
||||
"lon": 116.417478,
|
||||
"lon": 116.417886,
|
||||
"distance": 2,
|
||||
"collisionLat": 39.977094,
|
||||
"collisionLon": 116.417634,
|
||||
@@ -11,13 +11,13 @@
|
||||
"lon": 116.417651
|
||||
},
|
||||
{
|
||||
"lat": 39.976874,
|
||||
"lon": 116.417757
|
||||
"lat": 39.976858,
|
||||
"lon": 116.417683
|
||||
}
|
||||
],
|
||||
"from": 1,
|
||||
"angle": 0,
|
||||
"direction": 1,
|
||||
"direction": 3,
|
||||
"speed": 11.108121,
|
||||
"targetColor": "#FF4040",
|
||||
"stopLineDistance": 60,
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
"type": 10013,
|
||||
"lat": 39.977148,
|
||||
"lon": 116.417478,
|
||||
"distance": 2,
|
||||
"collisionLat": 39.977094,
|
||||
"collisionLon": 116.417634,
|
||||
"stopLines": [
|
||||
{
|
||||
"lat": 39.976858,
|
||||
"lon": 116.417651
|
||||
},
|
||||
{
|
||||
"lat": 39.976874,
|
||||
"lon": 116.417757
|
||||
}
|
||||
],
|
||||
"from": 1,
|
||||
"angle": 0,
|
||||
"direction": 3,
|
||||
"speed": 11.108121,
|
||||
"targetColor": "#FF4040",
|
||||
"stopLineDistance": 60,
|
||||
"warningContent": "小心行人",
|
||||
"heading": 0,
|
||||
"showTime": 8000,
|
||||
"roadwidth": 4.0,
|
||||
"carLocation": {
|
||||
"lat": 39.97665425,
|
||||
"lon": 116.41769983
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
"type": 10013,
|
||||
"lat": 39.977148,
|
||||
"lon": 116.417886,
|
||||
"distance": 2,
|
||||
"collisionLat": 39.977094,
|
||||
"collisionLon": 116.417634,
|
||||
"stopLines": [
|
||||
{
|
||||
"lat": 39.976858,
|
||||
"lon": 116.417651
|
||||
},
|
||||
{
|
||||
"lat": 39.976858,
|
||||
"lon": 116.417683
|
||||
}
|
||||
],
|
||||
"from": 1,
|
||||
"angle": 0,
|
||||
"direction": 1,
|
||||
"speed": 11.108121,
|
||||
"targetColor": "#FF4040",
|
||||
"stopLineDistance": 60,
|
||||
"warningContent": "小心行人",
|
||||
"heading": 0,
|
||||
"showTime": 8000,
|
||||
"roadwidth": 4.0,
|
||||
"carLocation": {
|
||||
"lat": 39.97665425,
|
||||
"lon": 116.41769983
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user