From b9aef4fa96059c04dd3e22ccba5fb6cf61ff2371 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Nov 2023 10:26:00 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[noop]=20[=E5=88=A0=E9=99=A4=20noop?= =?UTF-8?q?=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-noop/.gitignore | 1 - OCH/mogo-och-noop/build.gradle | 71 ---------------- OCH/mogo-och-noop/consumer-rules.pro | 0 OCH/mogo-och-noop/gradle.properties | 3 - OCH/mogo-och-noop/proguard-rules.pro | 21 ----- .../src/main/AndroidManifest.xml | 4 - .../main/java/com/mogo/och/noop/IMogoOCH.java | 26 ------ .../com/mogo/och/noop/MoGoOCHNoopProvider.kt | 60 -------------- .../java/com/mogo/och/noop/OCHConstants.java | 16 ---- .../java/com/mogo/och/noop/OchNoopContract.kt | 15 ---- .../java/com/mogo/och/noop/OchNoopFragment.kt | 31 ------- .../com/mogo/och/noop/OchNoopPresenter.kt | 8 -- .../main/res/layout/och_noop_fragment_hmi.xml | 80 ------------------- 13 files changed, 336 deletions(-) delete mode 100644 OCH/mogo-och-noop/.gitignore delete mode 100644 OCH/mogo-och-noop/build.gradle delete mode 100644 OCH/mogo-och-noop/consumer-rules.pro delete mode 100644 OCH/mogo-och-noop/gradle.properties delete mode 100644 OCH/mogo-och-noop/proguard-rules.pro delete mode 100644 OCH/mogo-och-noop/src/main/AndroidManifest.xml delete mode 100644 OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java delete mode 100644 OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt delete mode 100644 OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java delete mode 100644 OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt delete mode 100644 OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt delete mode 100644 OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt delete mode 100644 OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml diff --git a/OCH/mogo-och-noop/.gitignore b/OCH/mogo-och-noop/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/OCH/mogo-och-noop/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/OCH/mogo-och-noop/build.gradle b/OCH/mogo-och-noop/build.gradle deleted file mode 100644 index b387a1dd5b..0000000000 --- a/OCH/mogo-och-noop/build.gradle +++ /dev/null @@ -1,71 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' -} - -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()) - } - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - abortOnError false - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.rxjava - implementation rootProject.ext.dependencies.rxandroid - - implementation rootProject.ext.dependencies.arouter - annotationProcessor rootProject.ext.dependencies.aroutercompiler - kapt rootProject.ext.dependencies.aroutercompiler - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogoutils - implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_function_hmi - }else { - implementation project(":core:mogo-core-utils") - implementation project(":foudations:mogo-commons") - implementation project(':core:mogo-core-function-call') - implementation project(':core:function-impl:mogo-core-function-hmi') - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/mogo-och-noop/consumer-rules.pro b/OCH/mogo-och-noop/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/OCH/mogo-och-noop/gradle.properties b/OCH/mogo-och-noop/gradle.properties deleted file mode 100644 index a3c4fc4290..0000000000 --- a/OCH/mogo-och-noop/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.och -POM_ARTIFACT_ID=och-noop -VERSION_CODE=1 diff --git a/OCH/mogo-och-noop/proguard-rules.pro b/OCH/mogo-och-noop/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/OCH/mogo-och-noop/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/OCH/mogo-och-noop/src/main/AndroidManifest.xml b/OCH/mogo-och-noop/src/main/AndroidManifest.xml deleted file mode 100644 index 35d80bdbc7..0000000000 --- a/OCH/mogo-och-noop/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java deleted file mode 100644 index 2dc04ff268..0000000000 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mogo.och.noop; - -import androidx.annotation.IdRes; -import androidx.fragment.app.FragmentActivity; - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; - -public -/** - * @author congtaowang - * @since 2021/1/15 - * - * 网约车抽象接口 - */ -interface IMogoOCH extends IMoGoFunctionProvider { - - /** - * 初始化网约车容器 - * - * @param activity - * @param containerId 容器ID - */ - default void createCoverage(FragmentActivity activity, @IdRes int containerId){ - - }; -} diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt deleted file mode 100644 index 9ea1d1dfd3..0000000000 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt +++ /dev/null @@ -1,60 +0,0 @@ -package com.mogo.och.noop - -import android.content.Context -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentActivity -import com.alibaba.android.arouter.facade.annotation.Route -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d - -@Route(path = OCHConstants.PATH) -class MoGoOCHNoopProvider : IMogoOCH { - - companion object { - private const val TAG = "MogoOCHNoopProvider" - } - - override val functionName: String - get() = TAG - - private var fragment: OchNoopFragment? = null - private var containerId = 0 - private var activity: FragmentActivity? = null - - override fun init(context: Context) { - } - - private fun showFragment() { - activity?.let { - if (fragment == null) { - d(TAG, "准备add fragment======") - val fragmentByTag = it.supportFragmentManager.findFragmentByTag(TAG) - fragment = if (fragmentByTag is OchNoopFragment) { - fragmentByTag - } else { - OchNoopFragment() - } - if (!fragment!!.isAdded) { - it.supportFragmentManager.beginTransaction() - .add(containerId, fragment!!, TAG).commitAllowingStateLoss() - } - return - } - d(TAG, "准备show fragment") - fragment?.let { noopFragment -> - it.supportFragmentManager.beginTransaction().show(noopFragment) - .commitAllowingStateLoss() - } - } - } - - override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? { - this.containerId = containerId!! - this.activity = activity - showFragment() - return null - } - - override fun onDestroy() { - - } -} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java deleted file mode 100644 index 8a5d17c35a..0000000000 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mogo.och.noop; - -public -/** - * @author congtaowang - * @since 2021/1/15 - * - * 网约车部分常量字段 - */ -class OCHConstants { - - /** - * arouter 路由地址 - */ - public static final String PATH = "/noop/api"; -} diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt deleted file mode 100644 index 855b980820..0000000000 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.och.noop - -import com.mogo.commons.mvp.IView - - -/** - *@author xiaoyuzhou - *@date 2021/8/4 3:38 下午 - */ -interface OchNoopContract { - - interface View : IView { - - } -} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt deleted file mode 100644 index 31b9425b91..0000000000 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.mogo.och.noop - -import com.mogo.commons.mvp.MvpFragment -import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView -import kotlinx.android.synthetic.main.och_noop_fragment_hmi.* - -class OchNoopFragment : MvpFragment(), - OchNoopContract.View { - - companion object { - private const val TAG = "OchNoopFragment" - } - - override fun getLayoutId(): Int { - return R.layout.och_noop_fragment_hmi - } - - override fun getTagName(): String { - return TAG - } - - override fun createPresenter(): OchNoopPresenter { - return OchNoopPresenter(this) - } - - override fun initViews() { - - } - - -} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt deleted file mode 100644 index 0d690328cf..0000000000 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.mogo.och.noop - -import com.mogo.commons.mvp.Presenter - -class OchNoopPresenter(view: OchNoopContract.View?) : - Presenter(view) { - -} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml deleted file mode 100644 index 41e0f55c3c..0000000000 --- a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file