From af07586400a3eabb085cfcea1a72bdcac81d9ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 16 Sep 2021 18:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/gradle.xml                              |  6 +-
 .../mogo-core-function-hmi}/.gitignore        |  0
 .../mogo-core-function-hmi}/build.gradle      |  0
 .../consumer-rules.pro                        |  0
 .../mogo-core-function-hmi}/gradle.properties |  0
 .../proguard-rules.pro                        |  0
 .../src/main/AndroidManifest.xml              |  2 +-
 .../mogo-core-function-call-impl/build.gradle | 56 -------------------
 .../gradle.properties                         |  3 -
 .../src/main/AndroidManifest.xml              |  5 --
 .../.gitignore                                |  0
 .../build.gradle                              |  2 +-
 .../consumer-rules.pro                        |  0
 .../gradle.properties                         |  0
 .../proguard-rules.pro                        |  0
 .../src/main/AndroidManifest.xml              |  0
 core/mogo-core-function-impl/.gitignore       |  1 -
 .../consumer-rules.pro                        |  0
 .../proguard-rules.pro                        | 21 -------
 settings.gradle                               |  9 +--
 20 files changed, 10 insertions(+), 95 deletions(-)
 rename core/{mogo-core-function-call-api => function-impl/mogo-core-function-hmi}/.gitignore (100%)
 rename core/{mogo-core-function-impl => function-impl/mogo-core-function-hmi}/build.gradle (100%)
 rename core/{mogo-core-function-call-api => function-impl/mogo-core-function-hmi}/consumer-rules.pro (100%)
 rename core/{mogo-core-function-impl => function-impl/mogo-core-function-hmi}/gradle.properties (100%)
 rename core/{mogo-core-function-call-api => function-impl/mogo-core-function-hmi}/proguard-rules.pro (100%)
 rename core/{mogo-core-function-impl => function-impl/mogo-core-function-hmi}/src/main/AndroidManifest.xml (71%)
 delete mode 100644 core/mogo-core-function-call-impl/build.gradle
 delete mode 100644 core/mogo-core-function-call-impl/gradle.properties
 delete mode 100644 core/mogo-core-function-call-impl/src/main/AndroidManifest.xml
 rename core/{mogo-core-function-call-impl => mogo-core-function-call}/.gitignore (100%)
 rename core/{mogo-core-function-call-api => mogo-core-function-call}/build.gradle (95%)
 rename core/{mogo-core-function-call-impl => mogo-core-function-call}/consumer-rules.pro (100%)
 rename core/{mogo-core-function-call-api => mogo-core-function-call}/gradle.properties (100%)
 rename core/{mogo-core-function-call-impl => mogo-core-function-call}/proguard-rules.pro (100%)
 rename core/{mogo-core-function-call-api => mogo-core-function-call}/src/main/AndroidManifest.xml (100%)
 delete mode 100644 core/mogo-core-function-impl/.gitignore
 delete mode 100644 core/mogo-core-function-impl/consumer-rules.pro
 delete mode 100644 core/mogo-core-function-impl/proguard-rules.pro

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3eb9e5dad1..e5a1ccc208 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -17,11 +17,11 @@
             <option value="$PROJECT_DIR$/OCH/mogo-och-taxi" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/core" />
+            <option value="$PROJECT_DIR$/core/function-impl" />
+            <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-hmi" />
             <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-api" />
-            <option value="$PROJECT_DIR$/core/mogo-core-function-call-impl" />
-            <option value="$PROJECT_DIR$/core/mogo-core-function-impl" />
+            <option value="$PROJECT_DIR$/core/mogo-core-function-call" />
             <option value="$PROJECT_DIR$/foudations" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-sdk" />
             <option value="$PROJECT_DIR$/foudations/mogo-commons" />
diff --git a/core/mogo-core-function-call-api/.gitignore b/core/function-impl/mogo-core-function-hmi/.gitignore
similarity index 100%
rename from core/mogo-core-function-call-api/.gitignore
rename to core/function-impl/mogo-core-function-hmi/.gitignore
diff --git a/core/mogo-core-function-impl/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle
similarity index 100%
rename from core/mogo-core-function-impl/build.gradle
rename to core/function-impl/mogo-core-function-hmi/build.gradle
diff --git a/core/mogo-core-function-call-api/consumer-rules.pro b/core/function-impl/mogo-core-function-hmi/consumer-rules.pro
similarity index 100%
rename from core/mogo-core-function-call-api/consumer-rules.pro
rename to core/function-impl/mogo-core-function-hmi/consumer-rules.pro
diff --git a/core/mogo-core-function-impl/gradle.properties b/core/function-impl/mogo-core-function-hmi/gradle.properties
similarity index 100%
rename from core/mogo-core-function-impl/gradle.properties
rename to core/function-impl/mogo-core-function-hmi/gradle.properties
diff --git a/core/mogo-core-function-call-api/proguard-rules.pro b/core/function-impl/mogo-core-function-hmi/proguard-rules.pro
similarity index 100%
rename from core/mogo-core-function-call-api/proguard-rules.pro
rename to core/function-impl/mogo-core-function-hmi/proguard-rules.pro
diff --git a/core/mogo-core-function-impl/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml
similarity index 71%
rename from core/mogo-core-function-impl/src/main/AndroidManifest.xml
rename to core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml
index 851765d341..7e30806cb7 100644
--- a/core/mogo-core-function-impl/src/main/AndroidManifest.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml
@@ -1,5 +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.impl">
+    package="com.mogo.eagle.core.function.hmi">
 
 </manifest>
