From b58b1f2af5238612dae861db591a04cbc27e5f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 17 Sep 2021 10:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E5=B0=8F=E6=99=BA=E8=AF=AD=E9=9F=B3=E5=B4=A9=E6=BA=83?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/gradle.xml                              |   1 +
 core/README.md                                |   4 +-
 core/mogo-core-data/build.gradle              |   6 ++
 core/mogo-core-res/.gitignore                 |   1 +
 core/mogo-core-res/build.gradle               |  64 ++++++++++++++++
 core/mogo-core-res/consumer-rules.pro         |   0
 core/mogo-core-res/gradle.properties          |   3 +
 core/mogo-core-res/proguard-rules.pro         |  21 +++++
 .../src/main/AndroidManifest.xml              |   5 ++
 .../drawable-mdpi/placeholder.png             | Bin 0 -> 1869 bytes
 .../drawable-xhdpi/placeholder.png            | Bin 0 -> 1869 bytes
 .../drawable/placeholder.png                  | Bin 0 -> 1869 bytes
 .../src/res/drawable/utils_toast_bg.xml       |   7 ++
 .../src/res/layout/utils_toast_view.xml       |  72 ++++++++++++++++++
 .../src/res/values-v21/styles.xml             |  18 +++++
 core/mogo-core-res/src/res/values/styles.xml  |  17 +++++
 .../src/res/xml/util_code_provider_paths.xml  |  26 +++++++
 core/mogo-core-utils/build.gradle             |   6 +-
 .../com/mogo/commons/mvp/MvpActivity.java     |  21 +++--
 .../module/small/map/SmallMapProvider.java    |   6 ++
 settings.gradle                               |  25 +++---
 21 files changed, 281 insertions(+), 22 deletions(-)
 create mode 100644 core/mogo-core-res/.gitignore
 create mode 100644 core/mogo-core-res/build.gradle
 create mode 100644 core/mogo-core-res/consumer-rules.pro
 create mode 100644 core/mogo-core-res/gradle.properties
 create mode 100644 core/mogo-core-res/proguard-rules.pro
 create mode 100644 core/mogo-core-res/src/main/AndroidManifest.xml
 create mode 100755 core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png
 create mode 100755 core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png
 create mode 100755 core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png
 create mode 100644 core/mogo-core-res/src/res/drawable/utils_toast_bg.xml
 create mode 100644 core/mogo-core-res/src/res/layout/utils_toast_view.xml
 create mode 100644 core/mogo-core-res/src/res/values-v21/styles.xml
 create mode 100644 core/mogo-core-res/src/res/values/styles.xml
 create mode 100644 core/mogo-core-res/src/res/xml/util_code_provider_paths.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0d36ed5e85..beffe3a707 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -22,6 +22,7 @@
             <option value="$PROJECT_DIR$/core/mogo-core-data" />
             <option value="$PROJECT_DIR$/core/mogo-core-function-api" />
             <option value="$PROJECT_DIR$/core/mogo-core-function-call" />
+            <option value="$PROJECT_DIR$/core/mogo-core-res" />
             <option value="$PROJECT_DIR$/core/mogo-core-utils" />
             <option value="$PROJECT_DIR$/foudations" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-sdk" />
diff --git a/core/README.md b/core/README.md
index 81a1911b20..045977cda0 100644
--- a/core/README.md
+++ b/core/README.md
@@ -2,9 +2,9 @@
 本模块用来编写鹰眼核型功能
 
 mogo-core-data：定义基础业务所需要的数据结构
+mogo-core-function-res：这里只存放公共资源，图片，布局，动画等
 
 mogo-core-function-api：定义基础业务功能的接口
 mogo-core-function-impl：定义基础业务功能的接口的功能具体实现
 
