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

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

Browse Source
This commit is contained in:
unknown
2020-09-26 14:29:10 +08:00
parent de9e8dc564 afadd6077b
commit c4ad7085b1
5 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_main_entrance_fragment_container_marginLeft">358px</dimen>
<dimen name="module_main_header_fragment_container_marginLeft">366px</dimen>
</resources>

5
main-extensions/mogo-module-main-independent/src/main/res/values-mdpi/dimens.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_main_entrance_fragment_container_marginLeft">358px</dimen>
<dimen name="module_main_header_fragment_container_marginLeft">366px</dimen>
</resources>

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

@@ -52,8 +52,9 @@
android:textSize="@dimen/module_ext_north_textSize"
android:textStyle="bold"
android:paddingRight="@dimen/module_ext_destination_online_car_paddingRight"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
android:paddingLeft="@dimen/module_ext_destination_online_car_paddingLeft"
app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop"
tools:visibility="visible" />

1
modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
View File

@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_services_online_car_panel_marginRight"
android:layout_marginTop="@dimen/module_services_online_car_panel_marginTop"
android:layout_marginRight="@dimen/module_services_online_car_panel_marginRight"
android:layout_marginBottom="@dimen/module_services_online_car_panel_marginBottom"

67
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
View File

@@ -369,24 +369,15 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
mMogoRegisterCenter.registerMogoMarkerClickListener(TanluConstants.MODEL_NAME, new IMogoMarkerClickListener() {
@Override
public boolean onMarkerClicked(IMogoMarker marker) {
GSYVideoManager.releaseAllVideos();
initVideo();
releaseTimer();
//埋点
Map<String, Object> properties = new HashMap<>();
properties.put("type", "2");
mAnalytics.track(TanluConstants.LAUNCHER_ICON_CLICK, properties);
//点击的marker的具体数据
MarkerExploreWay exploreWay = extractFromMarker(marker);
V2XRoadEventEntity roadEventEntity = new V2XRoadEventEntity();
roadEventEntity.setNoveltyInfo(exploreWay);
roadEventEntity.setPoiType(exploreWay.getPoiType());
roadEventEntity.setExpireTime(20000);
//地理位置
MarkerLocation location = exploreWay.getLocation();
roadEventEntity.setLocation(location);
V2XMessageEntity v2XMessageEntity = new V2XMessageEntity();
v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING);
v2XMessageEntity.setShowState(true);
v2XMessageEntity.setOnlyShow(true);
v2XMessageEntity.setNeedAddLine(false);
v2XMessageEntity.setContent(roadEventEntity);
//更新数据
if (markerExploreWayList != null) {
markerExploreWayList.clear();
@@ -395,20 +386,48 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
}
markerExploreWayList.add(exploreWay);
Intent intent = new Intent(Const.BROADCAST_SCENE_HANDLER_ACTION);
intent.putExtra(Const.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
boolean isAdd = TanluServiceManager.getIMogoTopViewManager().isViewAdded(TanluListWindow.this);
hideWindowTimerStart();
Logger.d(TAG, "onMarkerClicked ------ isAdd = " + isAdd);
//埋点
Map<String, Object> properties = new HashMap<>();
properties.put("type", "2");
mAnalytics.track(TanluConstants.LAUNCHER_ICON_CLICK, properties);
//添加window窗口,重复创建
if (!isAdd) {
ViewGroup.LayoutParams layoutParams =
new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
(int) getContext().getResources().getDimension((R.dimen.tanlu_module_card_height)));
TanluServiceManager.getIMogoTopViewManager().addView(TanluListWindow.this, layoutParams, new IMogoTopViewStatusListener() {
@Override
public void onViewAdded(View view) {
Logger.d(TAG, "onViewAdded -------->");
}
@Override
public void onViewRemoved(View view) {
Logger.e(TAG, "onViewRemoved -------->");
releaseTimer();
releaseAction();
}
@Override
public void beforeViewAddAnim(View view) {
}
@Override
public void beforeViewRemoveAnim(View view) {
}
});
}
renderCardViews();
return false;
}
});
}
private CountDownTimer mHideWindowTimer;
private void hideWindowTimerStart() {