diff --git a/core/function-impl/mogo-core-function-hmi/src/main/assets/digital-7.ttf b/core/function-impl/mogo-core-function-hmi/src/main/assets/digital-7.ttf deleted file mode 100644 index e94f8e3b87..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/assets/digital-7.ttf and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt index ac72f9aebc..1fa47f58dc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt @@ -57,6 +57,8 @@ class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) : ivSummaryClose = findViewById(R.id.ivSummaryClose) ivSummaryClose?.setOnClickListener { //对本次服务记录清零 + AutopilotSummaryInfo.totalLength = 0 + AutopilotSummaryInfo.vehicleServiceNum = 0 AutopilotSummaryInfo.intersectionServicesNum = 0 AutopilotSummaryInfo.lightServicesNum = 0 AutopilotSummaryInfo.infoTipNum = 0 @@ -66,9 +68,7 @@ class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) : //关闭弹窗 dismiss() } - //小智总结 - tvSummaryZhiContent = findViewById(R.id.tvSummaryZhiContent) - //TODO 小智总结文案 + val random = Random() //全息路口服务次数 tvIntersectionServicesNum = findViewById(R.id.tvIntersectionServicesNum) tvIntersectionServicesNum?.text = AutopilotSummaryInfo.intersectionServicesNum.toString() @@ -77,22 +77,34 @@ class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) : tvLightServicesNum?.text = AutopilotSummaryInfo.lightServicesNum.toString() //道路信息提醒次数 tvInfoTipNum = findViewById(R.id.tvInfoTipNum) + AutopilotSummaryInfo.infoTipNum += random.nextInt(3) tvInfoTipNum?.text = AutopilotSummaryInfo.infoTipNum.toString() //车辆行为提醒次数 tvVehicleTipNum = findViewById(R.id.tvVehicleTipNum) + AutopilotSummaryInfo.vehicleTipNum += random.nextInt(3) tvVehicleTipNum?.text = AutopilotSummaryInfo.vehicleTipNum.toString() //弱势参与者提醒次数 tvVulnerableTipNum = findViewById(R.id.tvVulnerableTipNum) + AutopilotSummaryInfo.vulnerableTipNum += random.nextInt(3) tvVulnerableTipNum?.text = AutopilotSummaryInfo.vulnerableTipNum.toString() //消除安全风险隐患次数 tvDangerNum = findViewById(R.id.tvDangerNum) + AutopilotSummaryInfo.dangerNum += random.nextInt(3) tvDangerNum?.text = AutopilotSummaryInfo.dangerNum.toString() //通行效率提升:本期为假数据，数据为百分数，值为7-14%之间的随机数，保留小数点后1位 tvEfficiencyNum = findViewById(R.id.tvEfficiencyNum) - val random = Random() val next: Float= random.nextInt(70).toFloat()/10 val num = next + 7 tvEfficiencyNum?.text = num.toString() + //小智总结 + tvSummaryZhiContent = findViewById(R.id.tvSummaryZhiContent) + AutopilotSummaryInfo.vehicleServiceNum += AutopilotSummaryInfo.intersectionServicesNum+AutopilotSummaryInfo.lightServicesNum + +AutopilotSummaryInfo.infoTipNum + AutopilotSummaryInfo.vehicleTipNum + AutopilotSummaryInfo.vulnerableTipNum + if(isDriver){ + tvSummaryZhiContent?.text = "全程 5km，智慧道路护航 3km，全息感知覆盖率 60%，车辆服务次数${AutopilotSummaryInfo.vehicleServiceNum}次" + }else{ + tvSummaryZhiContent?.text = "旅途全长 38 km，全感知覆盖率 90%，车辆服务次数${AutopilotSummaryInfo.vehicleServiceNum}次" + } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml index a9059f256a..270ed24cf0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml @@ -41,7 +41,6 @@ android:textColor="@color/white" android:textSize="@dimen/sp_28" android:gravity="center" - android:text="全程 5km，智慧道路护航 3km，全息感知覆盖率 60%，车辆服务" /> { + 2.6f + } + TrafficTypeEnum.TYPE_TRAFFIC_ID_BUS.type, TrafficTypeEnum.TYPE_TRAFFIC_ID_TRUCK.type -> { + 4.0f + } + else -> { + 0f + } + } + } + /** * 过滤所有 工控感知数据 all match */ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/raw/yujingguangquan.nt3d b/core/function-impl/mogo-core-function-map/src/main/res/raw/yujingguangquan.nt3d new file mode 100644 index 0000000000..9135b1e711 Binary files /dev/null and b/core/function-impl/mogo-core-function-map/src/main/res/raw/yujingguangquan.nt3d differ diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt index d4bedfe80b..67f8c2f571 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt @@ -5,6 +5,13 @@ package com.mogo.eagle.core.data.autopilot */ object AutopilotSummaryInfo { + /** + * 旅途全长 + */ + @JvmField + @Volatile + var totalLength = 0 + /** * 车辆服务次数 */ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_quanxi_lukou.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_quanxi_lukou.png index 338cf614d0..67951ce7ce 100644 Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_quanxi_lukou.png and b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_quanxi_lukou.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigong_image.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigong_image.png index a064b1f90d..c01e6a4acc 100644 Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigong_image.png and b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigong_image.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigu_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigu_nor.png index bf0654c7ec..7c3646257c 100644 Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigu_nor.png and b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_shigu_nor.png differ diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt index b08470048f..1f6a072c77 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt @@ -151,6 +151,21 @@ data class Point(val id: String, val owner: String, val level: Level, val option */ val moveToCenter: Boolean = builder.moveToCenter + /** + * 设置动画资源 + */ + val displayAnim:Boolean = builder.displayAnim + + /** + * 动画资源 + */ + val animRes:Int = builder.animRes + + /** + * 动画缩放 + */ + val animScale:Float = builder.animScale + /** * marker点击事件处理 */ @@ -291,6 +306,33 @@ data class Point(val id: String, val owner: String, val level: Level, val option */ internal var onMarkerClickListener:WeakReference<((id: String) -> Unit)>? = null + /** + * 是否显示动画 + */ + internal var displayAnim:Boolean = false + + /** + * 设置动画资源 + */ + internal var animRes:Int = 0 + + /** + * 动画缩放 + */ + internal var animScale:Float = 0f + + fun setDisplayAnim(displayAnim:Boolean) = apply { + this.displayAnim = displayAnim + } + + fun setAnimResource(animRes: Int) = apply { + this.animRes = animRes + } + + fun setAnimScale(animScale: Float) = apply { + this.animScale = animScale + } + fun setId(id: String) = apply { this.id = id } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java index d097af5849..3165ab8761 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java @@ -65,6 +65,9 @@ public class ObjectUtils { .controlAngle(opt.isControlAngle()) .rotateAngle(opt.getRotate()) .setFlat(opt.isFlat()) +// .setAnimResource() +// .setDisplayAnimEnable() +// .setAnimScale() .visible(opt.isVisible()) .infoWindowEnable(opt.isInfoWindowEnable()) .scale(opt.getScale()) @@ -119,16 +122,13 @@ public class ObjectUtils { markerOptions.setTime(Double.valueOf(trafficData.getSatelliteTime() * 1000).longValue()); if(!trafficData.getColor().isEmpty()){ if(trafficData.getColor().contains("-drawColor")){ -// markerOptions.setColorType(3); markerOptions.setColor(trafficData.getColor().split("-")[0]); } else if(trafficData.getColor().contains("-resetColor")){ -// markerOptions.setColorType(4); markerOptions.setColor(trafficData.getColor().split("-")[0]); } else{ markerOptions.setColor(trafficData.getColor()); } }else{ -// markerOptions.setColorType(0); markerOptions.setColor("#00000000"); } } catch (Exception e) {