yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev

Browse Source
This commit is contained in:
wangcongtao
2020-06-03 11:24:47 +08:00
parent c4d3d2f7e2 e5676e5d1d
commit c91930299a
37 changed files with 505 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java
View File

@@ -19,7 +19,7 @@ public enum AppEnum {
QQMusic( "QQ音乐", "com.pvetec.musics", R.drawable.module_apps_ic_qq_music ),
//"车聊聊",
// Im( "车聊聊", "com.zhidao.imdemo", R.drawable.module_apps_ic_im ),
Im( "车聊聊", "com.zhidao.imdemo", R.drawable.module_apps_ic_im ),
//"探路",
// RoadCondition( "探路", "com.zhidao.roadcondition", R.drawable.module_apps_ic_road_condition ),

13
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -242,6 +242,10 @@ public class TopViewAnimHelper {
R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
constraintSet.clear(ivTurnIcon.getId(),ConstraintSet.TOP);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, (int) getDimen(R.dimen.module_ext_navi_info_turn_icon_margin_bottom));
constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
(int) getDimen(R.dimen.dp_316));
@@ -350,6 +354,9 @@ public class TopViewAnimHelper {
0);
constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(),ConstraintSet.TOP,naviBg.getId(),ConstraintSet.TOP,0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, 0);
}
constraintSet.applyTo(topMotionLayout);
@@ -398,6 +405,9 @@ public class TopViewAnimHelper {
constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
0);
constraintSet.connect(ivTurnIcon.getId(),ConstraintSet.TOP,naviBg.getId(),ConstraintSet.TOP,0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, 0);
constraintSet.applyTo(topMotionLayout);
scene = Scene.NAVI_WITH_ROAD_EVENT;
} else {
@@ -424,6 +434,9 @@ public class TopViewAnimHelper {
// naviBg.getLayoutParams().height =
// (int) topMotionLayout.getContext().getResources().getDimension(R.dimen
// .module_ext_navi_info_panel_small_height);
constraintSet.clear(ivTurnIcon.getId(),ConstraintSet.TOP);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, (int) getDimen(R.dimen.module_ext_navi_info_turn_icon_margin_bottom));
constraintSet.applyTo(topMotionLayout);
scene = Scene.NAVI;
}

2
modules/mogo-module-extensions/src/main/res/layout/demo_top.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_350"
android:background="#000">
android:background="#ccc">
<TextView
android:layout_width="wrap_content"

19
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -6,16 +6,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.mogo.module.extensions.navi.TopView
android:id="@+id/module_entrance_id_top_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:clickable="true"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<!-- <androidx.constraintlayout.widget.Group-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
@@ -257,6 +247,15 @@
app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" />
<com.mogo.module.extensions.navi.TopView
android:id="@+id/module_entrance_id_top_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:clickable="true"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<LinearLayout
android:id="@+id/module_ext_id_display_overview"

5
modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
View File

@@ -82,8 +82,8 @@
<dimen name="module_ext_navi_info_panel_small_height">60px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_width">85px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_height">85px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_width">52px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_height">52px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_width">38px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_height">38px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">13px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_marginTop">13px</dimen>
<dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">20px</dimen>
@@ -95,6 +95,7 @@
<dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px
</dimen>
<dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">15px</dimen>
<dimen name="module_ext_navi_info_turn_icon_margin_bottom">5px</dimen>
<dimen name="module_ext_voice_msg_padding_top">9px</dimen>
<dimen name="module_ext_voice_msg_padding_bottom">9px</dimen>

6
modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
View File

@@ -79,8 +79,8 @@
<dimen name="module_ext_navi_info_panel_small_height">144px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_width">159px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_width">96px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_height">96px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_width">70px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_height">70px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">24px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_small_marginLeft">83px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
@@ -92,7 +92,7 @@
<dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
<dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
<dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
<dimen name="module_ext_navi_info_turn_icon_margin_bottom">24px</dimen>
<dimen name="module_ext_voice_msg_padding_top">17px</dimen>
<dimen name="module_ext_voice_msg_padding_bottom">17px</dimen>
<dimen name="module_ext_voice_msg_padding_left">36px</dimen>

40
modules/mogo-module-main/build.gradle
View File

@@ -41,27 +41,27 @@ dependencies {
implementation rootProject.ext.dependencies.arouter
annotationProcessor rootProject.ext.dependencies.aroutercompiler
if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.mogoutils
implementation rootProject.ext.dependencies.mogocommons
implementation rootProject.ext.dependencies.modulecommon
implementation rootProject.ext.dependencies.modulemap
implementation rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.mogoservice
implementation rootProject.ext.dependencies.moduleservice
implementation rootProject.ext.dependencies.moduleapps
implementation rootProject.ext.dependencies.mogoconnection
implementation rootProject.ext.dependencies.moduleextensions
api rootProject.ext.dependencies.mogoutils
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.modulecommon
api rootProject.ext.dependencies.modulemap
api rootProject.ext.dependencies.mogoserviceapi
api rootProject.ext.dependencies.mogoservice
api rootProject.ext.dependencies.moduleservice
api rootProject.ext.dependencies.moduleapps
api rootProject.ext.dependencies.mogoconnection
api rootProject.ext.dependencies.moduleextensions
} else {
implementation project(":foudations:mogo-utils")
implementation project(":foudations:mogo-commons")
implementation project(':modules:mogo-module-common')
implementation project(':modules:mogo-module-map')
implementation project(':modules:mogo-module-service')
implementation project(':services:mogo-service-api')
implementation project(':services:mogo-service')
implementation project(':modules:mogo-module-apps')
implementation project(':foudations:mogo-connection')
implementation project(':modules:mogo-module-extensions')
api project(":foudations:mogo-utils")
api project(":foudations:mogo-commons")
api project(':modules:mogo-module-common')
api project(':modules:mogo-module-map')
api project(':modules:mogo-module-service')
api project(':services:mogo-service-api')
api project(':services:mogo-service')
api project(':modules:mogo-module-apps')
api project(':foudations:mogo-connection')
api project(':modules:mogo-module-extensions')
}
}

26
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -47,21 +47,21 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
IMogoLocationListener,
IMogoMarkerClickListener {
private static final String TAG = "MainActivity";
protected static final String TAG = MainActivity.class.getSimpleName();
private IMogoServiceApis mServiceApis;
private IMogoMapService mMogoMapService;
private IMogoMapUIController mMogoMapUIController;
private MogoModulesHandler mMogoModuleHandler;
private IMogoFragmentManager mMogoFragmentManager;
private IMogoStatusManager mMogoStatusManager;
protected IMogoServiceApis mServiceApis;
protected IMogoMapService mMogoMapService;
protected IMogoMapUIController mMogoMapUIController;
protected MogoModulesHandler mMogoModuleHandler;
protected IMogoFragmentManager mMogoFragmentManager;
protected IMogoStatusManager mMogoStatusManager;
private View mHeader;
private View mApps;
private View mEntrance;
private FrameLayout mFloatingLayout;
private FrameLayout mCoverUpLayout;
private View mLeftShadowFrame;
protected View mHeader;
protected View mApps;
protected View mEntrance;
protected FrameLayout mFloatingLayout;
protected FrameLayout mCoverUpLayout;
protected View mLeftShadowFrame;
/**
* 主模块管控定位，可以向各个模块发送统一定位信息