diff --git a/main-extensions/mogo-module-main-independent/src/main/res/values-ldpi/dimens.xml b/main-extensions/mogo-module-main-independent/src/main/res/values-ldpi/dimens.xml
new file mode 100644
index 0000000000..d25f1c125d
--- /dev/null
+++ b/main-extensions/mogo-module-main-independent/src/main/res/values-ldpi/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 358px
+ 366px
+
\ No newline at end of file
diff --git a/main-extensions/mogo-module-main-independent/src/main/res/values-mdpi/dimens.xml b/main-extensions/mogo-module-main-independent/src/main/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..d25f1c125d
--- /dev/null
+++ b/main-extensions/mogo-module-main-independent/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 358px
+ 366px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 77074d07cd..aa9282f3a5 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -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" />
diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
index 04abbaae72..b3c027a149 100644
--- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
@@ -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"
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
index 3b93ac53d5..f4a18ccc8d 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
@@ -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 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 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() {