-mogo-core-function-call-api：定义基础业务暴露给外部调用的接口
-mogo-core-function-call-impl：定义基础业务暴露给外部调用的接口调用实现
+mogo-core-function-call：定义基础业务暴露给外部调用的接口
diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle
index 8e0ff7c7f0..d01467da07 100644
--- a/core/mogo-core-data/build.gradle
+++ b/core/mogo-core-data/build.gradle
@@ -44,6 +44,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+
+    if (Boolean.valueOf(RELEASE)) {
+
+    } else {
+        implementation project(':core:mogo-core-res')
+    }
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/core/mogo-core-res/.gitignore b/core/mogo-core-res/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/mogo-core-res/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/mogo-core-res/build.gradle b/core/mogo-core-res/build.gradle
new file mode 100644
index 0000000000..918f0f4f27
--- /dev/null
+++ b/core/mogo-core-res/build.gradle
@@ -0,0 +1,64 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+android {
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    // buildToolsVersion rootProject.ext.android.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode Integer.valueOf(VERSION_CODE)
+        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        main {
+            res.srcDirs = [
+                    'src/main/function-common-res',
+                    'src/main/function-adas-res',
+                    'src/main/function-chat-res',
+                    'src/main/function-check-res',
+                    'src/main/function-dispatch-res',
+                    'src/main/function-map-res',
+                    'src/main/function-notice-res',
+                    'src/main/function-obu-res',
+                    'src/main/function-tts-res',
+                    'src/main/function-v2x-res',
+            ]
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/core/mogo-core-res/consumer-rules.pro b/core/mogo-core-res/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/mogo-core-res/gradle.properties b/core/mogo-core-res/gradle.properties
new file mode 100644
index 0000000000..585bc34412
--- /dev/null
+++ b/core/mogo-core-res/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.eagle.core
+POM_ARTIFACT_ID=function-call-api
+VERSION_CODE=1
diff --git a/core/mogo-core-res/proguard-rules.pro b/core/mogo-core-res/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/core/mogo-core-res/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/AndroidManifest.xml b/core/mogo-core-res/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..baa0e8faa4
--- /dev/null
+++ b/core/mogo-core-res/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.eagle.core.function.call.api">
+
+</manifest>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png b/core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png
new file mode 100755
index 0000000000000000000000000000000000000000..402c1def0125339979c4f3a3b31832e2cb9d6a3c
GIT binary patch
literal 1869
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
Libhp^A9UkyTJcZ`

literal 0
HcmV?d00001

diff --git a/core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png b/core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png
new file mode 100755
index 0000000000000000000000000000000000000000..402c1def0125339979c4f3a3b31832e2cb9d6a3c
GIT binary patch
literal 1869
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
Libhp^A9UkyTJcZ`

literal 0
HcmV?d00001

diff --git a/core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png b/core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png
new file mode 100755
index 0000000000000000000000000000000000000000..402c1def0125339979c4f3a3b31832e2cb9d6a3c
GIT binary patch
literal 1869
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
Libhp^A9UkyTJcZ`

literal 0
HcmV?d00001

diff --git a/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml b/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml
new file mode 100644
index 0000000000..5e6370b319
--- /dev/null
+++ b/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml
@@ -0,0 +1,7 @@
+<?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>
+
diff --git a/core/mogo-core-res/src/res/layout/utils_toast_view.xml b/core/mogo-core-res/src/res/layout/utils_toast_view.xml
new file mode 100644
index 0000000000..59af74b6bb
--- /dev/null
+++ b/core/mogo-core-res/src/res/layout/utils_toast_view.xml
@@ -0,0 +1,72 @@
+<?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>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/res/values-v21/styles.xml b/core/mogo-core-res/src/res/values-v21/styles.xml
new file mode 100644
index 0000000000..967acc3c0f
--- /dev/null
+++ b/core/mogo-core-res/src/res/values-v21/styles.xml
@@ -0,0 +1,18 @@
+<?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>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/res/values/styles.xml b/core/mogo-core-res/src/res/values/styles.xml
new file mode 100644
index 0000000000..0fcfe9b91d
--- /dev/null
+++ b/core/mogo-core-res/src/res/values/styles.xml
@@ -0,0 +1,17 @@
+<?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>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml b/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml
new file mode 100644
index 0000000000..ed731a2299
--- /dev/null
+++ b/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml
@@ -0,0 +1,26 @@
+<?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>
\ No newline at end of file
diff --git a/core/mogo-core-utils/build.gradle b/core/mogo-core-utils/build.gradle
index fbab7a0b71..767f408c5b 100644
--- a/core/mogo-core-utils/build.gradle
+++ b/core/mogo-core-utils/build.gradle
@@ -43,9 +43,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compileOnly rootProject.ext.dependencies.kotlinstdlibjdk7
-    compileOnly rootProject.ext.dependencies.androidxannotation
-    compileOnly rootProject.ext.dependencies.material
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxannotation
+    implementation rootProject.ext.dependencies.material
 
     implementation rootProject.ext.dependencies.gson
 
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index b780448869..7bb26845fe 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -69,14 +69,19 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
      */
     public void startVoicePad() {
         try {
-            if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
-                Logger.d(TAG, "启动小智语音");
-                Intent intent = new Intent();
-                intent.setComponent(new ComponentName("com.zhidao.speech",
-                        "com.zhidao.speech.MainActivity"));
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-            }
+            getWindow().getDecorView().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
+                        Logger.d(TAG, "启动小智语音");
+                        Intent intent = new Intent();
+                        intent.setComponent(new ComponentName("com.zhidao.speech",
+                                "com.zhidao.speech.MainActivity"));
+                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        startActivity(intent);
+                    }
+                }
+            }, 3000);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
index 8a5ee424de..78d0c87cfe 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
@@ -59,6 +59,12 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang
                         MogoServicePaths.PATH_SMALL_MAP,
                         StatusDescriptor.MAIN_PAGE_RESUME,
                         this);
+
+        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+            showPanel();
+        } else {
+            hidePanel();
+        }
     }
 
     @Override
diff --git a/settings.gradle b/settings.gradle
index bce06e4d72..d37721996b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,22 @@ include ':app'
 // 应用主入口
 include ':main-extensions:mogo-module-main-launcher'
 
+
+// 核心模块
+// 公用数据实体
+include ':core:mogo-core-data'
+// 公用资源
+include ':core:mogo-core-res'
+// 公用工具类
+include ':core:mogo-core-utils'
+// 功能定义接口
+include ':core:mogo-core-function-api'
+// 模块对外暴露等调用接口
+include ':core:mogo-core-function-call'
+// 业务实现
+include ':core:function-impl:mogo-core-function-hmi'
+
+
 // 服务
 include ':services:mogo-service-api'
 include ':services:mogo-service'
@@ -19,15 +35,6 @@ include ':libraries:mogo-map-api'
 include ':libraries:map-autonavi'
 include ':libraries:mogo-map'
 
-// 核心模块
-include ':core:mogo-core-data'
-include ':core:mogo-core-utils'
-include ':core:mogo-core-function-api'
-include ':core:mogo-core-function-call'
-
-include ':core:function-impl:mogo-core-function-hmi'
-
-
 // OLD业务模块
 include ':modules:tanlulib'
 include ':modules:mogo-module-obu-mogo'