From b120719327a4eaa71b4983c1f661595e5547c37e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 2 Jul 2020 17:45:49 +0800 Subject: [PATCH] base --- modules/mogo-module-event-panel/build.gradle | 22 ++--- .../event/panel/EventPanelConstants.java | 11 --- .../module/event/panel/EventPanelConstants.kt | 11 +++ .../event/panel/EventPanelModuleProvider.java | 96 ------------------- .../event/panel/EventPanelModuleProvider.kt | 95 ++++++++++++++++++ .../panel/fragment/EventPanelFragment.kt | 46 +++++++++ .../event/panel/fragment/MyShareFragment.kt | 28 ++++++ .../fragment/SurroundingEventFragment.kt | 28 ++++++ .../panel/fragment/TripRecordFragment.kt | 31 ++++++ .../panel/presenter/EventPanelPresenter.kt | 11 +++ .../event/panel/presenter/MySharePresenter.kt | 7 ++ .../presenter/SurroundingEventPresenter.kt | 7 ++ .../panel/presenter/TripRecordPresenter.kt | 7 ++ ...odule_event_panel_fragment_event_panel.xml | 12 +++ .../module_event_panel_fragment_my_share.xml | 15 +++ ...event_panel_fragment_surrounding_event.xml | 15 +++ ...odule_event_panel_fragment_trip_record.xml | 15 +++ .../src/main/res/values-xhdpi/dimens.xml | 2 + .../src/main/res/values/dimens.xml | 2 + modules/mogo-module-extensions/build.gradle | 2 + .../extensions/entrance/EntranceFragment.java | 4 + .../res/layout/module_ext_layout_entrance.xml | 1 - modules/mogo-module-main/build.gradle | 2 + .../com/mogo/module/main/MainActivity.java | 1 + .../module/main/cards/MogoModulesHandler.java | 6 ++ .../module/main/cards/MogoModulesManager.java | 9 ++ .../res/layout/module_main_activity_main.xml | 6 ++ .../com/mogo/service/IMogoServiceApis.java | 7 ++ .../com/mogo/service/MogoServicePaths.java | 2 + .../eventpanel/IEventPanelProvider.java | 20 ++++ .../mogo/service/impl/MogoServiceApis.java | 6 ++ 31 files changed, 405 insertions(+), 122 deletions(-) delete mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.java create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.kt delete mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.java create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/SurroundingEventFragment.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/TripRecordFragment.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/EventPanelPresenter.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/MySharePresenter.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/SurroundingEventPresenter.kt create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/TripRecordPresenter.kt create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_surrounding_event.xml create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_trip_record.xml create mode 100644 modules/mogo-module-event-panel/src/main/res/values-xhdpi/dimens.xml create mode 100644 modules/mogo-module-event-panel/src/main/res/values/dimens.xml create mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/eventpanel/IEventPanelProvider.java diff --git a/modules/mogo-module-event-panel/build.gradle b/modules/mogo-module-event-panel/build.gradle index 7698c52390..285da5304d 100644 --- a/modules/mogo-module-event-panel/build.gradle +++ b/modules/mogo-module-event-panel/build.gradle @@ -1,4 +1,7 @@ apply plugin: 'com.android.library' +apply plugin: 'kotlin-kapt' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' apply plugin: 'com.alibaba.arouter' android { @@ -36,30 +39,21 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation rootProject.ext.dependencies.androidxcardview + implementation rootProject.ext.dependencies.androidxccorektx + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter - annotationProcessor rootProject.ext.dependencies.aroutercompiler + kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.androidxviewpager2 + implementation rootProject.ext.dependencies.androidxrecyclerview if (Boolean.valueOf(RELEASE)) { -// api rootProject.ext.dependencies.mogomap -// api rootProject.ext.dependencies.mogomapapi -// api rootProject.ext.dependencies.mogoutils -// api rootProject.ext.dependencies.mogocommons -// api rootProject.ext.dependencies.mogoserviceapi compileOnly rootProject.ext.dependencies.modulecommon } else { -// api project(":libraries:mogo-map") -// api project(":libraries:mogo-map-api") -// api project(":foudations:mogo-utils") -// api project(":foudations:mogo-commons") -// api project(':services:mogo-service-api') compileOnly project(':modules:mogo-module-common') -// implementation project(':modules:mogo-module-share') -// implementation project(':modules:mogo-module-authorize') } } diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.java deleted file mode 100644 index 99ad266ce4..0000000000 --- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.zhidao.mogo.module.event.panel; - -/** - * 事件面板相关常量 - * - * @author tongchenfei - */ -public class EventPanelConstants { - public static final String MODULE_NAME = "MODULE_EVENT_PANEL"; - public static final String PATH_NAME = "/event/panel"; -} diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.kt new file mode 100644 index 0000000000..dc22fdbc7a --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.kt @@ -0,0 +1,11 @@ +package com.zhidao.mogo.module.event.panel + +/** + * 事件面板相关常量 + * + * @author tongchenfei + */ +object EventPanelConstants { + const val MODULE_NAME = "MODULE_EVENT_PANEL" + const val PATH_NAME = "/event/panel" +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.java deleted file mode 100644 index 62456b63bb..0000000000 --- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.zhidao.mogo.module.event.panel; - -import android.content.Context; -import android.os.Bundle; -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.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; -import com.mogo.utils.logger.Logger; - -import static com.zhidao.mogo.module.event.panel.EventPanelConstants.MODULE_NAME; -import static com.zhidao.mogo.module.event.panel.EventPanelConstants.PATH_NAME; - -/** - * 事件面板provider - * - * @author tongchenfei - */ -@Route(path = PATH_NAME) -public class EventPanelModuleProvider implements IMogoModuleProvider { - - /** - * Do your init work in this method, it well be call when processor has been load. - * - * @param context ctx - */ - @Override - public void init(Context context) { - Logger.d(MODULE_NAME,"模块初始化===="); - } - - @Override - public Fragment createFragment(Context context, Bundle data) { - return null; - } - - @Override - public View createView(Context context) { - return null; - } - - @NonNull - @Override - public String getModuleName() { - return MODULE_NAME; - } - - @Override - public IMogoModuleLifecycle getCardLifecycle() { - return null; - } - - @Override - public IMogoMapListener getMapListener() { - return null; - } - - @Override - public int getType() { - return 0; - } - - @Override - public IMogoNaviListener getNaviListener() { - return null; - } - - @Override - public IMogoLocationListener getLocationListener() { - return null; - } - - @Override - public IMogoMarkerClickListener getMarkerClickListener() { - return null; - } - - @Override - public String getAppPackage() { - return null; - } - - @Override - public String getAppName() { - return null; - } - -} diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.kt new file mode 100644 index 0000000000..3844f9ac65 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.kt @@ -0,0 +1,95 @@ +package com.zhidao.mogo.module.event.panel + +import android.content.Context +import android.os.Bundle +import android.view.View +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.service.eventpanel.IEventPanelProvider +import com.mogo.service.module.IMogoModuleLifecycle +import com.mogo.service.module.IMogoModuleProvider +import com.mogo.utils.logger.Logger +import com.zhidao.mogo.module.event.panel.EventPanelConstants.MODULE_NAME +import com.zhidao.mogo.module.event.panel.EventPanelConstants.PATH_NAME +import com.zhidao.mogo.module.event.panel.fragment.EventPanelFragment + +/** + * 事件面板provider + * + * @author tongchenfei + */ +@Route(path = PATH_NAME) +class EventPanelModuleProvider : IEventPanelProvider { + /** + * Do your init work in this method, it well be call when processor has been load. + * + * @param context ctx + */ + override fun init(context: Context) { + Logger.d(MODULE_NAME, "模块初始化====") + } + + override fun createFragment(context: Context, data: Bundle?): Fragment? { + return EventPanelFragment.getInstance() + } + + /** + * 显示面板 + */ + override fun showPanel() { + EventPanelFragment.getInstance().showPanel() + } + + + /** + * 隐藏面板 + */ + override fun hidePanel() { + EventPanelFragment.getInstance().hidePanel() + } + + override fun createView(context: Context): View? { + return null + } + + override fun getModuleName(): String { + return MODULE_NAME + } + + override fun getCardLifecycle(): IMogoModuleLifecycle? { + return null + } + + override fun getMapListener(): IMogoMapListener? { + return null + } + + override fun getType(): Int { + return 0 + } + + override fun getNaviListener(): IMogoNaviListener? { + return null + } + + override fun getLocationListener(): IMogoLocationListener? { + return null + } + + override fun getMarkerClickListener(): IMogoMarkerClickListener? { + return null + } + + override fun getAppPackage(): String? { + return null + } + + override fun getAppName(): String? { + return null + } + +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt new file mode 100644 index 0000000000..8c1636ac58 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt @@ -0,0 +1,46 @@ +package com.zhidao.mogo.module.event.panel.fragment + +import android.view.View +import androidx.fragment.app.Fragment +import com.mogo.commons.mvp.MvpFragment +import com.mogo.utils.logger.Logger +import com.zhidao.mogo.module.event.panel.EventPanelConstants.MODULE_NAME +import com.zhidao.mogo.module.event.panel.R +import com.zhidao.mogo.module.event.panel.presenter.EventPanelPresenter +import kotlinx.android.synthetic.main.module_event_panel_fragment_event_panel.* + +/** + * 事件面板主fragment + * + * @author tongchenfei + */ +class EventPanelFragment : MvpFragment() { + + companion object{ + private val fragment = EventPanelFragment() + fun getInstance():EventPanelFragment{ + return fragment + } + } + + override fun getLayoutId(): Int { + return R.layout.module_event_panel_fragment_event_panel + } + + override fun initViews() { + Logger.d(MODULE_NAME, "EventPanelFragment init view===") + } + override fun createPresenter(): EventPanelPresenter { + return EventPanelPresenter(this) + } + + fun showPanel(){ + Logger.d(MODULE_NAME,"in fragment show panel") + clPanelContainer.visibility = View.VISIBLE + } + + fun hidePanel(){ + Logger.d(MODULE_NAME,"in fragment hide panel") + clPanelContainer.visibility = View.GONE + } +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt new file mode 100644 index 0000000000..2d759ded94 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt @@ -0,0 +1,28 @@ +package com.zhidao.mogo.module.event.panel.fragment + +import com.mogo.commons.mvp.MvpFragment +import com.zhidao.mogo.module.event.panel.R +import com.zhidao.mogo.module.event.panel.presenter.MySharePresenter + +class MyShareFragment : MvpFragment() { + /** + * 布局资源 + * + * @return + */ + override fun getLayoutId(): Int = R.layout.module_event_panel_fragment_my_share + + /** + * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免 + * presenter 生命周期错乱 + */ + override fun initViews() { + } + + /** + * 创建 presenter 实例 + * + * @return + */ + override fun createPresenter(): MySharePresenter = MySharePresenter(this) +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/SurroundingEventFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/SurroundingEventFragment.kt new file mode 100644 index 0000000000..c8268ffdca --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/SurroundingEventFragment.kt @@ -0,0 +1,28 @@ +package com.zhidao.mogo.module.event.panel.fragment + +import com.mogo.commons.mvp.MvpFragment +import com.zhidao.mogo.module.event.panel.R +import com.zhidao.mogo.module.event.panel.presenter.SurroundingEventPresenter + +class SurroundingEventFragment:MvpFragment(){ + /** + * 布局资源 + * + * @return + */ + override fun getLayoutId(): Int = R.layout.module_event_panel_fragment_surrounding_event + + /** + * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免 + * presenter 生命周期错乱 + */ + override fun initViews() { + } + + /** + * 创建 presenter 实例 + * + * @return + */ + override fun createPresenter(): SurroundingEventPresenter = SurroundingEventPresenter(this) +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/TripRecordFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/TripRecordFragment.kt new file mode 100644 index 0000000000..b72d062d20 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/TripRecordFragment.kt @@ -0,0 +1,31 @@ +package com.zhidao.mogo.module.event.panel.fragment + +import com.mogo.commons.mvp.MvpFragment +import com.zhidao.mogo.module.event.panel.R +import com.zhidao.mogo.module.event.panel.presenter.TripRecordPresenter + +/** + * 出行动态fragment + */ +class TripRecordFragment: MvpFragment() { + /** + * 布局资源 + * + * @return + */ + override fun getLayoutId(): Int = R.layout.module_event_panel_fragment_trip_record + + /** + * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免 + * presenter 生命周期错乱 + */ + override fun initViews() { + } + + /** + * 创建 presenter 实例 + * + * @return + */ + override fun createPresenter(): TripRecordPresenter = TripRecordPresenter(this) +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/EventPanelPresenter.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/EventPanelPresenter.kt new file mode 100644 index 0000000000..2aa237ed72 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/EventPanelPresenter.kt @@ -0,0 +1,11 @@ +package com.zhidao.mogo.module.event.panel.presenter + +import com.mogo.commons.mvp.Presenter +import com.zhidao.mogo.module.event.panel.fragment.EventPanelFragment + +/** + * 事件面板presenter + * + * @author tongchenfei + */ +class EventPanelPresenter(view: EventPanelFragment) : Presenter(view) \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/MySharePresenter.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/MySharePresenter.kt new file mode 100644 index 0000000000..ab49fba81a --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/MySharePresenter.kt @@ -0,0 +1,7 @@ +package com.zhidao.mogo.module.event.panel.presenter + +import com.mogo.commons.mvp.Presenter +import com.zhidao.mogo.module.event.panel.fragment.MyShareFragment + +class MySharePresenter(view: MyShareFragment) : Presenter(view) { +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/SurroundingEventPresenter.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/SurroundingEventPresenter.kt new file mode 100644 index 0000000000..871272bb5b --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/SurroundingEventPresenter.kt @@ -0,0 +1,7 @@ +package com.zhidao.mogo.module.event.panel.presenter + +import com.mogo.commons.mvp.Presenter +import com.zhidao.mogo.module.event.panel.fragment.SurroundingEventFragment + +class SurroundingEventPresenter(view: SurroundingEventFragment) : Presenter(view) { +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/TripRecordPresenter.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/TripRecordPresenter.kt new file mode 100644 index 0000000000..b16fc222cd --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/TripRecordPresenter.kt @@ -0,0 +1,7 @@ +package com.zhidao.mogo.module.event.panel.presenter + +import com.mogo.commons.mvp.Presenter +import com.zhidao.mogo.module.event.panel.fragment.TripRecordFragment + +class TripRecordPresenter(view: TripRecordFragment) : Presenter(view) { +} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml new file mode 100644 index 0000000000..2088b87141 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml new file mode 100644 index 0000000000..3a5d7413a6 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_surrounding_event.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_surrounding_event.xml new file mode 100644 index 0000000000..58d69b494e --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_surrounding_event.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_trip_record.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_trip_record.xml new file mode 100644 index 0000000000..254ea6aaaf --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_trip_record.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-event-panel/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..a6b3daec93 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/values/dimens.xml b/modules/mogo-module-event-panel/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..a6b3daec93 --- /dev/null +++ b/modules/mogo-module-event-panel/src/main/res/values/dimens.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index ae9b257292..56876478a7 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -53,6 +53,7 @@ dependencies { api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduleshare +// implementation rootProject.ext.dependencies.moduleventpanel // implementation rootProject.ext.dependencies.mogomoduleauth } else { api project(":libraries:mogo-map") @@ -62,6 +63,7 @@ dependencies { api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-share') +// implementation project(':modules:mogo-module-event-panel') // implementation project(':modules:mogo-module-authorize') } } 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 index d9844e910d..1641f5c53e 100644 --- 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 @@ -12,6 +12,7 @@ import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -433,6 +434,9 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent } ); mMsgCounter = findViewById( R.id.module_ext_id_msg_counter ); mUserHeadImg.setOnClickListener(view ->{ + // todo 测试代码 +// mApis.getEventPanelManager().showPanel(); + // 原始逻辑 try { LaunchUtils.launchByPkg(getContext(), "com.zhidao.auto.personal"); // 埋点 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 index 24f3ea1443..023e4ea746 100644 --- 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 @@ -173,5 +173,4 @@ android:textStyle="bold" android:visibility="gone" /> - \ No newline at end of file diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index e06cc617ba..2e2982d770 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -53,6 +53,7 @@ dependencies { api rootProject.ext.dependencies.mogoconnection api rootProject.ext.dependencies.moduleextensions api rootProject.ext.dependencies.mogomoduleback +// implementation rootProject.ext.dependencies.moduleventpanel } else { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") @@ -65,6 +66,7 @@ dependencies { api project(':foudations:mogo-connection') api project(':modules:mogo-module-extensions') api project(':modules:mogo-module-back') +// implementation project(':modules:mogo-module-event-panel') } } 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 bf37c76715..b1696dd2fa 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 @@ -178,6 +178,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void loadContainerModules() { // MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container ); MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container ); + MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container); } @Override 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 799a0d9377..a7f9306503 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 @@ -59,4 +59,10 @@ public interface MogoModulesHandler { * 2. mogo-module-service */ void loadBaseModule(); + + /** + * 加载事件面板 + * @param containerId + */ + void loadEventPanelModule(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 951a8dea9d..ca7c8ef3b9 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 @@ -11,6 +11,7 @@ import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.main.EventDispatchCenter; import com.mogo.module.main.MainActivity; import com.mogo.service.IMogoServiceApis; +import com.mogo.service.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.logger.Logger; @@ -130,6 +131,14 @@ public class MogoModulesManager implements MogoModulesHandler { addFragment( provider, containerId ); } + @Override + public void loadEventPanelModule(int containerId) { + IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance() + .build(MogoServicePaths.PATH_EVENT_PANEL) + .navigation( getContext() ); + addFragment( provider, containerId ); + } + @Override public void loadBaseModule() { List< MogoModule > baseModules = MogoModulePaths.getBaseModules(); diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index c19e5eb10e..9b210921e4 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -41,6 +41,12 @@ android:layout_height="match_parent" android:padding="@dimen/module_main_entrance_fragment_container_padding" android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" /> + T getApiInstance(Class< T > clazz, String path ) { T inst = SingletonsHolder.get( clazz ); if ( inst == null ) {