From 1b658d60af6283de5a2000b6e79ee02d3623e02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 6 Aug 2021 16:07:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BC=B9=E7=AA=97tts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/receiver/WarningBroadcastReceiver.kt | 13 +++++++------ .../com/mogo/module/hmi/ui/MoGoWarningFragment.kt | 12 +++++++----- .../icon_warning_v2x_abnormal_vehicle.png | Bin ...con_warning_v2x_accident_prone_road_section.png | Bin .../icon_warning_v2x_avoid_special_vehicles.png | Bin .../icon_warning_v2x_ban_astern.png | Bin .../icon_warning_v2x_blind_area_collision.png | Bin .../icon_warning_v2x_collision_warning.png | Bin .../icon_warning_v2x_congestion.png | Bin .../icon_warning_v2x_emergency_brake.png | Bin .../icon_warning_v2x_give_way.png | Bin .../icon_warning_v2x_hump_bridge.png | Bin .../icon_warning_v2x_motorcycle_collision.png | Bin .../icon_warning_v2x_over_speed.png | Bin .../icon_warning_v2x_pedestrian_crossing.png | Bin .../icon_warning_v2x_reverse_overtaking.png | Bin .../icon_warning_v2x_road_construction.png | Bin .../icon_warning_v2x_road_dangerous.png | Bin .../icon_warning_v2x_roundaboutpng.png | Bin .../icon_warning_v2x_school.png | Bin .../icon_warning_v2x_special_vehicle_access.png | Bin .../icon_warning_v2x_test_section.png | Bin .../icon_warning_v2x_traffic_light_gray.png | Bin .../icon_warning_v2x_traffic_light_green.png | Bin .../icon_warning_v2x_traffic_light_red.png | Bin .../icon_warning_v2x_traffic_light_yellow.png | Bin .../icon_warning_v2x_traffic_lights_green.png | Bin .../icon_warning_v2x_traffic_lights_red.png | Bin .../icon_warning_v2x_tramcar.png | Bin .../icon_warning_v2x_turn_left_sharp.png | Bin .../icon_warning_v2x_vehicle_control.png | Bin 31 files changed, 14 insertions(+), 11 deletions(-) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_abnormal_vehicle.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_accident_prone_road_section.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_avoid_special_vehicles.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_ban_astern.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_blind_area_collision.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_collision_warning.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_congestion.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_emergency_brake.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_give_way.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_hump_bridge.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_motorcycle_collision.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_over_speed.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_pedestrian_crossing.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_reverse_overtaking.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_road_construction.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_road_dangerous.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_roundaboutpng.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_school.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_special_vehicle_access.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_test_section.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_traffic_light_gray.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_traffic_light_green.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_traffic_light_red.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_traffic_light_yellow.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_traffic_lights_green.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_traffic_lights_red.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_tramcar.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_turn_left_sharp.png (100%) rename modules/mogo-module-hmi/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_warning_v2x_vehicle_control.png (100%) diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/receiver/WarningBroadcastReceiver.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/receiver/WarningBroadcastReceiver.kt index d50cffa09e..d96435299d 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/receiver/WarningBroadcastReceiver.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/receiver/WarningBroadcastReceiver.kt @@ -18,6 +18,13 @@ import kotlin.random.Random */ class WarningBroadcastReceiver : BroadcastReceiver() { private var mContext: Context? = null + + companion object { + private const val TAG = "TestPanelBroadcastReceiver" + private var mMogoServiceApis: IMogoServiceApis? = null + private var mIMoGoWaringProvider: IMoGoWaringProvider? = null + } + override fun onReceive(context: Context, intent: Intent) { try { mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) @@ -60,10 +67,4 @@ class WarningBroadcastReceiver : BroadcastReceiver() { ) } - - companion object { - private const val TAG = "TestPanelBroadcastReceiver" - private var mMogoServiceApis: IMogoServiceApis? = null - private var mIMoGoWaringProvider: IMoGoWaringProvider? = null - } } \ No newline at end of file diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt index b4818245cf..1a707c2845 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt @@ -6,6 +6,7 @@ import android.view.View import android.view.WindowManager import android.view.animation.OvershootInterpolator import com.mogo.commons.mvp.MvpFragment +import com.mogo.commons.voice.AIAssist import com.mogo.module.hmi.R import com.mogo.module.hmi.notification.WarningFloat import com.mogo.module.hmi.notification.anim.DefaultAnimator @@ -50,11 +51,12 @@ class MoGoWarningFragment : MvpFragment