From fe79330014a0314e2faf189fb925386019d63842 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 2 Mar 2022 18:32:39 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E8=BF=81=E7=A7=BBmogo-module-extens?= =?UTF-8?q?ions=E5=88=B0MoGoEagleEye.core.function-impl.mogo-core-function?= =?UTF-8?q?-monitoring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../mogo-core-function-main/build.gradle | 2 - .../live/CameraLiveGSYVideoView.java | 8 +- .../function}/live/CameraLiveManager.java | 24 +- .../live}/CameraLiveNoticeHelper.java | 7 +- .../function}/live/CameraWindow3DAdapter.java | 2 +- .../live/ExtensionServiceManager.java | 2 +- .../function}/live/PushCameraLiveWindow.java | 15 +- .../core/function}/live/PushDataType.java | 2 +- .../live/impl/AbsCameraScenario.java | 2 +- .../function}/live/impl/ICameraScenario.java | 2 +- .../function}/live/impl/ICameraWindow.java | 2 +- .../src/main/res/drawable-ldpi/icon_space.png | Bin .../src/main/res/drawable-mdpi/icon_space.png | Bin .../module_camera_normal_traffic.png | Bin .../drawable-xhdpi/icon_live_load_error.png | Bin .../main/res/drawable-xhdpi/icon_space.png | Bin .../module_camera_normal_traffic.png | Bin .../res/drawable/shape_react_blue_grident.xml | 0 .../res/drawable/shape_react_gray_grident.xml | 0 .../main/res/drawable/shape_round_gray.xml | 0 .../main/res/drawable/v2x_alert_window_bg.xml | 0 .../res/drawable/v2x_refresh_button_bg.xml | 0 .../res/layout/camera_item_v2x_live_video.xml | 4 +- .../res/layout/camera_push_live_video.xml | 2 +- .../camera_view_video_layout_normal.xml | 4 +- .../main/res/layout/dialog_navi_notice.xml | 0 .../src/main/res/values/colors.xml | 7 + .../src/main/res/values/strings.xml | 4 + modules.txt | 1 - .../mogo/module/common/MogoModulePaths.java | 18 - modules/mogo-module-extensions/.gitignore | 1 - modules/mogo-module-extensions/README.md | 9 - modules/mogo-module-extensions/build.gradle | 91 --- .../mogo-module-extensions/consumer-rules.pro | 7 - .../mogo-module-extensions/gradle.properties | 3 - .../mogo-module-extensions/proguard-rules.pro | 28 - .../src/main/AndroidManifest.xml | 2 - .../extensions/ExtensionsModuleConst.java | 13 - .../module/extensions/ExtensionsView.java | 13 - .../module/extensions/bean/CommonConfig.java | 57 -- .../extensions/bean/CommonConfigResponse.java | 13 - .../extensions/entrance/EntranceFragment.java | 262 --------- .../entrance/EntrancePresenter.java | 87 --- .../extensions/entrance/EntranceProvider.java | 94 ---- .../extensions/entrance/EntranceView.java | 12 - .../mogo/module/extensions/navi/TopView.java | 100 ---- .../extensions/net/GetConfigApiServices.java | 20 - .../utils/NoMapTopViewShaderHelper.java | 65 --- .../extensions/utils/TopViewAnimHelper.java | 522 ------------------ .../extensions/utils/TopViewManager.java | 146 ----- .../utils/TopViewNoLinkageAnimHelper.java | 207 ------- .../res/drawable/shape_react_gray_round.xml | 12 - .../res/layout/module_ext_layout_entrance.xml | 31 -- .../src/main/res/values-ldpi/dimens.xml | 9 - .../main/res/values-mdpi-1920x720/styles.xml | 6 - .../src/main/res/values-mdpi/styles.xml | 6 - .../res/values-xhdpi-1920x1000/dimens.xml | 142 ----- .../res/values-xhdpi-1920x1000/styles.xml | 6 - .../res/values-xhdpi-2560x1440/dimens.xml | 5 - .../src/main/res/values-xhdpi/styles.xml | 6 - .../src/main/res/values/attrs.xml | 11 - .../src/main/res/values/colors.xml | 17 - .../src/main/res/values/dimens.xml | 217 -------- .../src/main/res/values/ids.xml | 4 - .../src/main/res/values/strings.xml | 54 -- .../src/main/res/values/styles.xml | 10 - .../com/mogo/module/main/MainActivity.java | 1 - .../module/main/cards/MogoModulesHandler.java | 8 - .../module/main/cards/MogoModulesManager.java | 9 - .../windowview/IMogoTopViewManager.java | 85 +-- settings.gradle | 1 - 71 files changed, 50 insertions(+), 2450 deletions(-) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/CameraLiveGSYVideoView.java (94%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/CameraLiveManager.java (75%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live}/CameraLiveNoticeHelper.java (96%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/CameraWindow3DAdapter.java (94%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/ExtensionServiceManager.java (90%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/PushCameraLiveWindow.java (86%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/PushDataType.java (84%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/impl/AbsCameraScenario.java (95%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/impl/ICameraScenario.java (91%) rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function}/live/impl/ICameraWindow.java (85%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable-ldpi/icon_space.png (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable-mdpi/icon_space.png (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable-mdpi/module_camera_normal_traffic.png (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable-xhdpi/icon_live_load_error.png (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable-xhdpi/icon_space.png (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable-xhdpi/module_camera_normal_traffic.png (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable/shape_react_blue_grident.xml (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable/shape_react_gray_grident.xml (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable/shape_round_gray.xml (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable/v2x_alert_window_bg.xml (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/drawable/v2x_refresh_button_bg.xml (100%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/layout/camera_item_v2x_live_video.xml (92%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/layout/camera_push_live_video.xml (91%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/layout/camera_view_video_layout_normal.xml (95%) rename {modules/mogo-module-extensions => core/function-impl/mogo-core-function-monitoring}/src/main/res/layout/dialog_navi_notice.xml (100%) create mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml create mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml delete mode 100644 modules/mogo-module-extensions/.gitignore delete mode 100644 modules/mogo-module-extensions/README.md delete mode 100644 modules/mogo-module-extensions/build.gradle delete mode 100644 modules/mogo-module-extensions/consumer-rules.pro delete mode 100644 modules/mogo-module-extensions/gradle.properties delete mode 100644 modules/mogo-module-extensions/proguard-rules.pro delete mode 100644 modules/mogo-module-extensions/src/main/AndroidManifest.xml delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/TopView.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_round.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values-mdpi-1920x720/styles.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values-mdpi/styles.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/styles.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi/styles.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values/attrs.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values/colors.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values/dimens.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values/ids.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values/strings.xml delete mode 100644 modules/mogo-module-extensions/src/main/res/values/styles.xml diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index f24479d0cd..bc53666dd2 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -68,7 +68,6 @@ dependencies { api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.modulecommon api rootProject.ext.dependencies.mogoservice - api rootProject.ext.dependencies.moduleextensions api rootProject.ext.dependencies.callchat api rootProject.ext.dependencies.callchatprovider api rootProject.ext.dependencies.mapcustom @@ -95,7 +94,6 @@ dependencies { api project(':foudations:mogo-commons') api project(':modules:mogo-module-common') api project(':modules:mogo-module-service') - api project(':modules:mogo-module-extensions') api project(':modules:mogo-module-carchatting') api project(':modules:mogo-module-carchattingprovider') api project(':libraries:map-custom') diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveGSYVideoView.java similarity index 94% rename from modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java rename to core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveGSYVideoView.java index ad8a9def71..5bb6f798d6 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java +++ b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveGSYVideoView.java @@ -1,7 +1,6 @@ -package com.mogo.module.extensions.live; +package com.mogo.eagle.core.function.live; import android.content.Context; -import android.graphics.PorterDuff; import android.os.Bundle; import android.text.TextUtils; import android.util.AttributeSet; @@ -11,11 +10,10 @@ import android.widget.ProgressBar; import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.core.content.ContextCompat; +import com.mogo.eagle.core.function.monitoring.R; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.widget.LiveRoundLayout; -import com.mogo.module.extensions.R; import com.tencent.rtmp.ITXLivePlayListener; import com.tencent.rtmp.TXLiveConstants; import com.tencent.rtmp.TXLivePlayConfig; @@ -69,7 +67,7 @@ public class CameraLiveGSYVideoView extends LiveRoundLayout { mLivePlayer.enableHardwareDecode(true); mLoading = findViewById(R.id.loading); - mLoading.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(context, R.color.module_live_video_progress_bar_loading_color), PorterDuff.Mode.MULTIPLY); + // mLoading.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(context, R.color.module_live_video_progress_bar_loading_color), PorterDuff.Mode.MULTIPLY); mClLoadError = findViewById(R.id.clLoadError); mTvRefreshButton = findViewById(R.id.tvRefreshButton); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveManager.java similarity index 75% rename from modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java rename to core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveManager.java index 0c2499ec2a..8d15184971 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java +++ b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveManager.java @@ -1,17 +1,13 @@ -package com.mogo.module.extensions.live; +package com.mogo.eagle.core.function.live; import android.util.Log; import android.view.View; -import android.view.ViewGroup; import androidx.annotation.Nullable; import com.mogo.cloud.socket.entity.SocketDownData; -import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.extensions.R; -import com.mogo.module.extensions.live.impl.AbsCameraScenario; +import com.mogo.eagle.core.function.live.impl.AbsCameraScenario; import com.mogo.service.windowview.IMogoTopViewStatusListener; /** @@ -57,14 +53,14 @@ public class CameraLiveManager extends AbsCameraScenario - @@ -59,7 +59,7 @@ android:paddingBottom="@dimen/dp_25" android:text="重试" android:textColor="@color/v2x_FFF_333" - android:textSize="@dimen/module_event_live_error_text_size" + android:textSize="@dimen/dp_20" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/ivErrorIcon" /> diff --git a/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml similarity index 100% rename from modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml rename to core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml new file mode 100644 index 0000000000..35753f4dd0 --- /dev/null +++ b/core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + + #FFFFFF + + #323C6F + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml new file mode 100644 index 0000000000..71e2be73b1 --- /dev/null +++ b/core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + mogo-module-extensions + + diff --git a/modules.txt b/modules.txt index ac24aa7e14..57154e1f71 100644 --- a/modules.txt +++ b/modules.txt @@ -27,7 +27,6 @@ :core:function-impl:mogo-core-function-check :services:mogo-service :core:function-impl:mogo-core-function-smp -:modules:mogo-module-extensions :modules:mogo-module-main :core:function-impl:mogo-core-function-autopilot :core:function-impl:mogo-core-function-hmi diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java index be70a3baf3..b0d243ef8c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java @@ -2,8 +2,6 @@ package com.mogo.module.common; import android.text.TextUtils; -import androidx.annotation.Keep; - import java.util.ArrayList; import java.util.List; @@ -24,22 +22,6 @@ public class MogoModulePaths { private static final List mModuleFunctionServers = new ArrayList<>(); - /** - * 地图模块 fragment 路径 - */ - public static final String PATH_MODULE_MAP = "/map/ui"; - - /** - * app列表模块实例化路径 - */ - @Keep - public static final String PATH_MODULE_APPS = "/appslist/ui"; - - /** - * 快捷操作入口：定位、 - */ - public static final String PATH_ENTRANCE = "/extension/entrance"; - /** * 添加卡片模块 * diff --git a/modules/mogo-module-extensions/.gitignore b/modules/mogo-module-extensions/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/modules/mogo-module-extensions/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/modules/mogo-module-extensions/README.md b/modules/mogo-module-extensions/README.md deleted file mode 100644 index 0c9544301a..0000000000 --- a/modules/mogo-module-extensions/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# launcher头部模块 - -## 通知 - -## 天气 - -## 时间 - -## 入口按钮，高德SDK导航控制 \ No newline at end of file diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle deleted file mode 100644 index 4b63e7ffee..0000000000 --- a/modules/mogo-module-extensions/build.gradle +++ /dev/null @@ -1,91 +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 { - targetCompatibility 1.8 - sourceCompatibility 1.8 - } - - sourceSets { - main { - res.srcDirs = ['src/main/res', 'src/main/res-light'] - } - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation rootProject.ext.dependencies.androidxcardview - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - - implementation rootProject.ext.dependencies.arouter - kapt rootProject.ext.dependencies.aroutercompiler - - implementation rootProject.ext.dependencies.rxjava - implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.livesdk - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - api rootProject.ext.dependencies.mogomapapi - api rootProject.ext.dependencies.mogocommons - api rootProject.ext.dependencies.mogoserviceapi - implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.moduleservice - - api rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_res - implementation rootProject.ext.dependencies.mogo_core_function_call - } else { - api project(":libraries:mogo-map-api") - api project(":foudations:mogo-commons") - api project(':services:mogo-service-api') - implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-service') - - api project(':core:mogo-core-utils') - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-function-call') - - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-extensions/consumer-rules.pro b/modules/mogo-module-extensions/consumer-rules.pro deleted file mode 100644 index 4baec1f835..0000000000 --- a/modules/mogo-module-extensions/consumer-rules.pro +++ /dev/null @@ -1,7 +0,0 @@ -#-----ExtensionModule----- --keep class com.mogo.module.extensions.live.CameraLiveGSYVideoView{*;} --keep class com.mogo.module.extensions.live.PushCameraLiveWindow{*;} --keep class com.mogo.module.extensions.navi.*{*;} --keep class com.mogo.module.extensions.userinfo.*{*;} --keep class com.mogo.module.extensions.view.*{*;} --keep class com.mogo.module.extensions.bean.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-extensions/gradle.properties b/modules/mogo-module-extensions/gradle.properties deleted file mode 100644 index c1b546a86e..0000000000 --- a/modules/mogo-module-extensions/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-extensions -VERSION_CODE=1 diff --git a/modules/mogo-module-extensions/proguard-rules.pro b/modules/mogo-module-extensions/proguard-rules.pro deleted file mode 100644 index c9e77ea0d8..0000000000 --- a/modules/mogo-module-extensions/proguard-rules.pro +++ /dev/null @@ -1,28 +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 - -#-----ExtensionModule----- --keep class com.mogo.module.extensions.userinfo.**{*;} --keep class com.mogo.module.extensions.weather.Phenomena --keep class com.mogo.module.extensions.utils.TopViewAnimHelper --keep class com.mogo.module.extensions.ExtensionsView --keep class com.mogo.module.extensions.ExtensionsModuleConst \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/AndroidManifest.xml b/modules/mogo-module-extensions/src/main/AndroidManifest.xml deleted file mode 100644 index a63d81e066..0000000000 --- a/modules/mogo-module-extensions/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java deleted file mode 100644 index fef0daee39..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.module.extensions; - -/** - * @author congtaowang - * @since 2020-01-05 - *

- * 描述 - */ -public class ExtensionsModuleConst { - - public static final String TYPE_ENTRANCE = "entrance"; - -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java deleted file mode 100644 index 6a9c127a58..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.module.extensions; - -import com.mogo.commons.mvp.IView; - -/** - * @author congtaowang - * @since 2020-01-05 - *

- * 描述 - */ -public interface ExtensionsView extends IView { - -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java deleted file mode 100644 index 68a8a05755..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.mogo.module.extensions.bean; - -/** - * @author lixiaopeng - * @description - * @since 2020/9/22 - */ -public class CommonConfig { - - public Active active;//活动配置 - public Auth auth; //授权配置 - public Speech speech; //语音播报次数 - public ReportStrategy reportStrategy; //被动上报策略开关 - - public CommonConfig(Active active, Auth auth, Speech speech, ReportStrategy reportStrategy) { - this.active = active; - this.auth = auth; - this.speech = speech; - this.reportStrategy = reportStrategy; - } - - public class Active{ - public String imageUrl; - public String webUrl; - public int status; - - Active(String imageUrl, String webUrl, int status) { - this.imageUrl = imageUrl; - this.webUrl = webUrl; - this.status = status; - } - } - - - public class Speech{ - public int count; - - Speech(int count) { - this.count = count; - } - } - - public class Auth{ - int isNeedAuth; - - Auth(int isNeedAuth) { - this.isNeedAuth = isNeedAuth; - } - } - - public class ReportStrategy { - public boolean open; - ReportStrategy(boolean open) { - this.open = open; - } - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java deleted file mode 100644 index fac985bffd..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.module.extensions.bean; - -import com.mogo.eagle.core.data.BaseData; - -/** - * @author lixiaopeng - * @description - * @since 2020/9/22 - */ -public class CommonConfigResponse extends BaseData { - - public CommonConfig result; -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java deleted file mode 100644 index 7b9ccd0799..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ /dev/null @@ -1,262 +0,0 @@ -package com.mogo.module.extensions.entrance; - -import static com.mogo.module.extensions.ExtensionsModuleConst.TYPE_ENTRANCE; - -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.view.MotionEvent; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; - -import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.mvp.MvpFragment; -import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.listener.MogoMapListenerHandler; -import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.map.navi.MogoNaviInfo; -import com.mogo.map.uicontroller.EnumMapUI; -import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.extensions.R; -import com.mogo.module.extensions.utils.CameraLiveNoticeHelper; -import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper; -import com.mogo.module.extensions.utils.TopViewAnimHelper; -import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper; -import com.mogo.service.IMogoServiceApis; -import com.mogo.service.intent.IMogoIntentListener; -import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.statusmanager.IMogoStatusChangedListener; -import com.mogo.service.statusmanager.IMogoStatusManager; -import com.mogo.service.statusmanager.StatusDescriptor; - -import java.util.HashMap; - -/** - * @author congtaowang - * @since 2020-01-07 - *

- * 描述 - */ -public class EntranceFragment extends MvpFragment - implements EntranceView, - IMogoNaviListener, - IMogoMapListener, - IMogoStatusChangedListener, - IMogoIntentListener { - - private static final String TAG = "EntranceFragment"; - - private IMogoServiceApis mApis; - - private IMogoRegisterCenter mMogoRegisterCenter; - private EntrancePresenter mEntrancePresenter; - private IMogoStatusManager mStatusManager; - - public static boolean isClickShare; - - private final Runnable mLockCarRunnable = new Runnable() { - @Override - public void run() { - if (!mStatusManager.isDisplayOverview()) { - return; - } - mStatusManager.setDisplayOverview(TAG, false); - } - }; - - - private final CameraLiveNoticeHelper mCameraLiveNoticeHelper = new CameraLiveNoticeHelper(); - - @Override - protected int getLayoutId() { - return R.layout.module_ext_layout_entrance; - } - - @Override - public String getTagName() { - return TAG; - } - - @Override - protected void initViews() { - mApis = MogoApisHandler.getInstance().getApis(); - - mCameraLiveNoticeHelper.init(getContext()); - - mEntrancePresenter = new EntrancePresenter(getContext(), this); - - mStatusManager = mApis.getStatusManagerApi(); - - ConstraintLayout rootView = findViewById(R.id.module_entrance_id_top_motion_layout); - if (rootView != null) { - TopViewAnimHelper.getInstance().init(rootView); - TopViewNoLinkageAnimHelper.getInstance().init(rootView); - } - - mApis.getIntentManagerApi().registerIntentListener(AUTONAVI_STANDARD_BROADCAST_RECV, this); - - listenSeekNumber(); - } - - - /** - * 地图移动和缩放回调 - * - * @param latLng 中点的经纬度 - * @param zoom 缩放大小 - * @param tilt 倾斜度 - * @param bearing 旋转角度 - */ - @Override - public void onMapChanged(MogoLatLng latLng, float zoom, float tilt, float bearing) { - - } - - - @Override - public void onTouch(MotionEvent motionEvent) { - switch (motionEvent.getAction()) { - case MotionEvent.ACTION_DOWN: - UiThreadHandler.removeCallbacks(mLockCarRunnable); - break; - - case MotionEvent.ACTION_UP: - - break; - - case MotionEvent.ACTION_MOVE: - - break; - } - } - - private static final String AUTONAVI_STANDARD_BROADCAST_RECV = - "AUTONAVI_STANDARD_BROADCAST_RECV"; - - @NonNull - @Override - protected EntrancePresenter createPresenter() { - return mEntrancePresenter; - } - - @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - mMogoRegisterCenter = mApis.getRegisterCenterApi(); - - mMogoRegisterCenter.registerMogoNaviListener(TYPE_ENTRANCE, this); - mMogoRegisterCenter.registerMogoMapListener(TYPE_ENTRANCE, this); - - mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.UPLOADING, this); - mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.DISPLAY_OVERVIEW, this); - mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this); - - //TODO 因为衡阳6.30交付没有2D模式，临时方案，进入vr模式，不可缩放地图 - // 进入鹰眼模式，设置手势缩放地图失效 - Logger.d(TAG, "进入vr模式"); - MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true); - MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.Type_VR); - - } - - @Override - public void onResume() { - super.onResume(); - if (mStatusManager.isTopContainerReady()) { - return; - } - mStatusManager.setTopContainerReady(TAG, true); - } - - @Override - public void onDestroyView() { - mCameraLiveNoticeHelper.release(); - super.onDestroyView(); - isClickShare = false; - mStatusManager.setTopContainerReady(TAG, false); - TopViewAnimHelper.getInstance().removeAllView(); - TopViewAnimHelper.getInstance().clear(); - TopViewNoLinkageAnimHelper.getInstance().removeAllView(); - TopViewNoLinkageAnimHelper.getInstance().clear(); - NoMapTopViewShaderHelper.getInstance().release(); - mCameraLiveNoticeHelper.release(); - } - - @Override - public void onIntentReceived(String intentStr, Intent intent) { - int key_type = intent.getIntExtra("KEY_TYPE", 0); - if (key_type == 10021) { - try { - onStopNavi(); - } catch (Exception e) { - Logger.e(TAG, e, "onIntentReceived -> 10021"); - } - } - } - - - @Override - public void onStartNavi() { - if (!DebugConfig.isMapBased()) { - return; - } - TopViewAnimHelper.getInstance().showNaviView(); - mApis.getAnalyticsApi().track("Navigation_begin", new HashMap<>()); - } - - @Override - public void onStopNavi() { - if (!DebugConfig.isMapBased()) { - return; - } - TopViewAnimHelper.getInstance().hideNaviView(); - } - - - @Override - public void onLockMap(boolean isLock) { - if (isLock) { - if (mStatusManager.isDisplayOverview()) { - mStatusManager.setDisplayOverview(TAG, false); - } - } - } - - @Override - public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { - Logger.d(TAG, "descriptor=" + descriptor + " isTrue=" + isTrue); - } - - private void listenSeekNumber() { - mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.SEEK_HELPING, this); - } - - @Override - public void onDestroy() { - super.onDestroy(); - if (mMogoRegisterCenter != null) { - mMogoRegisterCenter.unregisterMogoNaviListener(TYPE_ENTRANCE); - mMogoRegisterCenter.unregisterMogoMapListener(TYPE_ENTRANCE); - } - if (mStatusManager != null) { - mStatusManager.unregisterStatusChangedListener(TAG, StatusDescriptor.UPLOADING, this); - mStatusManager.unregisterStatusChangedListener(TAG, StatusDescriptor.DISPLAY_OVERVIEW - , this); - mStatusManager.unregisterStatusChangedListener(TAG, StatusDescriptor.SEEK_HELPING, this); - mStatusManager.unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this); - } - if (mApis != null) { - if (mApis.getIntentManagerApi() != null) { - mApis.getIntentManagerApi().unregisterIntentListener(AUTONAVI_STANDARD_BROADCAST_RECV, this); - } - } - } - - -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java deleted file mode 100644 index 356058af17..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.mogo.module.extensions.entrance; - -import android.content.Context; -import android.util.ArrayMap; - -import androidx.annotation.NonNull; -import androidx.lifecycle.LifecycleOwner; - -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.mvp.Presenter; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.constants.HostConst; -import com.mogo.module.extensions.bean.CommonConfig; -import com.mogo.module.extensions.bean.CommonConfigResponse; -import com.mogo.module.extensions.net.GetConfigApiServices; -import com.mogo.service.network.IMogoNetwork; - -import java.util.Map; - -import io.reactivex.SingleObserver; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; - -/** - * @author congtaowang - * @since 2020-01-07 - *

- * 描述 - */ -public class EntrancePresenter extends Presenter { - private static final String TAG = "EntrancePresenter"; - - private IMogoNetwork mNetWork; - - public EntrancePresenter(Context context, EntranceView view) { - super(view); - mNetWork = MogoApisHandler.getInstance().getApis().getNetworkApi(); - } - - @Override - public void onResume(@NonNull LifecycleOwner owner) { - super.onResume(owner); - getCommonConfig(); - } - - public void getCommonConfig() { - Map params = new ArrayMap<>(); - params.put("sn", MoGoAiCloudClientConfig.getInstance().getSn()); - mNetWork.create(GetConfigApiServices.class, HostConst.DATA_SERVICE_HOST) - .getConfig(params) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - } - - @Override - public void onSuccess(CommonConfigResponse config) { - Logger.d(TAG, "getCommonConfig onSuccess -----> "); - if (config != null && config.result != null) { - CommonConfig.ReportStrategy strategy = config.result.reportStrategy; - if (strategy != null) { - Logger.d(TAG, - "getCommonConfig onSuccess strategy.open = " + strategy.open); - SharedPrefsMgr.getInstance(getContext()).putBoolean( - "KEY_SERVER_REPORTSTRATEGY_SWITCH", strategy.open); - } else { - Logger.e(TAG, "getCommonConfig onSuccess strategy == null "); - } - } else { - Logger.e(TAG, "getCommonConfig onSuccess config == null"); - } - } - - @Override - public void onError(Throwable e) { - e.printStackTrace(); - Logger.e(TAG, "getCommonConfig onError ---> e = " + e); - } - }); - } - -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java deleted file mode 100644 index e32d5850ff..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.mogo.module.extensions.entrance; - -import android.content.Context; -import android.os.Bundle; -import android.util.Log; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.module.common.MogoModulePaths; -import com.mogo.module.extensions.live.ExtensionServiceManager; -import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; -import com.mogo.service.module.ModuleType; - -/** - * @author congtaowang - * @since 2020-01-07 - *

- * 描述 - */ -@Route( path = MogoModulePaths.PATH_ENTRANCE ) -public class EntranceProvider implements IMogoModuleProvider { - - @Override - public Fragment createFragment( Context context, Bundle data ) { - EntranceFragment mFragment = new EntranceFragment(); - mFragment.setArguments( data ); - ExtensionServiceManager.init( context ); - return mFragment; - } - - @Override - public View createView( Context context ) { - return null; - } - - @NonNull - @Override - public String getModuleName() { - return null; - } - - @Override - public IMogoModuleLifecycle getCardLifecycle() { - return null; - } - - @Override - public IMogoMapListener getMapListener() { - return null; - } - - @Override - public int getType() { - return ModuleType.TYPE_ENTRANCE; - } - - @Override - public IMogoNaviListener getNaviListener() { - return null; - } - - @Override - public IMogoLocationListener getLocationListener() { - return null; - } - - @Override - public void init( Context context ) { - ExtensionServiceManager.init( context ); - } - - @Override - public IMogoMarkerClickListener getMarkerClickListener() { - return null; - } - - @Override - public String getAppPackage() { - return null; - } - - @Override - public String getAppName() { - return null; - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java deleted file mode 100644 index 389a33207e..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mogo.module.extensions.entrance; - -import com.mogo.module.extensions.ExtensionsView; - -/** - * @author congtaowang - * @since 2020-01-07 - *

- * 描述 - */ -public interface EntranceView extends ExtensionsView { -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/TopView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/TopView.java deleted file mode 100644 index cb96af5ff6..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/TopView.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.mogo.module.extensions.navi; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewConfiguration; -import android.widget.FrameLayout; - -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; - - -/** - * 顶部view封装，用于处理手指滑动 - */ -public class TopView extends FrameLayout { - public TopView(Context context) { - super(context); - } - - public TopView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public TopView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - private OnTopViewSlideListener slideListener; - private OnChildAddedListener childAddedListener; - - @Override - public boolean onTouchEvent(MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_UP) { - // 简单处理，只要手指抬起的位置在按下的位置上面（就是手指上划），就触发外面的动画 - if (event.getY() < originY) { - if (slideListener != null) { - slideListener.onSlideUp(); - } - return true; - } - } - return super.onTouchEvent(event); - } - - private float originX,originY; - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - if (ev.getAction() == MotionEvent.ACTION_DOWN) { - originY = ev.getY(); - originX = ev.getY(); - } else if (ev.getAction() == MotionEvent.ACTION_MOVE) { - // 垂直滑动，事件拦截 - return Math.abs(originY - ev.getY()) > ViewConfiguration.get(getContext()).getScaledTouchSlop(); - } - return false; - } - - public void setSlideListener(OnTopViewSlideListener slideListener) { - this.slideListener = slideListener; - } - - public void setChildAddedListener(OnChildAddedListener childAddedListener) { - this.childAddedListener = childAddedListener; - } - - public interface OnTopViewSlideListener { - /** - * 监听到view上滑 - */ - void onSlideUp(); - } - - @Override - public void onViewAdded(View child) { - super.onViewAdded(child); - Logger.d("TopView", "onViewAdded==" + child); - child.post(() -> { - if (childAddedListener != null) { - childAddedListener.onChildAdded(child); - } - }); - } - - @Override - public void onViewRemoved(View child) { - super.onViewRemoved(child); - Logger.d("TopView", "onViewRemoved: " + child); - } - - public interface OnChildAddedListener { - /** - * 子view添加完成，但是并不确定已经绘制完成 - * - * @param child - */ - void onChildAdded(View child); - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java deleted file mode 100644 index 0afe1a99e5..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.module.extensions.net; - -import com.mogo.module.extensions.bean.CommonConfigResponse; - -import java.util.Map; - -import io.reactivex.Single; -import retrofit2.http.GET; -import retrofit2.http.QueryMap; - -/** - * 获取配置信息 - */ -public interface GetConfigApiServices { - - @GET("dataSave/car/customConfig/no/getAll/v1") - Single getConfig(@QueryMap Map parameters); - - -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java deleted file mode 100644 index 04e4163d71..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.mogo.module.extensions.utils; - -import android.view.View; - -import com.mogo.commons.debug.DebugConfig; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; - -/** - * 没有地图场景下，topView底层蒙版帮助类，因为有两个地方涉及到蒙版的显示隐藏{@link TopViewAnimHelper}和{@link TopViewNoLinkageAnimHelper} - * 为了不冲突，采用显示计数的方式进行兼容 - * - * @author tongchenfei - */ -public class NoMapTopViewShaderHelper { - private static final String TAG = "NoMapTopViewShaderHelper"; - private static final NoMapTopViewShaderHelper ourInstance = new NoMapTopViewShaderHelper(); - - public static NoMapTopViewShaderHelper getInstance() { - return ourInstance; - } - - private NoMapTopViewShaderHelper() { - } - - private View shader; - private int showCount = 0; - - public void initShaderView(View shader) { - this.shader = shader; - } - - public void showShader(){ - if (this.shader == null) { - Logger.e(TAG, "shader view is null!"); - return; - } - if (DebugConfig.isMapBased()) { - Logger.d(TAG, "基于地图版本不加shader"); - return; - } - if (showCount == 0) { - shader.setVisibility(View.VISIBLE); - } - showCount++; - } - - public void hideShader(){ - if (this.shader == null) { - Logger.e(TAG, "shader view is null!"); - return; - } - if (DebugConfig.isMapBased()) { - Logger.d(TAG, "基于地图版本不加shader"); - return; - } - if (showCount == 1) { - shader.setVisibility(View.GONE); - } - showCount--; - } - - public void release(){ - shader = null; - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java deleted file mode 100644 index cb1d311f83..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ /dev/null @@ -1,522 +0,0 @@ -package com.mogo.module.extensions.utils; - -import android.animation.Animator; -import android.util.ArrayMap; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; - -import androidx.constraintlayout.widget.ConstraintLayout; - -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.map.Scene; -import com.mogo.module.extensions.ExtensionsModuleConst; -import com.mogo.module.extensions.R; -import com.mogo.module.extensions.navi.TopView; -import com.mogo.service.windowview.IMogoTopViewStatusListener; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - - -/** - * 顶部动画帮助类 - * - * @author tongchenfei - */ -public class TopViewAnimHelper { - private static final String TAG = "TopViewAnimHelper"; - - private ConstraintLayout topMotionLayout; - private TopView topContainer; - - private float topHeight = 0f; - - private TopViewAnimHelper() { - } - - private volatile static TopViewAnimHelper instance = null; - - public static TopViewAnimHelper getInstance() { - if (instance == null) { - synchronized (TopViewAnimHelper.class) { - if (instance == null) { - instance = new TopViewAnimHelper(); - } - } - } - return instance; - } - - - public void init(ConstraintLayout rootView) { - init(rootView, null); - } - - public void init(ConstraintLayout rootView, OnTopViewAnimSimpleListener listener) { - topMotionLayout = rootView; - topContainer = rootView.findViewById(R.id.module_entrance_id_top_container); - topContainer.getLayoutParams().width = (int) getDimen(R.dimen.module_ext_top_view_width); - topContainer.setSlideListener(this::startLatestTopOutAnim); - // 初始化默认隐藏导航 - hideNaviView(); - showStickView(); - } - - private volatile boolean isTopViewOut = true; - private List viewCaches = new ArrayList<>(); - private Map statusListenerMap = new ArrayMap<>(); - - private View currentAnimatingView = null; - - public void addSubView(View subView, ViewGroup.LayoutParams params, - IMogoTopViewStatusListener statusListener) { - if (isTopViewOut || topContainer.getChildCount() == 0) { - throw new IllegalStateException("no base view in top view"); - } - if (subView == null) { - throw new IllegalArgumentException("method addTopView params view is null"); - } - if (params == null) { - throw new IllegalArgumentException("method addTopView params LayoutParams is null"); - } - - // 是在已经添加过view之后，才能添加sub view，所以直接走增加小view的逻辑就行 - if (!viewCaches.contains(subView)) { - viewCaches.add(subView); - statusListenerMap.put(subView, statusListener); - subView.setTranslationY(0); - subView.setTranslationY(-(params.height)); - topContainer.addView(subView, params); - Logger.d(TAG, "添加subView: " + subView.getTranslationY() + " height:" + - " " + subView.getHeight() + " paramsHeight: " + params.height); - if (statusListenerMap.get(subView) != null) { - statusListenerMap.get(subView).beforeViewAddAnim(subView); - } - subView.animate().translationY(0).setDuration(500).setListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - IMogoTopViewStatusListener listener = statusListenerMap.get(subView); - if (listener != null) { - listener.onViewAdded(subView); - } - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }).start(); - } - - } - - public void removeSubView(View subView) { - if (topContainer.getChildCount() < 2) { - throw new IllegalStateException("view count not enough"); - } - Logger.d(TAG, - "小view退出: " + subView.getTranslationY() + " height: " + subView.getHeight()); - if (statusListenerMap.get(subView) != null) { - statusListenerMap.get(subView).beforeViewRemoveAnim(subView); - } - subView.animate().translationY(-(subView.getHeight())).setDuration(500).setListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - Logger.d(TAG, "onAnimationEnd: " + subView); - viewCaches.remove(subView); - topContainer.removeView(subView); - IMogoTopViewStatusListener listener = statusListenerMap.remove(subView); - if (listener != null) { - listener.onViewRemoved(subView); - } else { - Logger.d(TAG, "listener is null"); - } - } - - @Override - public void onAnimationCancel(Animator animation) { - viewCaches.remove(subView); - topContainer.removeView(subView); - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }).start(); - } - - private final List stickViewCache = new ArrayList<>(); - - private void showStickView() { - if (stickViewCache.isEmpty()) { - return; - } else if (stickViewCache.size() == 1) { - MotionViewCache stickView = stickViewCache.remove(0); - startTopInAnim(stickView.view, stickView.params, stickView.statusListener); - return; - } - for (int i = 0; i < stickViewCache.size() - 2; i++) { - MotionViewCache stickView = stickViewCache.get(i); - stickView.statusListener.beforeViewRemoveAnim(stickView.view); - stickView.statusListener.onViewRemoved(stickView.view); - } - MotionViewCache stickView = stickViewCache.get(stickViewCache.size() - 1); - stickViewCache.clear(); - startTopInAnim(stickView.view, stickView.params, stickView.statusListener); - } - - public void startTopInAnim(View view, ViewGroup.LayoutParams params, - IMogoTopViewStatusListener statusListener) { - - if (topMotionLayout == null) { - // 增加黏性事件 - stickViewCache.add(new MotionViewCache(view, params, statusListener)); - return; - } - - Logger.d(TAG, "startTopInAnim=====" + isTopViewOut); - if (view == null) { - throw new IllegalArgumentException("method addTopView params view is null"); - } - if (params == null) { - throw new IllegalArgumentException("method addTopView params LayoutParams is null"); - } - - if (isOuting) { - if (motionViewCache != null) { - motionViewCache.statusListener.beforeViewRemoveAnim(motionViewCache.view); - motionViewCache.statusListener.onViewRemoved(motionViewCache.view); - } - motionViewCache = new MotionViewCache(view, params, statusListener); -// return; - } - - if (!viewCaches.contains(view)) { - // 判断此view是否已经增加到了顶部view，如果增加过就不增加了 - currentAnimatingView = view; - view.setTranslationY(0); - statusListenerMap.put(view, statusListener); - Logger.d(TAG, "开始执行"); - isTopViewOut = false; - if (topContainer.getChildCount() > 0) { - // 顶部view已经有了内容，新增内容无需整体布局变化，只是新增布局加个动画 - viewCaches.add(view); - - // 生硬的删掉之前的view - int lastCount = topContainer.getChildCount(); - Logger.d(TAG, "进入动画，lastCount: " + lastCount); - for (int i = 0; i < lastCount; i++) { - View lastView = topContainer.getChildAt(i); - if (statusListenerMap.get(lastView) != null) { - statusListenerMap.get(lastView).beforeViewRemoveAnim(lastView); - } - viewCaches.remove(lastView); - if (statusListenerMap.get(lastView) != null) { - statusListenerMap.remove(lastView).onViewRemoved(lastView); - } - } - Logger.d(TAG, "生硬的删掉了之前的view: " + viewCaches.size()); - topContainer.removeAllViews(); - // 同时设置一下隐藏状态 - MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, false); - - // 如果高度变化，生硬的变化一下高度 - Logger.d(TAG, "container.height: " + topContainer.getHeight()); - if (topContainer.getHeight() != params.height) { - // 改变topContainer的translationY - topContainer.setTranslationY(params.height); - LayoutParams p = topContainer.getLayoutParams(); - p.height = params.height; - topContainer.setLayoutParams(p); - Logger.d(TAG, "改变container的高度==="); - } - - view.setTranslationY(-(params.height)); - topContainer.addView(view, params); - Logger.d(TAG, "顶部view已经有布局了，增加新增view滑入动画: " + view.getTranslationY() + " height:" + - " " + view.getHeight() + " paramsHeight: " + params.height); - if (statusListenerMap.get(view) != null) { - statusListenerMap.get(view).beforeViewAddAnim(view); - } - view.animate().translationY(0).setDuration(500).setListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - IMogoTopViewStatusListener listener = statusListenerMap.get(view); - if (listener != null) { - listener.onViewAdded(view); - } - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }).start(); - } else { - // 顶部view还没有内容，需要整体下移 - viewCaches.add(view); - topContainer.addView(view, params); - LayoutParams p = topContainer.getLayoutParams(); - p.height = params.height; - topContainer.setLayoutParams(p); - Logger.d(TAG, "整体进入==== view.visibility: " + view.getVisibility() + " view" + - ".position: (" + view.getX() + ", " + view.getY() + ") params.width: " + params.width + " params.height: " + params.height); - if (statusListenerMap.get(view) != null) { - statusListenerMap.get(view).beforeViewAddAnim(view); - } - topContainer.setChildAddedListener(child -> { - try { - topContainer.setChildAddedListener(null); - - NoMapTopViewShaderHelper.getInstance().showShader(); - checkCameraModePosition(false); - int scene = 0; - scene = Scene.AIMLESS_WITH_ROAD_EVENT; - topContainer.animate().translationY(params.height).setListener(mainAnimListener).start(); - Logger.d(TAG, "show top setMapCenterPointByScene: " + scene); - } catch (Exception e) { - Logger.e(TAG, e, "添加view异常"); - e.printStackTrace(); - } - }); - } - } - - MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, true); - // vr模式下与TopView互斥 - if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { - TopViewNoLinkageAnimHelper.getInstance().removeAllView(); - } - } - - /** - * 退出最新的（也就是最上面的）view - */ - private void startLatestTopOutAnim() { - if (topContainer.getChildCount() > 1) { - removeSubView(topContainer.getChildAt(topContainer.getChildCount() - 1)); - } else if (topContainer.getChildCount() > 0) { - startTopOutAnim(topContainer.getChildAt(topContainer.getChildCount() - 1)); - } - } - - public void startTopOutAnim(View view) { - - if (topMotionLayout == null) { - return; - } - Logger.d("TopViewAnimHelper", "startTopOutAnim====="); - if (!isTopViewOut && viewCaches.contains(view)) { - isOuting = true; - // 顶部view仅剩一个view，需要整体上移 - if (statusListenerMap.get(view) != null) { - statusListenerMap.get(view).beforeViewRemoveAnim(view); - } - isTopViewOut = true; - - NoMapTopViewShaderHelper.getInstance().hideShader(); - - topContainer.animate().translationY(0).setListener(mainAnimListener).start(); - - checkCameraModePosition(false); - - int scene = 0; - scene = Scene.AIMLESS; - Logger.d(TAG, "hide top setMapCenterPointByScene: " + scene); - MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, false); - } - } - - public void showNaviView() { - if (topMotionLayout == null) { - return; - } - - Logger.d("TopViewAnimHelper", "showNaviView====="); - - int scene = 0; - if (isTopViewOut) { - scene = Scene.NAVI_WITH_ROAD_EVENT; - } else { - scene = Scene.NAVI; - } - Logger.d(TAG, "navi show setMapCenterPointByScene: " + scene); - checkCameraModePosition(true); - } - - public void hideNaviView() { - if (topMotionLayout == null) { - return; - } - - Logger.d("TopViewAnimHelper", "hideNaviView====="); - int scene = 0; - if (isTopViewOut) { - scene = Scene.AIMLESS; - } else { - scene = Scene.AIMLESS_WITH_ROAD_EVENT; - } - Logger.d(TAG, "hide navi setMapCenterPointByScene: " + scene); - checkCameraModePosition(true); - } - - private void checkCameraModePosition(boolean isNeedClone) { - } - - private float getDimen(int resId) { - return (int) topMotionLayout.getContext().getResources().getDimensionPixelSize(resId); - } - - private int computeNaviMarginTop(int height) { - int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height)) - getDimen(R.dimen.module_common_shadow_width_pos)); - Logger.d(TAG, "computeNaviMarginTop: " + height + " result: " + result); - return result; - } - - interface OnTopViewAnimSimpleListener { - void onAnimStart(); - - void onAnimEnd(); - } - - public boolean isViewAdded(View view) { - return viewCaches.contains(view); - } - - /** - * 用于和{@link TopViewNoLinkageAnimHelper}互斥显示 - *

- * 网约车新增与网约车界面互斥 - */ - public void removeAllViewExceptVrNav() { - Logger.d(TAG, "remove all view except vr nav"); - isTopViewOut = true; - if(topContainer != null) { - int lastCount = topContainer.getChildCount(); - for (int i = 0; i < lastCount; i++) { - View child = topContainer.getChildAt(i); - viewCaches.remove(child); - IMogoTopViewStatusListener listener = statusListenerMap.remove(child); - if (listener != null) { - listener.beforeViewRemoveAnim(child); - listener.onViewRemoved(child); - } - } - topContainer.setTranslationY(0); - topContainer.removeAllViews(); - } - hideNaviView(); - } - - public void removeAllView() { - Logger.d(TAG, "remove all view"); - removeAllViewExceptVrNav(); - } - - public void clear() { - topMotionLayout = null; - topContainer = null; - } - - public void enterVrMode() { - removeAllView(); - topContainer.getLayoutParams().width = (int) getDimen(R.dimen.module_ext_top_view_width_in_vr_mode); - } - - public void exitVrMode() { - removeAllView(); - topContainer.getLayoutParams().width = (int) getDimen(R.dimen.module_ext_top_view_width); - } - - private final Animator.AnimatorListener mainAnimListener = new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - Logger.d(TAG, "onMainAnimEnd: " + currentAnimatingView); - IMogoTopViewStatusListener listener; - if (isTopViewOut) { - int lastCount = topContainer.getChildCount(); - for (int i = 0; i < lastCount; i++) { - View child = topContainer.getChildAt(i); - viewCaches.remove(child); - listener = statusListenerMap.remove(child); - if (listener != null) { - listener.onViewRemoved(child); - } - } - topContainer.removeAllViews(); - currentAnimatingView = null; - isOuting = false; - } else { - listener = statusListenerMap.get(currentAnimatingView); - if (listener != null) { - listener.onViewAdded(currentAnimatingView); - } - } - - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }; - - - private MotionViewCache motionViewCache = null; - private boolean isOuting = false; - - private static class MotionViewCache { - private final View view; - private final LayoutParams params; - private final IMogoTopViewStatusListener statusListener; - - public MotionViewCache(View view, LayoutParams params, IMogoTopViewStatusListener statusListener) { - this.view = view; - this.params = params; - this.statusListener = statusListener; - } - - } - -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java deleted file mode 100644 index c8853f8b2f..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.mogo.module.extensions.utils; - -import android.content.Context; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; - - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.module.extensions.R; -import com.mogo.eagle.core.data.constants.MogoServicePaths; -import com.mogo.service.windowview.IMogoTopViewManager; -import com.mogo.service.windowview.IMogoTopViewStatusListener; - -/** - * 顶部1/2界面管理 - * - * @author tongchenfei - */ -@Route(path = MogoServicePaths.PATH_EXTENSIONS_TOP_VIEW_MANAGER) -public class TopViewManager implements IMogoTopViewManager { - - private Context context; - private LayoutParams parentParams; - - @Override - public void init(Context context) { - this.context = context; - } - - @Override - public void addView(View view) { - addView(view, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, - (int) context.getResources().getDimension(R.dimen.dp_350)), null); - } - - @Override - public void addView(View view, IMogoTopViewStatusListener statusListener) { - addView(view, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, - (int) context.getResources().getDimension(R.dimen.dp_350)), statusListener); - } - - @Override - public void addView(View view, ViewGroup.LayoutParams params) { - addView(view, params, null); - } - - @Override - public void addView(View view, ViewGroup.LayoutParams params, - IMogoTopViewStatusListener statusListener) { - parentParams = params; - try { - TopViewAnimHelper.getInstance().startTopInAnim(view, params, statusListener); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - @Override - public void addViewNoLinkage(View view) { - addViewNoLinkage(view, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, - (int) context.getResources().getDimension(R.dimen.dp_350)), null); - } - - @Override - public void addViewNoLinkage(View view, IMogoTopViewStatusListener statusListener) { - addViewNoLinkage(view, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, - (int) context.getResources().getDimension(R.dimen.dp_350)), statusListener); - } - - @Override - public void addViewNoLinkage(View view, ViewGroup.LayoutParams params) { - addViewNoLinkage(view, params, null); - } - - @Override - public void addViewNoLinkage(View view, ViewGroup.LayoutParams params, - IMogoTopViewStatusListener statusListener) { - parentParams = params; - try { - TopViewNoLinkageAnimHelper.getInstance().startTopInAnim(view, params, statusListener); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - @Override - public void addSubView(View view) { - addSubView(view, null); - } - - @Override - public void addSubView(View view, IMogoTopViewStatusListener statusListener) { - try { - TopViewAnimHelper.getInstance().addSubView(view, parentParams, statusListener); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - @Override - public void removeView(View view) { - try { - TopViewAnimHelper.getInstance().startTopOutAnim(view); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - @Override - public void removeViewNoLinkage(View view) { - try { - TopViewNoLinkageAnimHelper.getInstance().startTopOutAnim(view); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - @Override - public void removeSubView(View view) { - try { - TopViewAnimHelper.getInstance().removeSubView(view); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - @Override - public boolean isViewAdded(View view) { - try { - return TopViewAnimHelper.getInstance().isViewAdded(view); - } catch ( Exception e ){ - return false; - } - } - - @Override - public void removeAllViewInVrMode() { - try { - TopViewAnimHelper.getInstance().removeAllViewExceptVrNav(); - TopViewNoLinkageAnimHelper.getInstance().removeAllView(); - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java deleted file mode 100644 index 95bd6b4294..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.mogo.module.extensions.utils; - -import android.animation.Animator; -import android.util.ArrayMap; -import android.view.View; -import android.view.ViewGroup.LayoutParams; - -import androidx.constraintlayout.widget.ConstraintLayout; - -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.map.Scene; -import com.mogo.module.extensions.ExtensionsModuleConst; -import com.mogo.module.extensions.R; -import com.mogo.module.extensions.navi.TopView; -import com.mogo.service.windowview.IMogoTopViewStatusListener; - -import java.util.Map; - - -/** - * 顶部动画帮助类,与其他控件无关练 - * - * @author tongchenfei - */ -public class TopViewNoLinkageAnimHelper { - private static final String TAG = "TopViewNoLinkageAnimHelper"; - - private ConstraintLayout topMotionLayout; - private TopView topContainerNoLinkage; - - private volatile boolean isTopViewOut = true; - private final Map statusListenerMap = new ArrayMap<>(); - - private View currentAnimatingView = null; - - private IMogoMapUIController mogoMapUIController; - private volatile static TopViewNoLinkageAnimHelper instance = null; - - private TopViewNoLinkageAnimHelper() { - } - - public static TopViewNoLinkageAnimHelper getInstance() { - if (instance == null) { - synchronized (TopViewNoLinkageAnimHelper.class) { - if (instance == null) { - instance = new TopViewNoLinkageAnimHelper(); - } - } - } - return instance; - } - - public void setIMogoMapUIController(IMogoMapUIController mogoMapUIController) { - this.mogoMapUIController = mogoMapUIController; - } - - public void init(ConstraintLayout rootView) { - topMotionLayout = rootView; - topContainerNoLinkage = rootView.findViewById(R.id.module_entrance_id_top_container_no_linkage); - - topContainerNoLinkage.setSlideListener(this::startLatestTopOutAnim); - } - - public void startTopInAnim(View view, LayoutParams params, - IMogoTopViewStatusListener statusListener) { - - if (topMotionLayout == null) { - return; - } - - Logger.d(TAG, "startTopInAnim=====" + isTopViewOut); - if (view == null) { - throw new IllegalArgumentException("method addTopView params view is null"); - } - if (params == null) { - throw new IllegalArgumentException("method addTopView params LayoutParams is null"); - } - - // 判断此view是否已经增加到了顶部view，如果增加过就不增加了 - view.setTranslationY(0); - statusListenerMap.put(view, statusListener); - Logger.d(TAG, "开始执行"); - isTopViewOut = false; - - // 顶部view还没有内容，需要整体下移 - currentAnimatingView = view; - topContainerNoLinkage.addView(view, params); - Logger.d(TAG, "整体进入==== view.visibility: " + view.getVisibility() + " view" + - ".position: (" + view.getX() + ", " + view.getY() + ") params.width: " + params.width + " params.height: " + params.height); - if (statusListenerMap.get(view) != null) { - statusListenerMap.get(view).beforeViewAddAnim(view); - } - topContainerNoLinkage.setChildAddedListener(child -> { - topContainerNoLinkage.setChildAddedListener(null); - NoMapTopViewShaderHelper.getInstance().showShader(); - topContainerNoLinkage.animate().translationY(child.getHeight()).setListener(mainAnimListener).start(); - int scene = Scene.AIMLESS_WITH_ROAD_EVENT; - Logger.d(TAG, "show top setMapCenterPointByScene: " + scene); - }); - - MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, true); - - // vr模式下与TopView互斥 - if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { - TopViewAnimHelper.getInstance().removeAllViewExceptVrNav(); - } - } - - /** - * 退出最新的（也就是最上面的）view - */ - private void startLatestTopOutAnim() { - Logger.d(TAG, "startLatestTopOutAnim====="); - - if (topContainerNoLinkage.getChildCount() > 0) { - startTopOutAnim(topContainerNoLinkage.getChildAt(topContainerNoLinkage.getChildCount() - 1)); - } - } - - public void startTopOutAnim(View view) { - if (topMotionLayout == null) { - return; - } - Logger.d(TAG, "startTopOutAnim====="); - if (!isTopViewOut) { - // 顶部view仅剩一个view，需要整体上移 - if (statusListenerMap.get(view) != null) { - statusListenerMap.get(view).beforeViewRemoveAnim(view); - } - isTopViewOut = true; - NoMapTopViewShaderHelper.getInstance().hideShader(); - topContainerNoLinkage.animate().translationY(-topContainerNoLinkage.getTranslationY()).setListener(mainAnimListener).start(); - int scene = Scene.AIMLESS; - Logger.d(TAG, "hide top setMapCenterPointByScene: " + scene); - MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, false); - } - } - - private float getDimen(int resId) { - return (int) topMotionLayout.getContext().getResources().getDimensionPixelSize(resId); - } - - public void removeAllView() { - Logger.d(TAG, "remove all view"); - isTopViewOut = true; - if (topContainerNoLinkage != null) { - int lastCount = topContainerNoLinkage.getChildCount(); - for (int i = 0; i < lastCount; i++) { - View child = topContainerNoLinkage.getChildAt(i); - IMogoTopViewStatusListener listener = statusListenerMap.remove(child); - if (listener != null) { - listener.beforeViewRemoveAnim(child); - listener.onViewRemoved(child); - } - } - topContainerNoLinkage.removeAllViews(); - } - } - - public void clear() { - topMotionLayout = null; - topContainerNoLinkage = null; - } - - private final Animator.AnimatorListener mainAnimListener = new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - Logger.d(TAG, "isTopViewOut: " + isTopViewOut); - IMogoTopViewStatusListener listener; - if (isTopViewOut) { - int lastCount = topContainerNoLinkage.getChildCount(); - for (int i = 0; i < lastCount; i++) { - View child = topContainerNoLinkage.getChildAt(i); - listener = statusListenerMap.remove(child); - if (listener != null) { - listener.onViewRemoved(child); - } - } - topContainerNoLinkage.removeAllViews(); - currentAnimatingView = null; - } else { - listener = statusListenerMap.get(currentAnimatingView); - if (listener != null) { - listener.onViewAdded(currentAnimatingView); - } - } - - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }; -} diff --git a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_round.xml b/modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_round.xml deleted file mode 100644 index c2e7581ff4..0000000000 --- a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_round.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml deleted file mode 100644 index f1b69746cd..0000000000 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml deleted file mode 100644 index fa05659841..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 2px - 0px - -6px - 20px - 300px - 400px - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi-1920x720/styles.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi-1920x720/styles.xml deleted file mode 100644 index 8fef26eaa9..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi-1920x720/styles.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/styles.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/styles.xml deleted file mode 100644 index b92fcf7d00..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi/styles.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml deleted file mode 100644 index 99b9df2dd2..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - 90px - 32px - 2px - 16px - 26px - 26px - 32px - - 90px - 32px - 2px - 100px - 90px - 2px - 54px - 100px - 90px - 8px - - 180px - 180px - 2px - 60px - 60px - 28px - - 32px - 2px - - 140px - 32px - 60px - 92px - 24px - 48px - 2px - 140px - 140px - 120px - 20px - 30px - 32px - 32px - - 120px - 120px - 32px - 60px - 32px - 60px - 32px - 30px - 20px - - 32px - 48px - 80px - 28px - 26px - 44px - 44px - 18px - 34px - 26px - 28px - 30px - 30px - 30px - 20px - - 103px - 103px - - - 17px - 17px - 36px - 36px - -2px - 95px - - 30px - 40px - 40px - 15px - 15px - 5px - 50px - 56px - 30px - 56px - 30px - 56px - 30px - 15px - 15px - - - 1000px - 390px - 200px - 200px - 240px - 30px - 120px - 120px - 10px - 22px - 28px - 28px - 30px - 90px - 90px - 6dp - 15px - 4px - 10px - 20px - - 40px - 45px - 100px - 134px - 30px - 20px - 20px - 8px - 21px - 31px - 1920px - - -1 - 0px - - 36px - 393px - 700px - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/styles.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/styles.xml deleted file mode 100644 index b92fcf7d00..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/styles.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml deleted file mode 100644 index 4b98d8758d..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 1100px - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/styles.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/styles.xml deleted file mode 100644 index b92fcf7d00..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/styles.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/attrs.xml b/modules/mogo-module-extensions/src/main/res/values/attrs.xml deleted file mode 100644 index ed3912a664..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values/attrs.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml deleted file mode 100644 index 6ff588cc10..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values/colors.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - #BF30334C - #fff - #f1f1f1 - - #7DE261 - #FF2B2B - #E3BC59 - #FFF - #256BFF - #FFFFFF - - #DB3137 - #3E77F6 - #323C6F - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml deleted file mode 100644 index d4e1c223f5..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - 58px - 18px - 1px - 11.2px - 10.8px - 17px - 20px - - 58px - 19px - 1px - 64.2px - 58px - 1px - 33.4px - 64.2px - 58px - - - 96px - 96px - 1px - 32px - 32px - 15px - - 20px - 1px - - 82px - 20px - 34.5px - 58px - 17px - 31.4px - 1.2px - 82px - 66px - 66px - 120px - 120px - 8px - 16px - 34.5px - 20px - - - 66px - 66px - 20px - 32px - 20px - 30px - 16px - 14px - 8px - - 0px - - 22px - 28px - 22px - 22px - 16px - 24px - 24px - 18px - 18.48px - 5px - 16px - 22px - 16px - 15px - 15px - 11.73px - - 56px - 56px - - 1058px - 822px - - 9px - 9px - 18px - 18px - -1 - - 30px - 23px - 23px - 15px - 15px - 5px - 20px - 14px - 20px - 14px - 20px - 14px - 34px - 8px - 8px - - - 550px - 208px - 100px - 100px - 16px - 142px - 66px - 66px - 44px - 10px - 12px - 14px - 14px - 18px - 58px - 58px - 3dp - 10px - 6px - 6px - 10px - - 19px - 0px - 26px - 56px - 80px - 10px - 2px - 2px - 4px - 14px - 14px - - 8px - - 25px - 25px - 16px - 56px - 18px - 10px - 22px - 16px - - - 11px - 11px - 10px - - -1 - 0px - 0px - 0px - - 44px - 30px - 120px - 170px - - 460px - 120px - 120px - - 40px - 32px - 40px - 50px - - 32px - 15px - 30px - 689px - 86px - - - 530px - 380px - 40px - 28px - 100px - 60px - 48px - 26px - 458px - 298px - 140px - 60px - 100px - 30px - 15px - 70px - 22px - 78px - 66px - 23px - 30px - 20px - 40px - 20px - 17px - 36px - 60px - 21px - 11px - 400px - 300px - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/ids.xml b/modules/mogo-module-extensions/src/main/res/values/ids.xml deleted file mode 100644 index 7eb07447bc..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values/ids.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml deleted file mode 100644 index eb9efcf8a6..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values/strings.xml +++ /dev/null @@ -1,54 +0,0 @@ - - mogo-module-extensions - 你好，蘑菇2.0开启智慧互联新世界 - %1$d月%2$d日 %3$s - %1$d:%2$s - %s° - - 周日 - 周一 - 周二 - 周三 - 周四 - 周五 - 周六 - - ··· - - 搜索目的地 - 分享 - 退出\n导航 - 继续\n导航 - 退出全览 - 车头 - 正北 - 目的地车友 - - - 你好小智，播放音乐 - 你好小智，播放赵磊的歌 - 你好小智，我想听成都 - 你好小智，打开导航 - 你好小智，我要回家 - 你好小智，我要去加油站 - 你好小智，导航去西单商场 - 你好小智，打开行车记录仪 - 你好小智，打开收音机 - 你好小智，调频到97.4 - 你好小智，今天天气怎么样 - 你好小智，打开车聊聊 - 你好小智，我想聊天 - 你好小智，中关村堵不堵 - 你好小智，前方路况怎么样 - 你好小智，上报路况 - 你好小智，分享这首歌 - 你好小智，打开辅助驾驶 - 你好小智，查询附近的人 - 你好小智，音量开到百分之三十 - 你好小智，打开全部应用 - 你好小智，返回桌面 - - - - - diff --git a/modules/mogo-module-extensions/src/main/res/values/styles.xml b/modules/mogo-module-extensions/src/main/res/values/styles.xml deleted file mode 100644 index ebcaf53855..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values/styles.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index b423200a68..e13c48c719 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -265,7 +265,6 @@ public class MainActivity extends MvpActivity implement } protected void loadContainerModules() { - MogoModulesManager.getInstance().loadEntrancesModule(R.id.module_main_id_entrance_fragment_container); //MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container); } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index 18f92882a9..96207ac8d3 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -23,14 +23,6 @@ public interface MogoModulesHandler { */ void loadFunctionModulesServer(); - - /** - * 加载快捷操作 - * - * @param containerId - */ - void loadEntrancesModule(int containerId); - /** * 加载基本服务模块，需要不启动页面就能运行 *

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 4428af55e4..30048d1781 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -128,15 +128,6 @@ public class MogoModulesManager implements MogoModulesHandler { } } - - @Override - public void loadEntrancesModule( int containerId ) { - IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance() - .build( MogoModulePaths.PATH_ENTRANCE ) - .navigation( getContext() ); - addFragment( provider, containerId ); - } - @Override public void loadBaseModule() { List< MogoModule > baseModules = MogoModulePaths.getBaseModules(); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java index c2113766d5..5993c28ca4 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java @@ -22,104 +22,33 @@ public interface IMogoTopViewManager extends IProvider { * 给了一个默认的LayoutParams(MatchParent,dp_350) * * @param statusListener 状态监听 - * @param view 增加的view + * @param view 增加的view */ void addView(View view, IMogoTopViewStatusListener statusListener); /** * 在1/2屏添加一个view，如果没显示，会有动画 - * @param view 增加的view + * + * @param view 增加的view * @param params 相关参数 */ void addView(View view, ViewGroup.LayoutParams params); /** * 在1/2屏添加一个view，如果没显示，会有动画，可通过设置监听，来监听增加的view的状态 - * @param view 增加的view - * @param params 相关参数 + * + * @param view 增加的view + * @param params 相关参数 * @param statusListener 状态监听 */ void addView(View view, ViewGroup.LayoutParams params, IMogoTopViewStatusListener statusListener); - - /** - * 在1/2屏添加一个view，如果没显示，会有动画 - * 给了一个默认的LayoutParams(MatchParent,dp_350) - * - * @param view 增加的view - */ - void addViewNoLinkage(View view); - - /** - * 在1/2屏添加一个view，如果没显示，会有动画,可通过设置监听，来监听增加的view的状态 - * 给了一个默认的LayoutParams(MatchParent,dp_350) - * - * @param statusListener 状态监听 - * @param view 增加的view - */ - void addViewNoLinkage(View view, IMogoTopViewStatusListener statusListener); - - /** - * 在1/2屏添加一个view，如果没显示，会有动画 - * @param view 增加的view - * @param params 相关参数 - */ - void addViewNoLinkage(View view, ViewGroup.LayoutParams params); - - /** - * 在1/2屏添加一个view，如果没显示，会有动画，可通过设置监听，来监听增加的view的状态，与其他控件没有联动 - * @param view 增加的view - * @param params 相关参数 - * @param statusListener 状态监听 - */ - void addViewNoLinkage(View view, ViewGroup.LayoutParams params, - IMogoTopViewStatusListener statusListener); - - /** - * 在1/2屏添加一个sub view，叠加在主view上面显示 - * 给了一个默认的LayoutParams(MatchParent,dp_350) - * - * @param view 增加的view - */ - void addSubView(View view); - - /** - * 在1/2屏添加一个sub view，叠加在主view上面显示,可通过设置监听，来监听增加的view的状态 - * 给了一个默认的LayoutParams(MatchParent,dp_350) - * - * @param statusListener 状态监听 - * @param view 增加的view - */ - void addSubView(View view, IMogoTopViewStatusListener statusListener); - /** * 移除view，如果是最后一个view，会有移除动画 + * * @param view 待移除的 view */ void removeView(View view); - /** - * 移除view，如果是最后一个view，会有移除动画 - * @param view 待移除的 view - */ - void removeViewNoLinkage(View view); - - /** - * 移除sub view - * @param view 待移除的sub view - */ - void removeSubView(View view); - - /** - * 这个view是否已经被添加进了顶部布局 - * @param view 待查询的view - * @return true-已经添加 false-未添加 - */ - boolean isViewAdded(View view); - - /** - * 在vr模式下，隐藏所有topview，除了vr模式下的导航信息 - */ - void removeAllViewInVrMode(); } diff --git a/settings.gradle b/settings.gradle index 0e8e0f5ad8..2ec59e17d2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -63,7 +63,6 @@ include ':libraries:mogo-adas' include ':modules:mogo-module-common' include ':modules:mogo-module-main' include ':modules:mogo-module-service' -include ':modules:mogo-module-extensions' include ':modules:mogo-module-carchatting' include ':modules:mogo-module-carchattingprovider' include ':modules:mogo-module-chat'