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

Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
This commit is contained in:
liujing
2021-09-15 18:09:27 +08:00
parent a246aa956b 1d00537cbd
commit a4631f7880
1270 changed files with 23741 additions and 379701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,8 +196,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
final long start = System.currentTimeMillis();
MogoModulesManager.getInstance().init(this);
loadSplash();
if (DebugConfig.isMapBased()) {
if (mServiceApis.getMapServiceApi() != null) {
@@ -282,6 +280,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
MogoModulesManager.getInstance().loadEntrancesModule(R.id.module_main_id_entrance_fragment_container);
MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container);
MogoModulesManager.getInstance().loadLeftPanelModule(R.id.module_main_id_left_panel_fragment_container);
MogoModulesManager.getInstance().loadWaringModule(R.id.module_main_id_waring_fragment);
}
@Override
@@ -296,11 +295,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
List<IMogoModuleProvider> providers = MogoModulesManager.getInstance().loadCardsModule();
}
@Override
public void loadSplash() {
MogoModulesManager.getInstance().loadSplashModule(R.id.module_main_id_splash_container);
}
@NonNull
@Override
protected MainPresenter createPresenter() {

4
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java
View File

@@ -33,8 +33,4 @@ public interface MainView extends IView {
*/
IMogoServiceApis getApis();
/**
* 加载闪屏页
*/
void loadSplash();
}

23
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
View File

@@ -22,28 +22,28 @@ public interface MogoModulesHandler {
*
* @return
*/
List< IMogoModuleProvider > loadCardsModule();
List<IMogoModuleProvider> loadCardsModule();
/**
* 加载地图
*
* @param containerId 容器id
*/
void loadMapModule( int containerId );
void loadMapModule(int containerId);
/**
* 加载所有应用
*
* @param containerId 容器id
*/
void loadAppsListModule( int containerId );
void loadAppsListModule(int containerId);
/**
* 加载快捷操作
*
* @param containerId
*/
void loadEntrancesModule( int containerId );
void loadEntrancesModule(int containerId);
/**
* 加载基本服务模块，需要不启动页面就能运行
@@ -53,24 +53,27 @@ public interface MogoModulesHandler {
*/
void loadBaseModule();
/**
* 加载预警面板
*
* @param containerId
*/
void loadWaringModule(int containerId);
/**
* 加载事件面板
*
* @param containerId
*/
void loadEventPanelModule(int containerId);
/**
* 加载左侧面板
*
* @param containerId
*/
void loadLeftPanelModule(int containerId);
/**
* 加载比亚迪模块
* @param containerId
*/
void loadSplashModule(int containerId);
/**
* 释放各个模块资源
*/

17
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
View File

@@ -140,14 +140,6 @@ public class MogoModulesManager implements MogoModulesHandler {
addFragment( provider, containerId );
}
@Override
public void loadSplashModule( int containerId ) {
IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
.build( MogoServicePaths.PATH_SPLASH )
.navigation( getContext() );
addFragment( provider, containerId );
}
@Override
public void loadBaseModule() {
List< MogoModule > baseModules = MogoModulePaths.getBaseModules();
@@ -160,6 +152,15 @@ public class MogoModulesManager implements MogoModulesHandler {
}
}
@Override
public void loadWaringModule(int containerId) {
IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
.build( MogoServicePaths.PATH_V2X_WARNING )
.navigation( getContext() );
addFragment( provider, containerId );
}
private IMogoModuleProvider load( String path ) {
try {
return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() );

4
modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml
View File

@@ -3,6 +3,6 @@
<gradient
android:angle="90"
android:endColor="#00F03232"
android:startColor="#3FF03232"
android:type="linear"></gradient>
android:startColor="#66FF0808"
android:type="linear"/>
</shape>

4
modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml
View File

@@ -3,6 +3,6 @@
<gradient
android:angle="0"
android:endColor="#00F03232"
android:startColor="#3FF03232"
android:type="linear"></gradient>
android:startColor="#66FF0808"
android:type="linear"/>
</shape>

4
modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml
View File

@@ -3,6 +3,6 @@
<gradient
android:angle="180"
android:endColor="#00F03232"
android:startColor="#3FF03232"
android:type="linear"></gradient>
android:startColor="#66FF0808"
android:type="linear"/>
</shape>

4
modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml
View File

@@ -3,6 +3,6 @@
<gradient
android:angle="270"
android:endColor="#00FF0606"
android:startColor="#3FFF0606"
android:type="linear"></gradient>
android:startColor="#66FF0808"
android:type="linear"/>
</shape>

12
modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_icon.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--单独的slogan图片 并且设置下间距-->
<!--如果使用svg可以直接 drawable-->
<item>
<bitmap
android:gravity="center"
android:scaleType="centerCrop"
android:src="@drawable/mogo_slogan"
android:tileMode="disabled" />
</item>
</layer-list>

74
modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
View File

@@ -13,6 +13,43 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!--四个方向，碰撞预警-->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/warning_top"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_390"
android:background="@drawable/module_main_warning_bkg_top"
android:visibility="gone" />
<ImageView
android:id="@+id/warning_left"
android:layout_width="@dimen/dp_390"
android:layout_height="match_parent"
android:background="@drawable/module_main_warning_bkg_left"
android:visibility="gone" />
<ImageView
android:id="@+id/warning_right"
android:layout_width="@dimen/dp_390"
android:layout_height="match_parent"
android:layout_gravity="right"
android:background="@drawable/module_main_warning_bkg_right"
android:visibility="gone" />
<ImageView
android:id="@+id/warning_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_390"
android:layout_gravity="bottom"
android:background="@drawable/module_main_warning_bkg_bottom"
android:visibility="gone" />
</FrameLayout>
<!-- 天气动画层 -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_special_effect"
@@ -37,37 +74,11 @@
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!--四个方向，碰撞预警-->
<ImageView
android:id="@+id/warning_top"
<!--预警视图 OBU、云端下发、自车感知、自车策略-->
<FrameLayout
android:id="@+id/module_main_id_waring_fragment"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_390"
android:background="@drawable/module_main_warning_bkg_top"
android:visibility="gone" />
<ImageView
android:id="@+id/warning_left"
android:layout_width="@dimen/dp_390"
android:layout_height="match_parent"
android:background="@drawable/module_main_warning_bkg_left"
android:visibility="gone" />
<ImageView
android:id="@+id/warning_right"
android:layout_width="@dimen/dp_390"
android:layout_height="match_parent"
android:layout_gravity="right"
android:background="@drawable/module_main_warning_bkg_right"
android:visibility="gone" />
<ImageView
android:id="@+id/warning_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_390"
android:layout_gravity="bottom"
android:background="@drawable/module_main_warning_bkg_bottom"
android:visibility="gone" />
android:layout_height="match_parent" />
<!-- 左侧阴影背景 -->
<FrameLayout
@@ -135,6 +146,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!--网约车视图-->
<FrameLayout
android:id="@+id/module_main_id_och_fragment"
@@ -157,7 +169,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/main_bitmap_splash_bg"
android:background="@drawable/main_bitmap_splash_icon"
android:scaleType="centerCrop"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"