From 0f49a9ab9f6cd9f3fb3312033f8bf5dd451e16ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 5 Aug 2021 14:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=92=E5=88=86hmi?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 1 + .../src/main/AndroidManifest.xml | 2 +- .../module/hmi/{warning => }/WaringConst.java | 2 +- .../receiver/TestWarningBroadcastReceiver.kt | 4 +- .../{warning => }/ui/MoGoWarningContract.kt | 2 +- .../{warning => }/ui/MoGoWarningFragment.kt | 4 +- .../hmi/{warning => }/ui/WaringPresenter.kt | 2 +- .../ui => ui/widget}/ViewTrafficLight.kt | 4 +- .../hmi/warning/MoGoWarningProvider.java | 3 +- .../module/hmi/warning/WarningTypeEnum.kt | 148 ++++++++++-------- .../WarningNotificationManager.java | 3 +- .../src/main/res/layout/fragment_warning.xml | 2 +- 12 files changed, 97 insertions(+), 80 deletions(-) rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{warning => }/WaringConst.java (86%) rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{warning => }/receiver/TestWarningBroadcastReceiver.kt (97%) rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{warning => }/ui/MoGoWarningContract.kt (96%) rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{warning => }/ui/MoGoWarningFragment.kt (92%) rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{warning => }/ui/WaringPresenter.kt (95%) rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{warning/ui => ui/widget}/ViewTrafficLight.kt (95%) diff --git a/.idea/misc.xml b/.idea/misc.xml index 6e29a1816b..8e04f8cd28 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -14,6 +14,7 @@ + diff --git a/modules/mogo-module-hmi/src/main/AndroidManifest.xml b/modules/mogo-module-hmi/src/main/AndroidManifest.xml index 55e7316c7c..37adc97a0a 100644 --- a/modules/mogo-module-hmi/src/main/AndroidManifest.xml +++ b/modules/mogo-module-hmi/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.mogo.module.hmi"> diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WaringConst.java b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/WaringConst.java similarity index 86% rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WaringConst.java rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/WaringConst.java index 9d16894ce6..4010c176cc 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WaringConst.java +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/WaringConst.java @@ -1,4 +1,4 @@ -package com.mogo.module.hmi.warning; +package com.mogo.module.hmi; /** * @author xiaoyuzhou diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/receiver/TestWarningBroadcastReceiver.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/receiver/TestWarningBroadcastReceiver.kt similarity index 97% rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/receiver/TestWarningBroadcastReceiver.kt rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/receiver/TestWarningBroadcastReceiver.kt index 8842bf068d..434d57384d 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/receiver/TestWarningBroadcastReceiver.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/receiver/TestWarningBroadcastReceiver.kt @@ -1,10 +1,10 @@ -package com.mogo.module.hmi.warning.receiver +package com.mogo.module.hmi.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.module.hmi.warning.WaringConst +import com.mogo.module.hmi.WaringConst import com.mogo.module.hmi.warning.WarningTypeEnum import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningContract.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt similarity index 96% rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningContract.kt rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt index e9e2bbf56a..7c8253b681 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningContract.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt @@ -1,4 +1,4 @@ -package com.mogo.module.hmi.warning.ui +package com.mogo.module.hmi.ui import com.mogo.commons.mvp.IView diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt similarity index 92% rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningFragment.kt rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt index f0be59d0b5..28c051610b 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningFragment.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt @@ -1,7 +1,7 @@ -package com.mogo.module.hmi.warning.ui +package com.mogo.module.hmi.ui import com.mogo.commons.mvp.MvpFragment -import com.mogo.module.hmi.warning.R +import com.mogo.module.hmi.R import com.mogo.module.hmi.warning.notification.WarningNotificationManager /** diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/WaringPresenter.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/WaringPresenter.kt similarity index 95% rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/WaringPresenter.kt rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/WaringPresenter.kt index 4c892a9d4e..18222c9142 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/WaringPresenter.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/WaringPresenter.kt @@ -1,4 +1,4 @@ -package com.mogo.module.hmi.warning.ui +package com.mogo.module.hmi.ui import com.mogo.commons.mvp.Presenter diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/ViewTrafficLight.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt similarity index 95% rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/ViewTrafficLight.kt rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt index 0096fbd36f..c37dc24b87 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/ViewTrafficLight.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt @@ -1,10 +1,10 @@ -package com.mogo.module.hmi.warning.ui +package com.mogo.module.hmi.ui.widget import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.module.hmi.warning.R +import com.mogo.module.hmi.R import kotlinx.android.synthetic.main.view_traffic_light_vr.view.* /** diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java index 48f040a2b3..75b62ab414 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java @@ -7,7 +7,8 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.module.hmi.warning.ui.MoGoWarningFragment; +import com.mogo.module.hmi.WaringConst; +import com.mogo.module.hmi.ui.MoGoWarningFragment; import com.mogo.service.MogoServicePaths; import com.mogo.service.module.ModuleType; import com.mogo.service.warning.IMoGoWaringProvider; diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WarningTypeEnum.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WarningTypeEnum.kt index f8fed9b06e..f30618b99e 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WarningTypeEnum.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WarningTypeEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.module.hmi.warning; +package com.mogo.module.hmi.warning /** * author : donghongyu @@ -7,70 +7,86 @@ package com.mogo.module.hmi.warning; * desc : 车机启动状态 * version: 1.0 */ -public interface WarningTypeEnum { +interface WarningTypeEnum { + companion object { + /** + * 前向碰撞 + */ + const val WARING_TYPE_PRIOR_COLLISION = 20001 - /** - * 前向碰撞 - */ - int WARING_TYPE_PRIOR_COLLISION = 20001; - /** - * 交叉路口碰撞 - */ - int WARING_TYPE_INTERSECTION_COLLISION = 20002; - /** - * 左转辅助 - */ - int WARING_TYPE_LEFT_AUXILIARY = 20003; - /** - * 盲区/变道辅助 - */ - int WARING_TYPE_BLIND_AREA_COLLISION = 20004; - /** - * 逆向超车 - */ - int WARING_TYPE_REVERSE_OVERTAKING = 20005; - /** - * 紧急制动-前车急刹 - */ - int WARING_TYPE_VEHICLE_BRAKES = 20006; - /** - * 异常车辆提醒 - */ - int WARING_TYPE_ABNORMAL_VEHICLE = 20007; - /** - * 车辆失控预警 - */ - int WARING_TYPE_VEHICLE_CONTROL = 20008; - /** - * 道路危险情况预警 - */ - int WARING_TYPE_ROAD_HAZARDS = 20009; - /** - * 限速预警 - */ - int WARING_TYPE_SPEED_LIMIT = 20010; - /** - * 闯红灯预警 - */ - int WARING_TYPE_RED_LIGHT = 20011; - /** - * 弱势交通参与者预警 - */ - int WARING_TYPE_VULNERABLE_TRANSPORT_PARTICIPANT = 20012; - /** - * 绿波通行车速引导 - */ - int WARING_TYPE_TRAFFIC_SPEED_GUIDE = 20013; - /** - * 车内标牌 - */ - int WARING_TYPE_CAR_PLATE = 20014; - /** - * 前方道路拥堵 - */ - int WARING_TYPE_TRAFFIC_JAM_AHEAD = 20015; - /** - * 特种车辆通行 - */ - int WARING_TYPE_SPECIAL_VEHICLE_ACCESS = 20016; + /** + * 交叉路口碰撞 + */ + const val WARING_TYPE_INTERSECTION_COLLISION = 20002 + + /** + * 左转辅助 + */ + const val WARING_TYPE_LEFT_AUXILIARY = 20003 + + /** + * 盲区/变道辅助 + */ + const val WARING_TYPE_BLIND_AREA_COLLISION = 20004 + + /** + * 逆向超车 + */ + const val WARING_TYPE_REVERSE_OVERTAKING = 20005 + + /** + * 紧急制动-前车急刹 + */ + const val WARING_TYPE_VEHICLE_BRAKES = 20006 + + /** + * 异常车辆提醒 + */ + const val WARING_TYPE_ABNORMAL_VEHICLE = 20007 + + /** + * 车辆失控预警 + */ + const val WARING_TYPE_VEHICLE_CONTROL = 20008 + + /** + * 道路危险情况预警 + */ + const val WARING_TYPE_ROAD_HAZARDS = 20009 + + /** + * 限速预警 + */ + const val WARING_TYPE_SPEED_LIMIT = 20010 + + /** + * 闯红灯预警 + */ + const val WARING_TYPE_RED_LIGHT = 20011 + + /** + * 弱势交通参与者预警 + */ + const val WARING_TYPE_VULNERABLE_TRANSPORT_PARTICIPANT = 20012 + + /** + * 绿波通行车速引导 + */ + const val WARING_TYPE_TRAFFIC_SPEED_GUIDE = 20013 + + /** + * 车内标牌 + */ + const val WARING_TYPE_CAR_PLATE = 20014 + + /** + * 前方道路拥堵 + */ + const val WARING_TYPE_TRAFFIC_JAM_AHEAD = 20015 + + /** + * 特种车辆通行 + */ + const val WARING_TYPE_SPECIAL_VEHICLE_ACCESS = 20016 + } } \ No newline at end of file diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/notification/WarningNotificationManager.java b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/notification/WarningNotificationManager.java index 018810924b..179674318f 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/notification/WarningNotificationManager.java +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/notification/WarningNotificationManager.java @@ -8,7 +8,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; -import com.mogo.module.hmi.warning.R; +import com.mogo.module.hmi.R; /** * @author xiaoyuzhou @@ -23,7 +23,6 @@ public class WarningNotificationManager { private static View mView; - public static void show(Context context) { // 获取 WindowManager mWindowManager = (WindowManager) context.getSystemService(Service.WINDOW_SERVICE); diff --git a/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml b/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml index 9be2960497..b0e8204200 100644 --- a/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml +++ b/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent"> -