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

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

Browse Source
This commit is contained in:
unknown
2020-11-30 20:14:07 +08:00
parent 91cb2891cb 18c31db124
commit a98eb4aecd
8 changed files with 24 additions and 24 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/AppsListActivity.java
View File

@@ -44,6 +44,8 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
getWindow().setStatusBarColor( Color.BLACK );
}
super.onCreate( savedInstanceState );
// 透明 activity 不会让前一个 activity 走 onStop 方法
AppServiceHandler.getApis().getStatusManagerApi().setMainPageIsBackgroundStatus( TAG, true );
AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, true );
}

2
modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<gradient android:angle="135" android:endColor="#59000000" android:startColor="#59000000" android:type="linear" />
<gradient android:angle="135" android:endColor="#164079" android:startColor="#1363A4" android:type="linear" />
<corners android:radius="@dimen/module_ext_common_corner" />
</shape>
</item>

4
modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
View File

@@ -32,8 +32,8 @@
<dimen name="module_main_panel_margin_right">0px</dimen>
<!--事件面板-->
<dimen name="module_main_event_panel_fragment_paddingTop">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingTop">0px</dimen>
<dimen name="module_main_event_panel_fragment_paddingBottom">0px</dimen>
<dimen name="module_main_event_panel_fragment_paddingLeft">6px</dimen>
<dimen name="module_main_event_panel_fragment_paddingRight">6px</dimen>
</resources>

13
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -399,11 +399,14 @@ public class MogoServices implements IMogoMapListener,
* 关闭所有模块的控制面板
*/
private void closeAllPanel() {
mCallProviderResponse = new ICallChatResponse() {
@Override
public void hideUserWindowError(@NotNull String errorMsg) {
}
};
if ( mCallProviderResponse != null ) {
mCallProviderResponse = new ICallChatResponse() {
@Override
public void hideUserWindowError(@NotNull String errorMsg) {
}
};
}
MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog();
MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel();
MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);

12
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java
View File

@@ -98,22 +98,16 @@ public class V2XEventPanelModuleProvider implements
@Override
public void showPanelWithSelectedItem(int item) {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
}
V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
}
@Override
public void showPanel() {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().showPanel();
}
V2XEventPanelFragment.Companion.getInstance().showPanel();
}
@Override
public void hidePanel() {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().hidePanel();
}
V2XEventPanelFragment.Companion.getInstance().hidePanel();
}
}

7
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
View File

@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
@@ -167,6 +168,12 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
v2XMessageEntity.setContent(v2XRoadEventEntity);
v2XMessageEntity.setShowState(true);
V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
//如果poiType是道路拥堵，则调用接口查询拥堵状态
String poiType = v2XRoadEventEntity.getPoiType();
if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
}
}
}

6
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
View File

@@ -170,12 +170,6 @@ public class V2XRoadEventWindow extends RelativeLayout
// 道路事件行驶到了50米附近，弹出事件纠错框给用户
//Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity);
//如果poiType是道路拥堵，则调用接口查询拥堵状态
String poiType = v2XRoadEventEntity.getPoiType();
if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
}
// 进行类型分发
switch (v2XRoadEventEntity.getPoiType()) {
case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查

2
modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
View File

@@ -121,7 +121,7 @@
android:id="@+id/ivFaultHelpEventNavi"
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:layout_marginRight="26px"
android:layout_marginRight="@dimen/dp_40"
android:src="@drawable/selector_nav_history"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"