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

Merge branch 'ch' into dev

Browse Source
This commit is contained in:
liujing
2020-11-26 18:27:30 +08:00
parent 47f2ea2d9e c0a1cce328
commit 1a10c45d43
14 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/build.gradle
View File

@@ -121,6 +121,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
// f系列-分体机
@@ -144,6 +146,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
// e系列，采用Launcher方案
e8xx {
@@ -166,6 +170,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
// 同上
em4 {
@@ -188,6 +194,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
// e系列-2+32，对标D系列2+32，采用独立app的形式
em3 {
@@ -210,6 +218,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
// e系列-1+16，对标D系列1+16，采用独立app形式
em1 {
@@ -232,6 +242,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'false'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
// e系列-1+16，对标D系列1+16，采用独立app形式
em2 {
@@ -254,6 +266,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'false'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
// d系列
d8xx {
@@ -276,6 +290,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true'
}
// d系列 2 + 32
d80x {
@@ -298,6 +314,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true'
}
// d系列 1+16 版本
d82x {
@@ -320,6 +338,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'false'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true'
}
// 比亚迪
bydauto {
@@ -342,6 +362,8 @@ android {
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否加载引导模块
buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
// 分享时是否隐藏 adas
buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
}
qa {
dimension "env"

1
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -129,6 +129,7 @@ public class MogoApplication extends AbsMogoApplication {
DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY );
DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED );
DebugConfig.setNeedLoadGuideModule( BuildConfig.IS_NEED_LOAD_GUIDE_MODULE );
DebugConfig.setNeedHideAdasWhenShare( BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE );
}
@Override

12
foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
View File

@@ -1,7 +1,5 @@
package com.mogo.commons.debug;
import com.mogo.utils.logger.Logger;
/**
* @author congtaowang
* @since 2019-12-23
@@ -318,4 +316,14 @@ public class DebugConfig {
public static boolean isNeedLoadGuideModule() {
return isNeedLoadGuideModule;
}
private static boolean isNeedHideAdasWhenShare = false;
public static boolean isNeedHideAdasWhenShare() {
return isNeedHideAdasWhenShare;
}
public static void setNeedHideAdasWhenShare( boolean isNeedHideAdas ) {
DebugConfig.isNeedHideAdasWhenShare = isNeedHideAdas;
}
}

2
modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
View File

@@ -23,7 +23,7 @@
<dimen name="module_apps_navigator_icon_width">160px</dimen>
<dimen name="module_apps_navigator_icon_height">160px</dimen>
<dimen name="module_apps_navigator_icon_divider">30px</dimen>
<dimen name="module_apps_navigator_icon_divider">10px</dimen>
<dimen name="module_apps_voice_icon_width">100px</dimen>
<dimen name="module_apps_voice_icon_height">100px</dimen>
</resources>

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

@@ -371,7 +371,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
AIAssist.getInstance( this ).release();
mServiceApis.getOnlineCarPanelApi().clear();
if ( CallChatApi.getInstance().getApiProvider() != null ) {
CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null);
// CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null);
}
ContextHolderUtil.releaseContext();
MogoModulesManager.getInstance().onDestroy();

7
modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
View File

@@ -26,6 +26,7 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener {
// 接收高德
public static final String AUTONAVI_STANDARD_BROADCAST_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND";
private EnumMapUI mLastAMapUiType = null;
public void register( IMogoIntentManager manager ) {
manager.registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this );
@@ -131,11 +132,17 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener {
// 高德改变黑夜白天模式后，传递给launcher，顺便改变其他
if ( extraState == 37 ) {
// 白天模式
mLastAMapUiType = EnumMapUI.Type_Light;
MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Light );
} else if ( extraState == 38 ) {
// 夜间模式
mLastAMapUiType = EnumMapUI.Type_Night;
MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Night );
}
}
}
public EnumMapUI getLastAMapUiType() {
return mLastAMapUiType;
}
}

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

@@ -103,6 +103,10 @@ class MapControlCommandHandler {
return;
}
if ( mCallback.getAMapLastType() == ui ) {
return;
}
int KEY_TYPE = 10048;
int state = 0;//2黑夜;1白天 ;0自动
switch ( ui ) {

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

@@ -296,6 +296,14 @@ public class MapPresenter extends Presenter< MapView > implements
mRegisterCenter.registerADASControlStatusChangedListener( TAG, this );
}
@Override
public EnumMapUI getAMapLastType() {
if ( mAutoNaviReceiver != null ) {
return mAutoNaviReceiver.getLastAMapUiType();
}
return null;
}
private void initBroadcast() {
mAutoNaviReceiver = new AutoNaviBroadcastIntentHandler();
mAutoNaviReceiver.setCallback( this );

3
modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
View File

@@ -36,4 +36,7 @@ public interface OnMapControlCallback {
// 缩放地图
void onZoomMap( boolean zoomIn );
// 高德地图上次类型
EnumMapUI getAMapLastType();
}

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt
View File

@@ -48,7 +48,7 @@ class StrategyShareProvider : IProvider {
// adas返回前车距离，单位是米
val frontDistanceItem = GsonUtil.objectFromJson(it, AdasFrontCarDistanceY::class.java)
frontDistanceItem.result.distanceY?.apply {
blockStrategy.refreshFrontDistance(it.toDouble().toInt())
blockStrategy.refreshFrontDistance(this.toDouble().toInt())
}
}
} catch (e: Exception) {

4
modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
View File

@@ -106,7 +106,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) {
override fun show() {
Logger.d(TAG, "onShow====")
if (!DebugConfig.isLauncher()) {
if (DebugConfig.isNeedHideAdasWhenShare()) {
mApis.adasControllerApi.closeADAS()
}
gridBtnManager.showShareButton()
@@ -115,7 +115,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) {
override fun dismiss() {
Logger.d(TAG, "onDismiss=====")
if (!DebugConfig.isLauncher() && mApis.statusManagerApi.isMainPageOnResume) {
if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) {
mApis.adasControllerApi.showADAS()
}
super.dismiss()

0
skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png → skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

2
skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_pannel_call_pressed_light" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_panel_call_pressed_light" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_panel_call_normal_light" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_panel_call_normal_light" />
</selector>

0
skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png → skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB