Merge branch 'vr' into dev_merge_shunyi_vr_map
This commit is contained in:
@@ -137,5 +137,5 @@ public class V2XConst {
|
||||
/*
|
||||
* VR模式
|
||||
* */
|
||||
public static final boolean VR_MODE = MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode();
|
||||
public static final boolean VR_MODE = true;
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import com.shuyu.gsyvideoplayer.video.base.GSYVideoView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import static com.mogo.module.v2x.V2XConst.VR_MODE;
|
||||
import static com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL;
|
||||
|
||||
/**
|
||||
@@ -68,7 +69,7 @@ public class V2XRoadVideoWindow extends RelativeLayout implements
|
||||
}
|
||||
|
||||
private void initView(Context context) {
|
||||
LayoutInflater.from(mContext).inflate(R.layout.window_road_video_layout, this);
|
||||
LayoutInflater.from(mContext).inflate(VR_MODE ? R.layout.window_road_video_layout_vr : R.layout.window_road_video_layout, this);
|
||||
playImageView = this.findViewById(R.id.window_video_play);
|
||||
thumbnailImage = this.findViewById(R.id.thumbnail_image);
|
||||
simpleCoverVideoPlayer = this.findViewById(R.id.roadVideoView);
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/rlRoadEventList"
|
||||
android:layout_width="@dimen/dp_700"
|
||||
android:layout_height="@dimen/dp_394"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_margin="@dimen/dp_3"
|
||||
android:background="@drawable/v2x_alert_window_bg">
|
||||
|
||||
<com.mogo.module.v2x.view.RoundLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:roundLayoutRadius="@dimen/dp_26">
|
||||
|
||||
<com.mogo.module.v2x.view.SimpleCoverVideoPlayer
|
||||
android:id="@+id/roadVideoView"
|
||||
android:layout_width="@dimen/dp_700"
|
||||
android:layout_height="@dimen/dp_394"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:clickable="true" />
|
||||
|
||||
<com.mogo.service.imageloader.MogoImageView
|
||||
android:id="@+id/thumbnail_image"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/v2x_bg_big_image_dark"
|
||||
android:scaleType="fitXY"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/window_video_play"
|
||||
android:layout_width="@dimen/dp_100"
|
||||
android:layout_height="@dimen/dp_100"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@drawable/v2x_icon_event_play"
|
||||
android:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/roadVideoClose"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:src="@drawable/module_common_close_selector" />
|
||||
</com.mogo.module.v2x.view.RoundLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
Reference in New Issue
Block a user