将warning划分到hmi

.idea/gradle.xml

@@ -46,6 +46,7 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
             <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
             <option value="$PROJECT_DIR$/modules/mogo-module-guide" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-hmi" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-main" />
@@ -64,7 +65,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-splash" />
             <option value="$PROJECT_DIR$/modules/mogo-module-splash-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-warning" />
             <option value="$PROJECT_DIR$/modules/mogo-module-widgets" />
             <option value="$PROJECT_DIR$/services" />
             <option value="$PROJECT_DIR$/services/mogo-service" />

.idea/misc.xml

@@ -13,6 +13,8 @@
       <map>
         <entry key="modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml" value="0.1" />
         <entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml" value="0.2953125" />
+        <entry key="modules/mogo-module-hmi/src/main/res/drawable/bg_waring_traffic_light_vr.xml" value="0.3359375" />
+        <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="1.0" />
         <entry key="modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml" value="0.202734375" />
         <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.25" />
         <entry key="modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml" value="0.202734375" />

app/build.gradle

@@ -529,7 +529,7 @@ dependencies {
         implementation project(':modules:mogo-module-map')
         implementation project(':modules:mogo-module-smp')
         implementation project(':modules:mogo-module-obu-mogo')
-        implementation project(':modules:mogo-module-warning')
+        implementation project(':modules:mogo-module-hmi')
         implementation project(':modules:mogo-module-adas')
         implementation project(':foudations:httpdns-mogo')
     }

modules/mogo-module-hmi/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.module.warning">
+    package="com.mogo.module.hmi.warning">
 
     <application>
 

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java

@@ -1,4 +1,4 @@
-package com.mogo.module.warning;
+package com.mogo.module.hmi.warning;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.module.warning.ui.MoGoWarningFragment;
+import com.mogo.module.hmi.warning.ui.MoGoWarningFragment;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.module.ModuleType;
 import com.mogo.service.warning.IMoGoWaringProvider;

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WaringConst.java

@@ -1,4 +1,4 @@
-package com.mogo.module.warning;
+package com.mogo.module.hmi.warning;
 
 /**
  * @author xiaoyuzhou

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/WarningTypeEnum.java

@@ -1,4 +1,4 @@
-package com.mogo.module.warning;
+package com.mogo.module.hmi.warning;
 
 /**
  * author : donghongyu

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/notification/WarningNotificationManager.java

@@ -1,4 +1,4 @@
-package com.mogo.module.warning.notification;
+package com.mogo.module.hmi.warning.notification;
 
 import android.app.Service;
 import android.content.Context;
@@ -8,7 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
 
-import com.mogo.module.warning.R;
+import com.mogo.module.hmi.warning.R;
 
 /**
  * @author xiaoyuzhou

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/receiver/TestWarningBroadcastReceiver.kt

@@ -1,11 +1,11 @@
-package com.mogo.module.warning.receiver
+package com.mogo.module.hmi.warning.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.module.warning.WaringConst
-import com.mogo.module.warning.WarningTypeEnum
+import com.mogo.module.hmi.warning.WaringConst
+import com.mogo.module.hmi.warning.WarningTypeEnum
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
 import com.mogo.service.warning.IMoGoWaringProvider

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningContract.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.warning.ui
+package com.mogo.module.hmi.warning.ui
 
 import com.mogo.commons.mvp.IView
 

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/MoGoWarningFragment.kt

@@ -1,8 +1,8 @@
-package com.mogo.module.warning.ui
+package com.mogo.module.hmi.warning.ui
 
 import com.mogo.commons.mvp.MvpFragment
-import com.mogo.module.warning.R
-import com.mogo.module.warning.notification.WarningNotificationManager
+import com.mogo.module.hmi.warning.R
+import com.mogo.module.hmi.warning.notification.WarningNotificationManager
 
 /**
  * @author xiaoyuzhou

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/ViewTrafficLight.kt

@@ -1,10 +1,10 @@
-package com.mogo.module.warning.ui
+package com.mogo.module.hmi.warning.ui
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.module.warning.R
+import com.mogo.module.hmi.warning.R
 import kotlinx.android.synthetic.main.view_traffic_light_vr.view.*
 
 /**

modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/ui/WaringPresenter.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.warning.ui
+package com.mogo.module.hmi.warning.ui
 
 import com.mogo.commons.mvp.Presenter
 

modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent">
 
 
-    <com.mogo.module.warning.ui.ViewTrafficLight
+    <com.mogo.module.hmi.warning.ui.ViewTrafficLight
         android:id="@+id/viewTrafficLightVr"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

settings.gradle

@@ -75,4 +75,4 @@ include ':OCH:mogo-och-bus'
 include ':OCH:mogo-och-noop'
 include ':OCH:mogo-och'
 include ':modules:mogo-module-obu-mogo'
-include ':modules:mogo-module-warning'
+include ':modules:mogo-module-hmi'