Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

.idea/gradle.xml

@@ -43,7 +43,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-check" />
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
             <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
-            <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" />

app/build.gradle

@@ -189,7 +189,6 @@ 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-hmi')
         implementation project(':modules:mogo-module-adas')
         implementation project(':modules:mogo-module-back')
         implementation project(':modules:mogo-module-widgets')
@@ -200,6 +199,9 @@ dependencies {
         implementation project(':modules:mogo-module-left-panel-noop')
         implementation project(':test:crashreport-upgrade')
         implementation project(':test:crashreport-bugly')
+
+        implementation project(':core:function-impl:mogo-core-function-hmi')
+
     }
 
     apply from: "./functions/basedmap.gradle"

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -43,9 +43,20 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+    implementation rootProject.ext.dependencies.arouter
+    implementation rootProject.ext.dependencies.rxandroid
+
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     if (Boolean.valueOf(RELEASE)) {
 
     } else {
+        api project(':services:mogo-service-api')
+        implementation project(':modules:mogo-module-common')
+
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-api')

core/function-impl/mogo-core-function-hmi/gradle.properties

@@ -1,3 +1,3 @@
 GROUP=com.mogo.eagle.core
-POM_ARTIFACT_ID=function-impl
+POM_ARTIFACT_ID=function-hmi
 VERSION_CODE=1

core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml

@@ -2,4 +2,30 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mogo.eagle.core.function.hmi">
 
+    <application>
+
+        <receiver android:name="com.mogo.eagle.core.function.hmi.receiver.V2XWarningBroadcastReceiver">
+            <intent-filter>
+                <action android:name="com.hmi.v2x.notification" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.mogo.eagle.core.function.hmi.receiver.V2XTrafficLightBroadcastReceiver">
+            <intent-filter>
+                <action android:name="com.hmi.v2x.trafficlight" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.mogo.eagle.core.function.hmi.receiver.V2XLimitingVelocityBroadcastReceiver">
+            <intent-filter>
+                <action android:name="com.hmi.v2x.limitingvelocity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+    </application>
 </manifest>

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java

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

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloat.kt

@@ -1,9 +1,9 @@
-package com.mogo.module.hmi.notification
+package com.mogo.eagle.core.function.hmi.notification
 
 import android.content.Context
 import android.view.View
-import com.mogo.module.hmi.notification.enums.SidePattern
-import com.mogo.module.hmi.notification.interfaces.OnFloatAnimator
+import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
+import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator
 import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
 import com.mogo.utils.WindowUtils
 import com.mogo.utils.logger.Logger

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.notification
+package com.mogo.eagle.core.function.hmi.notification
 
 import android.animation.Animator
 import android.annotation.SuppressLint
@@ -12,9 +12,9 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
-import com.mogo.module.hmi.notification.anim.AnimatorManager
-import com.mogo.module.hmi.notification.enums.ShowPattern
-import com.mogo.module.hmi.notification.widget.ParentFrameLayout
+import com.mogo.eagle.core.function.hmi.notification.anim.AnimatorManager
+import com.mogo.eagle.core.function.hmi.notification.enums.ShowPattern
+import com.mogo.eagle.core.function.hmi.notification.widget.ParentFrameLayout
 import com.mogo.utils.WindowUtils
 import com.mogo.utils.logger.Logger
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowManager.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.notification
+package com.mogo.eagle.core.function.hmi.notification
 
 import android.content.Context
 import android.util.Log

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningNotificationConfig.kt

@@ -1,11 +1,11 @@
-package com.mogo.module.hmi.notification
+package com.mogo.eagle.core.function.hmi.notification
 
 import android.view.View
-import com.mogo.module.hmi.notification.anim.DefaultAnimator
-import com.mogo.module.hmi.notification.enums.ShowPattern
-import com.mogo.module.hmi.notification.enums.SidePattern
-import com.mogo.module.hmi.notification.interfaces.OnFloatAnimator
-import com.mogo.module.hmi.notification.interfaces.OnFloatCallbacks
+import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
+import com.mogo.eagle.core.function.hmi.notification.enums.ShowPattern
+import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
+import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator
+import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatCallbacks
 import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
 
 /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/anim/AnimatorManager.kt

@@ -1,9 +1,9 @@
-package com.mogo.module.hmi.notification.anim
+package com.mogo.eagle.core.function.hmi.notification.anim
 
 import android.animation.Animator
 import android.view.View
 import android.view.WindowManager
-import com.mogo.module.hmi.notification.WarningNotificationConfig
+import com.mogo.eagle.core.function.hmi.notification.WarningNotificationConfig
 
 /**
  * @author: donghongyu

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/anim/DefaultAnimator.kt

@@ -1,12 +1,12 @@
-package com.mogo.module.hmi.notification.anim
+package com.mogo.eagle.core.function.hmi.notification.anim
 
 import android.animation.Animator
 import android.animation.ValueAnimator
 import android.graphics.Rect
 import android.view.View
 import android.view.WindowManager
-import com.mogo.module.hmi.notification.enums.SidePattern
-import com.mogo.module.hmi.notification.interfaces.OnFloatAnimator
+import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
+import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator
 import com.mogo.utils.WindowUtils
 import kotlin.math.min
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/enums/ShowPattern.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.notification.enums
+package com.mogo.eagle.core.function.hmi.notification.enums
 
 /**
  * @author: donghongyu

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/enums/SidePattern.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.notification.enums
+package com.mogo.eagle.core.function.hmi.notification.enums
 
 /**
  * @author: donghongyu

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/interfaces/OnFloatAnimator.kt

@@ -1,9 +1,9 @@
-package com.mogo.module.hmi.notification.interfaces
+package com.mogo.eagle.core.function.hmi.notification.interfaces
 
 import android.animation.Animator
 import android.view.View
 import android.view.WindowManager
-import com.mogo.module.hmi.notification.enums.SidePattern
+import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
 
 /**
  * @author: donghongyu

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/interfaces/OnFloatCallbacks.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.notification.interfaces
+package com.mogo.eagle.core.function.hmi.notification.interfaces
 
 import android.view.MotionEvent
 import android.view.View

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/widget/ParentFrameLayout.kt

@@ -1,10 +1,10 @@
-package com.mogo.module.hmi.notification.widget
+package com.mogo.eagle.core.function.hmi.notification.widget
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.FrameLayout
-import com.mogo.module.hmi.notification.WarningNotificationConfig
+import com.mogo.eagle.core.function.hmi.notification.WarningNotificationConfig
 
 /**
  * @author: donghongyu

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt

@@ -1,10 +1,10 @@
-package com.mogo.module.hmi.receiver
+package com.mogo.eagle.core.function.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.WaringConst
+import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt

@@ -1,10 +1,10 @@
-package com.mogo.module.hmi.receiver
+package com.mogo.eagle.core.function.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.WaringConst
+import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt

@@ -1,11 +1,11 @@
-package com.mogo.module.hmi.receiver
+package com.mogo.eagle.core.function.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.common.enums.EventTypeEnum
-import com.mogo.module.hmi.WaringConst
+import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.ui
+package com.mogo.eagle.core.function.hmi.ui
 
 import com.mogo.commons.mvp.IView
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningFragment.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.ui
+package com.mogo.eagle.core.function.hmi.ui
 
 import android.animation.Animator
 import android.text.TextUtils
@@ -10,12 +10,12 @@ import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.voice.AIAssist
 import com.mogo.module.common.enums.EventTypeEnum
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
-import com.mogo.module.hmi.R
-import com.mogo.module.hmi.notification.WarningFloat
-import com.mogo.module.hmi.notification.anim.DefaultAnimator
-import com.mogo.module.hmi.notification.enums.SidePattern
-import com.mogo.module.hmi.ui.widget.V2XNotificationView
+import com.mogo.eagle.core.function.hmi.notification.WarningFloat
+import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
+import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
+import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView
 import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
+import com.mogo.eagle.core.function.hmi.R
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.fragment_warning.*
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/WaringPresenter.kt

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

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedChartView.java

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.ui.widget;
+package com.mogo.eagle.core.function.hmi.ui.widget;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -13,7 +13,7 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
-import com.mogo.module.hmi.R;
+import com.mogo.eagle.core.function.hmi.R;
 
 
 /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.ui.widget
+package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.content.Context
 import android.content.Intent
@@ -11,10 +11,10 @@ import android.view.View
 import android.widget.FrameLayout
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.function.hmi.R
 import com.mogo.map.MogoLatLng
 import com.mogo.map.navi.IMogoCarLocationChangedListener2
 import com.mogo.module.common.MogoApisHandler
-import com.mogo.module.hmi.R
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
 import com.mogo.service.statusmanager.IMogoStatusChangedListener

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt

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

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.ui.widget
+package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.content.Context
 import android.graphics.drawable.Drawable
@@ -8,7 +8,7 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.Nullable
 import androidx.annotation.StringRes
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.module.hmi.R
+import com.mogo.eagle.core.function.hmi.R
 import kotlinx.android.synthetic.main.notification_v2x_msg_vr.view.*
 
 /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.ui.widget
+package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.RelativeLayout
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
-import com.mogo.module.hmi.R
+import com.mogo.eagle.core.function.hmi.R
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.module_hmi_warning_v2x.view.*
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.java

@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.warning;
+package com.mogo.eagle.core.function.hmi.warning;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -12,8 +12,8 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum;
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider;
 import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener;
-import com.mogo.module.hmi.WaringConst;
-import com.mogo.module.hmi.ui.MoGoWarningFragment;
+import com.mogo.eagle.core.function.hmi.WaringConst;
+import com.mogo.eagle.core.function.hmi.ui.MoGoWarningFragment;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.utils.logger.Logger;
 

core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_warning.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.mogo.module.hmi.ui.widget.V2XWarningView
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
         android:id="@+id/flV2XWarningView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -14,7 +14,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.module.hmi.ui.widget.SpeedPanelView
+    <com.mogo.eagle.core.function.hmi.ui.widget.SpeedPanelView
         android:id="@+id/flSpeedChartView"
         android:layout_width="@dimen/module_ext_speed_width"
         android:layout_height="@dimen/module_ext_speed_height"
@@ -24,7 +24,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.module.hmi.ui.widget.TrafficLightView
+    <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
         android:id="@+id/viewTrafficLightVr"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

core/mogo-core-res/build.gradle

@@ -46,6 +46,7 @@ android {
                     'src/main/function-chat-res',
                     'src/main/function-check-res',
                     'src/main/function-dispatch-res',
+                    'src/main/function-hmi-res',
                     'src/main/function-map-res',
                     'src/main/function-notice-res',
                     'src/main/function-obu-res',

core/mogo-core-res/src/res/drawable/utils_toast_bg.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#E6EEEEEE" />
-    <corners android:radius="16dp" />
-</shape>
-

core/mogo-core-res/src/res/layout/utils_toast_view.xml

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    class="com.blankj.utilcode.util.ToastUtils$UtilsMaxWidthRelativeLayout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/utils_toast_bg"
-    android:paddingLeft="16dp"
-    android:paddingTop="12dp"
-    android:paddingRight="16dp"
-    android:paddingBottom="12dp">
-
-    <View
-        android:id="@+id/utvLeftIconView"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="8dp"
-        android:visibility="gone"
-        tools:background="#00ff00"
-        tools:visibility="gone" />
-
-    <View
-        android:id="@+id/utvTopIconView"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="4dp"
-        android:visibility="gone"
-        tools:background="#00ff00"
-        tools:visibility="gone" />
-
-    <View
-        android:id="@+id/utvRightIconView"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="8dp"
-        android:visibility="gone"
-        tools:background="#00ff00"
-        tools:visibility="gone" />
-
-    <View
-        android:id="@+id/utvBottomIconView"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="4dp"
-        android:visibility="gone"
-        tools:background="#00ff00"
-        tools:visibility="gone" />
-
-    <TextView
-        android:id="@android:id/message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/utvBottomIconView"
-        android:layout_below="@id/utvTopIconView"
-        android:layout_centerInParent="true"
-        android:layout_toLeftOf="@id/utvRightIconView"
-        android:layout_toRightOf="@id/utvLeftIconView"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:lineSpacingExtra="2dp"
-        android:textColor="#DE000000"
-        android:textSize="14sp"
-        tools:text="This is long text." />
-</view>

core/mogo-core-res/src/res/values-v21/styles.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ActivityTranslucent" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowDisablePreview">true</item>
-    </style>
-
-</resources>

core/mogo-core-res/src/res/values/styles.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ActivityTranslucent" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowDisablePreview">true</item>
-    </style>
-
-</resources>

core/mogo-core-res/src/res/xml/util_code_provider_paths.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <files-path
-        name="files_path"
-        path="." />
-
-    <cache-path
-        name="cache_path"
-        path="." />
-
-    <external-path
-        name="external_path"
-        path="." />
-
-    <external-files-path
-        name="external_files_path"
-        path="." />
-
-    <external-cache-path
-        name="external_cache_path"
-        path="." />
-
-    <external-media-path
-        name="external_media_path"
-        path="." />
-</paths>

core/mogo-core-utils/build.gradle

@@ -48,15 +48,6 @@ dependencies {
     implementation rootProject.ext.dependencies.material
 
     implementation rootProject.ext.dependencies.gson
-
-
-    if (Boolean.valueOf(RELEASE)) {
-
-    } else {
-        implementation project(':core:mogo-core-data')
-        implementation project(':core:mogo-core-function-api')
-        implementation project(':core:function-impl:mogo-core-function-hmi')
-    }
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CacheDiskUtils.java

@@ -7,7 +7,8 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-import com.blankj.utilcode.constant.CacheConstants;
+
+import com.mogo.eagle.core.utilcode.constant.CacheConstants;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CacheDoubleUtils.java

@@ -5,7 +5,8 @@ import android.graphics.drawable.Drawable;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
 
-import com.blankj.utilcode.constant.CacheConstants;
+
+import com.mogo.eagle.core.utilcode.constant.CacheConstants;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CacheMemoryUtils.java

@@ -3,7 +3,8 @@ package com.mogo.eagle.core.utilcode.util;
 import androidx.annotation.NonNull;
 import androidx.collection.LruCache;
 
-import com.blankj.utilcode.constant.CacheConstants;
+
+import com.mogo.eagle.core.utilcode.constant.CacheConstants;
 
 import java.util.HashMap;
 import java.util.Map;

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ConvertUtils.java

@@ -7,8 +7,9 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.view.View;
 
-import com.blankj.utilcode.constant.MemoryConstants;
-import com.blankj.utilcode.constant.TimeConstants;
+
+import com.mogo.eagle.core.utilcode.constant.MemoryConstants;
+import com.mogo.eagle.core.utilcode.constant.TimeConstants;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java

@@ -13,7 +13,6 @@ import android.util.Pair;
 import android.view.MotionEvent;
 import android.view.WindowManager;
 
-import com.blankj.utilcode.constant.PermissionConstants;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,7 +26,8 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 
-import static com.blankj.utilcode.constant.PermissionConstants.PermissionGroup;
+import com.mogo.eagle.core.utilcode.constant.PermissionConstants;
+
 
 /**
  * <pre>
@@ -209,7 +209,7 @@ public final class PermissionUtils {
      * @param permissions The permissions.
      * @return the single {@link PermissionUtils} instance
      */
-    public static PermissionUtils permissionGroup(@PermissionGroup final String... permissions) {
+    public static PermissionUtils permissionGroup(@PermissionConstants.PermissionGroup final String... permissions) {
         return permission(permissions);
     }
 

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/RegexUtils.java

@@ -2,7 +2,8 @@ package com.mogo.eagle.core.utilcode.util;
 
 import androidx.collection.SimpleArrayMap;
 
-import com.blankj.utilcode.constant.RegexConstants;
+
+import com.mogo.eagle.core.utilcode.constant.RegexConstants;
 
 import java.util.ArrayList;
 import java.util.Collections;

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/TimeUtils.java

@@ -2,7 +2,6 @@ package com.mogo.eagle.core.utilcode.util;
 
 import android.annotation.SuppressLint;
 
-import com.blankj.utilcode.constant.TimeConstants;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -16,6 +15,8 @@ import java.util.Map;
 
 import androidx.annotation.NonNull;
 
+import com.mogo.eagle.core.utilcode.constant.TimeConstants;
+
 /**
  * <pre>
  *     author: Blankj

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java

@@ -24,7 +24,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.blankj.utilcode.R;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

core/mogo-core-utils/src/main/res/layout/utils_toast_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <view xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    class="com.blankj.utilcode.util.ToastUtils$UtilsMaxWidthRelativeLayout"
+    class="com.mogo.eagle.core.utilcode.util.ToastUtils$UtilsMaxWidthRelativeLayout"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/utils_toast_bg"

gradle.properties

@@ -11,18 +11,15 @@ org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
-
 #开启gradle缓存
 org.gradle.caching=true
 android.enableBuildCache=true
-
 #开启kotlin的增量和并行编译
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true
 #开启kotlin并行编译
 kotlin.parallel.tasks.in.project=true
-
 #优化kapt
 #并行运行kapt1.2.60版本以上支持
 kapt.use.worker.api=true
@@ -30,7 +27,6 @@ kapt.use.worker.api=true
 kapt.incremental.apt=true
 #kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉app:kaptGenerateStubsDebugKotlin的时间
 kapt.include.compile.classpath=false
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -41,8 +37,7 @@ kapt.include.compile.classpath=false
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-android.jetifier.blacklist = module-service-2.0.58.aar
-
+android.jetifier.blacklist=module-service-2.0.58.aar
 ## maven 配置
 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
 SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -84,7 +79,7 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.58
 MOGO_MODULE_V2X_VERSION=2.0.58
 MOGO_MODULE_HMI_VERSION=2.0.58
 # 基础服务实现：passport、socket、location
-MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.58
+MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.58
 MOGO_BASE_SERVICES_APK_VERSION=2.0.58
 MOGO_BASE_SERVICES_SDK_VERSION=2.0.58
 ## 工程外部模块
@@ -144,7 +139,6 @@ MOGO_OCH_NOOP_VERSION=2.0.58
 MOGO_OCH_TAXI_VERSION=2.0.58
 # mogoAiCloud sdk services
 MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.58
-
 ######## 外部依赖引用
 # 车聊聊
 CARCHATTING_VERSION=2.2.337
@@ -153,8 +147,7 @@ CARCHATTINGPROVIDER_VERSION=1.1.16
 # websocket
 WEBSOCKET_VERSION=1.1.7
 # loglib
-LOGLIB_VERSION = 1.0.4
-
+LOGLIB_VERSION=1.0.4
 ######## MogoAiCloudSDK Version
 # 网络请求
 MOGO_NETWORK_VERSION=1.1.46
@@ -172,11 +165,10 @@ MOGO_LIVE_VERSION=1.1.46
 MOGO_TRAFFICLIVE_VERSION=1.1.46
 # 定位服务
 MOGO_LOCATION_VERSION=1.1.46
-
 # 自研地图
 MAP_SDK_VERSION=1.0.1-vr-1.0.9
-
-
+#################架构升级新的版本号
+MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0
 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot

modules/mogo-module-common/build.gradle

@@ -34,7 +34,6 @@ android {
         main {
             res.srcDirs = [
                     'src/main/res',// 默认资源目录
-                    'src/main/res-warning'//预警资源目录
             ]
         }
     }

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -58,7 +58,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <com.mogo.module.hmi.ui.widget.SpeedChartView
+        <com.mogo.eagle.core.function.hmi.ui.widget.SpeedChartView
             android:id="@+id/moudule_arc"
             android:layout_width="@dimen/module_ext_arcView_width"
             android:layout_height="@dimen/module_ext_arcView_height"

modules/mogo-module-hmi/build.gradle

@@ -59,6 +59,7 @@ dependencies {
         api project(':services:mogo-service-api')
         implementation project(':modules:mogo-module-common')
         implementation project(':core:mogo-core-data')
+        implementation project(':core:mogo-core-res')
     }
 
 }

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

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.module.hmi">
-
-    <application>
-
-        <receiver android:name=".receiver.V2XWarningBroadcastReceiver">
-            <intent-filter>
-                <action android:name="com.hmi.v2x.notification" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name=".receiver.V2XTrafficLightBroadcastReceiver">
-            <intent-filter>
-                <action android:name="com.hmi.v2x.trafficlight" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name=".receiver.V2XLimitingVelocityBroadcastReceiver">
-            <intent-filter>
-                <action android:name="com.hmi.v2x.limitingvelocity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-    </application>
-</manifest>

settings.gradle

@@ -38,7 +38,6 @@ include ':libraries:mogo-map'
 // OLD业务模块
 include ':modules:tanlulib'
 include ':modules:mogo-module-obu-mogo'
-include ':modules:mogo-module-hmi'
 include ':modules:mogo-module-widgets'
 include ':modules:mogo-module-monitor'
 include ':modules:mogo-module-left-panel-noop'