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

Merge remote-tracking branch 'origin/qa_1.1.6' into qa_1.1.6

Browse Source
This commit is contained in:
tongchenfei
2020-09-28 14:23:37 +08:00
parent 2978fb74d7 1b1f935cae
commit 1b059a1188
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -400,10 +400,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
long guideRecordTime = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getLong(getSPGuideRecord(), 0);
Logger.d(TAG, " isGreaterThanOneDay interval = " + (System.currentTimeMillis() - guideRecordTime) + "---currentTime = " + System.currentTimeMillis() + "---guideRecordTime =" + guideRecordTime);
if ((System.currentTimeMillis() - guideRecordTime) > ONE_DAY_TIME) {
Logger.d(TAG, "--------1------");
isGreaterThanOneDay = true;
} else {
Logger.d(TAG, "--------2------");
isGreaterThanOneDay = false;
}

10
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
View File

@@ -72,34 +72,27 @@ public class V2XScenarioManager implements IV2XScenarioManager {
if (mV2XScenario == null) {
switch (v2XMessageEntity.getType()) {
case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING:
hidOtherPanel();
mV2XScenario = V2XRoadEventScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING:
hidOtherPanel();
mV2XScenario = V2XSeekHelpScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING:
hidOtherPanel();
mV2XScenario = V2XFatigueDrivingScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING:
hidOtherPanel();
mV2XScenario = V2XPushEventScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING:
hidOtherPanel();
mV2XScenario = V2XPushLiveCarScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING:
hidOtherPanel();
mV2XScenario = V2XAnimationScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP:
mV2XScenario = V2XCarForHelpScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING:
hidOtherPanel();
mV2XScenario = V2XIllegalParkScenario.getInstance();
break;
default:
@@ -111,6 +104,9 @@ public class V2XScenarioManager implements IV2XScenarioManager {
// 展示最新的消息
if (mV2XScenario != null) {
if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) {
hidOtherPanel();
}
mV2XScenario.init(v2XMessageEntity);
mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario);
}

2
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
View File

@@ -29,7 +29,7 @@
<corners android:radius="@dimen/dp_26" />
<gradient
android:angle="135"
android:endColor="#E6F5F5F5"
android:endColor="#F5F5F5"
android:startColor="#FFFFFF"
android:type="linear"
android:useLevel="true" />