\ No newline at end of file
diff --git a/core/mogo-core-function-call-impl/build.gradle b/core/mogo-core-function-call-impl/build.gradle
deleted file mode 100644
index 5846c9fe1a..0000000000
--- a/core/mogo-core-function-call-impl/build.gradle
+++ /dev/null
@@ -1,56 +0,0 @@
-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
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
-    if (Boolean.valueOf(RELEASE)) {
-
-    } else {
-        implementation project(':core:mogo-core-data')
-        implementation project(':core:mogo-core-function-call-api')
-        implementation project(':core:mogo-core-function-api')
-        implementation project(':core:mogo-core-function-impl')
-    }
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/core/mogo-core-function-call-impl/gradle.properties b/core/mogo-core-function-call-impl/gradle.properties
deleted file mode 100644
index dd78649fa7..0000000000
--- a/core/mogo-core-function-call-impl/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.eagle.core
-POM_ARTIFACT_ID=function-call-impl
-VERSION_CODE=1
diff --git a/core/mogo-core-function-call-impl/src/main/AndroidManifest.xml b/core/mogo-core-function-call-impl/src/main/AndroidManifest.xml
deleted file mode 100644
index 479830019d..0000000000
--- a/core/mogo-core-function-call-impl/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.eagle.core.function.call.impl">
-
-</manifest>
\ No newline at end of file
diff --git a/core/mogo-core-function-call-impl/.gitignore b/core/mogo-core-function-call/.gitignore
similarity index 100%
rename from core/mogo-core-function-call-impl/.gitignore
rename to core/mogo-core-function-call/.gitignore
diff --git a/core/mogo-core-function-call-api/build.gradle b/core/mogo-core-function-call/build.gradle
similarity index 95%
rename from core/mogo-core-function-call-api/build.gradle
rename to core/mogo-core-function-call/build.gradle
index b216f129de..a4854e67fe 100644
--- a/core/mogo-core-function-call-api/build.gradle
+++ b/core/mogo-core-function-call/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     } else {
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-function-api')
-        implementation project(':core:mogo-core-function-impl')
+        implementation project(':core:function-impl:mogo-core-function-hmi')
     }
 }
 
diff --git a/core/mogo-core-function-call-impl/consumer-rules.pro b/core/mogo-core-function-call/consumer-rules.pro
similarity index 100%
rename from core/mogo-core-function-call-impl/consumer-rules.pro
rename to core/mogo-core-function-call/consumer-rules.pro
diff --git a/core/mogo-core-function-call-api/gradle.properties b/core/mogo-core-function-call/gradle.properties
similarity index 100%
rename from core/mogo-core-function-call-api/gradle.properties
rename to core/mogo-core-function-call/gradle.properties
diff --git a/core/mogo-core-function-call-impl/proguard-rules.pro b/core/mogo-core-function-call/proguard-rules.pro
similarity index 100%
rename from core/mogo-core-function-call-impl/proguard-rules.pro
rename to core/mogo-core-function-call/proguard-rules.pro
diff --git a/core/mogo-core-function-call-api/src/main/AndroidManifest.xml b/core/mogo-core-function-call/src/main/AndroidManifest.xml
similarity index 100%
rename from core/mogo-core-function-call-api/src/main/AndroidManifest.xml
rename to core/mogo-core-function-call/src/main/AndroidManifest.xml
diff --git a/core/mogo-core-function-impl/.gitignore b/core/mogo-core-function-impl/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/core/mogo-core-function-impl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/core/mogo-core-function-impl/consumer-rules.pro b/core/mogo-core-function-impl/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/mogo-core-function-impl/proguard-rules.pro b/core/mogo-core-function-impl/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/core/mogo-core-function-impl/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/settings.gradle b/settings.gradle
index 034b271362..0a9415f2e1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,11 +23,12 @@ include ':libraries:tanlulib'
 // 核心模块
 include ':core:mogo-core-data'
 include ':core:mogo-core-function-api'
-include ':core:mogo-core-function-impl'
-include ':core:mogo-core-function-call-api'
-include ':core:mogo-core-function-call-impl'
+include ':core:mogo-core-function-call'
 
-// 业务模块
+include ':core:function-impl:mogo-core-function-hmi'
+
+
+// OLD业务模块
 include ':modules:mogo-module-obu-mogo'
 include ':modules:mogo-module-hmi'
 include ':modules:mogo-module-widgets'