From 450f9a8dc931f92ffe15d445e783399fde19a14d Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 17 Feb 2023 17:49:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[m2]=20UI=20=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/model/PM2DrivingModel.kt | 11 ++- .../passenger/ui/PM2DrivingInfoFragment.kt | 27 +++++++ .../och/bus/passenger/ui/PM2HPMapFragment.kt | 10 +-- .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 68 ++++++++++++++++++ .../ui/widget/video/AdvanceImageView.kt | 2 +- .../ui/widget/video/AdvancePagerAdapter.kt | 20 +++--- .../ui/widget/video/AdvanceVideoView.kt | 42 +++++------ .../m2/res/drawable-nodpi/m2_map_car_icon.png | Bin 0 -> 4704 bytes .../res/layout/p_m2_driving_info_fragment.xml | 10 +-- .../src/m2/res/layout/p_m2_hpmap_fragment.xml | 4 +- .../src/m2/res/layout/p_m2_video_view.xml | 8 +++ .../layout/view_turn_light_status_daytime.xml | 24 +++---- 12 files changed, 157 insertions(+), 69 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_video_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index 9d33c49fa1..220f5a31ce 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -133,9 +133,6 @@ class PM2DrivingModel private constructor() { if (msg.isPlay){ //播报 showNotice(msg.msg) } - if (msg.isViewShow){//显示 - } - } } } @@ -244,7 +241,10 @@ class PM2DrivingModel private constructor() { PM2ServiceManager.queryDriverSiteByCoordinate(it, object : OchCommonServiceCallback{ override fun onSuccess(data: PM2RoutesResponse?) { - if (data?.result == null || data.result.sites == null) { + if (data?.result === routesResult) { + return + } + if (data?.result?.sites === null) { routesResult = null mNextStationIndex = 0 isGoingToNextStation = false @@ -252,9 +252,6 @@ class PM2DrivingModel private constructor() { mDrivingInfoCallback?.showNoTaskView(true) return } - if (data.result === routesResult) { - return - } routesResult = data.result updatePassengerRouteInfo(data.result) } diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt index 8e6a69c909..8f7dd0fdcf 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt @@ -6,6 +6,12 @@ import android.view.View import androidx.core.content.ContextCompat import com.amap.api.maps.model.LatLng import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgBoxType +import com.mogo.eagle.core.data.msgbox.NoticeFrCloudMsg +import com.mogo.eagle.core.data.msgbox.V2XMsg +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.DateTimeUtils @@ -38,6 +44,27 @@ class PM2DrivingInfoFragment : speed_tv.onClick { context?.let { it -> ToggleDebugView.toggleDebugView.toggle(it) } } + current_time_tv.onClick { + //测试V2X消息 + CallerMsgBoxManager.saveMsgBox( + MsgBoxBean( + MsgBoxType.V2X, + V2XMsg( + "6666", + "超速行驶", + "" + ) + ) + ) + + val noticeTrafficStylePushData = NoticeTrafficStylePushData() + noticeTrafficStylePushData.content= "测试公告布局" + val noticeFromCloudMsg = NoticeFrCloudMsg(null, noticeTrafficStylePushData, 1) + CallerMsgBoxManager.saveMsgBox( + MsgBoxBean( + MsgBoxType.NOTICE, noticeFromCloudMsg) + ) + } updateCurrentTime() } diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt index b02ebb10f4..05b1101cfd 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt @@ -80,10 +80,8 @@ class PM2HPMapFragment : ) { //开启线程执行起终点marker设置 val setMapMarkerRunnable = Runnable { - d( - "setMapMaker= " + Thread.currentThread().name, - uuid + "=latitude=" + station[1] + ",longitude=" + station[0] - ) + d("setMapMaker= " + Thread.currentThread().name, + uuid + "=latitude=" + station[1] + ",longitude=" + station[0]) val options = MogoMarkerOptions() .owner(TYPE_MARKER_M2_LINE) .anchor(0.5f, 0.5f) @@ -115,9 +113,7 @@ class PM2HPMapFragment : val removeMapMarkerRunnable = Runnable { d("RemoveMapMaker=" + Thread.currentThread().name, uuid) Objects.requireNonNull( - getMarkerManager( - AbsMogoApplication.getApp() - ) + getMarkerManager(AbsMogoApplication.getApp()) )?.removeMarkers(uuid) } OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt new file mode 100644 index 0000000000..8d1bf3c0b9 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -0,0 +1,68 @@ +package com.mogo.och.bus.passenger.ui.widget.video + +import android.content.Context +import android.util.AttributeSet +import com.shuyu.gsyvideoplayer.utils.Debuger +import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer + +/** + * @author: wangmingjun + * @date: 2023/2/17 + * 隐藏所有控件的player + */ +class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { + constructor(context: Context?) : super(context) + constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) + + init { + hideWidget() + } + + override fun hideAllWidget() { + hideWidget() + } + + override fun changeUiToNormal() { + Debuger.printfLog("changeUiToNormal") + hideWidget() + } + + override fun changeUiToPreparingShow() { + hideWidget() + } + + override fun changeUiToPlayingShow() { + hideWidget() + } + + override fun changeUiToPauseShow() { + hideWidget() + } + + override fun changeUiToCompleteShow() { + hideWidget() + } + + override fun changeUiToPlayingBufferingShow() { + hideWidget() + } + + private fun hideWidget(){ + setViewShowState(mBottomContainer, GONE) + setViewShowState(mProgressBar, GONE) + setViewShowState(mCurrentTimeTextView, GONE) + setViewShowState(mTotalTimeTextView, GONE) + setViewShowState(mBottomProgressBar, GONE) + setViewShowState(mBackButton, GONE) + setViewShowState(mStartButton, GONE) + + setViewShowState(mTopContainer, GONE) + + setViewShowState(mLoadingProgressBar, GONE) + setViewShowState(mThumbImageViewLayout, GONE) + setViewShowState(mThumbImageView, GONE) + setViewShowState( + mLockScreen, GONE + ) + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt index 151bc1c5e7..ae1363f2b6 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt @@ -32,7 +32,7 @@ class AdvanceImageView @JvmOverloads constructor( @SuppressLint("CheckResult") fun setImagePath(path: String){ imageView?.let { Glide.with(context).load(path) - .apply { RequestOptions().placeholder(R.drawable.m2_p_video_holder).centerCrop() } + .apply(RequestOptions().placeholder(R.drawable.m2_p_video_holder).centerCrop()) .into(it) } } } \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt index 8ad1126539..ed7df77713 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -49,7 +49,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter if (viewList[mViewPager.currentItem] is AdvanceVideoView) {//有人反应第一个是视频不播放这边优化了一下 Logger.d("onPageScrollStateChanged", "第一个是视频") val video = viewList[mViewPager.currentItem] as AdvanceVideoView - video.setVideo(gsySampleCallBack) + video.setVideo(gsySampleCallBack,mViewPager.currentItem) } else if (viewList[mViewPager.currentItem] is AdvanceImageView) { Logger.d("onPageScrollStateChanged", "startTimer()_1") @@ -125,16 +125,12 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter "state = $state currentItem = $currentItem lastPosition = $lastPosition") if (viewList.size > 1) { //多于1，才会循环跳转 -// if (lastPosition != -1 && lastPosition != mViewPager.currentItem -// && viewList[lastPosition] is AdvanceVideoView -// ) { -// val videoView: AdvanceVideoView = viewList[lastPosition] as AdvanceVideoView -// videoView.setPause() -// } if (viewList[mViewPager.currentItem] is AdvanceVideoView) { + val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) - videoView.setVideo(gsySampleCallBack) + videoView.setCacheImageView(dataList[mViewPager.currentItem].cacheImgPath) + videoView.setVideo(gsySampleCallBack,mViewPager.currentItem) } else if (viewList[mViewPager.currentItem] is AdvanceImageView) { Logger.d("onPageScrollStateChanged", "startTimer()") @@ -149,18 +145,17 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter private var gsySampleCallBack = object : GSYSampleCallBack() { override fun onPrepared(url: String?, vararg objects: Any?) { - super.onPrepared(url, *objects) - val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) Logger.d("onPageScrollStateChanged", "onPrepared") + val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) UiThreadHandler.postDelayed({ videoView.setCacheImageViewGone() - },400) + },2000) } override fun onAutoComplete(url: String?, vararg objects: Any?) { - super.onAutoComplete(url, *objects) Logger.d("onPageScrollStateChanged", "onAutoComplete()") val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) + videoView.onVideoReset() videoView.setCacheImageView(dataList[mViewPager.currentItem].cacheImgPath) goNextItemView() } @@ -169,6 +164,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter super.onPlayError(url, *objects) Logger.d("onPageScrollStateChanged", "onPlayError()") val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) + videoView.onVideoReset() videoView.setCacheImageView(dataList[mViewPager.currentItem].cacheImgPath) goNextItemView() } diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt index e45279eb78..94d899b160 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt @@ -2,17 +2,14 @@ package com.mogo.och.bus.passenger.ui.widget.video import android.annotation.SuppressLint import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.widget.ImageView import android.widget.RelativeLayout import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.mogo.eagle.core.utilcode.util.BitmapHelper import com.mogo.och.bus.passenger.R import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack -import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer /** * @author: wangmingjun @@ -24,7 +21,7 @@ class AdvanceVideoView @JvmOverloads constructor( private var videoRelativeLayout: RelativeLayout? = null private var cacheImage: ImageView? = null - private var videoViewPlayer: StandardGSYVideoPlayer? = null + private var videoViewPlayer: AdvanceGSYVideoPlayer? = null private var gsyVideoOptionBuilder: GSYVideoOptionBuilder? = null private var path: String? = null @@ -33,8 +30,8 @@ class AdvanceVideoView @JvmOverloads constructor( } private fun initView() { - initCacheImgView() initVideoView() + initCacheImgView() } private fun initCacheImgView() { @@ -49,13 +46,8 @@ class AdvanceVideoView @JvmOverloads constructor( if (videoViewPlayer === null) { //视频播放控件 - videoViewPlayer = StandardGSYVideoPlayer(context) + videoViewPlayer = AdvanceGSYVideoPlayer(context) } - if (gsyVideoOptionBuilder === null) { - gsyVideoOptionBuilder = GSYVideoOptionBuilder() - } - - videoViewPlayer?.isFocusableInTouchMode = false var layoutParams = LayoutParams(-1, -1) //设置videoview占满父view播放 @@ -77,32 +69,32 @@ class AdvanceVideoView @JvmOverloads constructor( @SuppressLint("CheckResult") fun setCacheImageView(imgPath: String) { + cacheImage?.let { Glide.with(context) - .apply { RequestOptions().placeholder(R.drawable.m2_p_video_holder).centerCrop() } - .load(imgPath).into(it) + .load(imgPath) + .apply(RequestOptions().placeholder(R.drawable.m2_p_video_holder).centerCrop()) + .into(it) } + cacheImage?.visibility = VISIBLE } - fun setVideo(onCompletionListener: GSYSampleCallBack) { + fun setVideo(onCompletionListener: GSYSampleCallBack,position: Int) { + gsyVideoOptionBuilder = GSYVideoOptionBuilder() gsyVideoOptionBuilder?.setUrl(path) + ?.setPlayTag(path + position) ?.setCacheWithPlay(false) -// ?.setAutoFullWithSize(true) -// ?.setShowPauseCover(false) -// ?.setFullHideActionBar(true) -// ?.setFullHideStatusBar(true) -// ?.setIsTouchWiget(false) -// ?.setIsTouchWigetFull(false) -// ?.setNeedLockFull(true) -// ?.setLockLand(true) -// ?.setAutoFullWithSize(true) -// ?.setNeedShowWifiTip(false) + ?.setThumbPlay(false) ?.build(videoViewPlayer) + videoViewPlayer?.isFocusableInTouchMode = false videoViewPlayer?.setVideoAllCallBack(onCompletionListener) + videoViewPlayer?.startPlayLogic() + } - videoViewPlayer?.startButton?.performClick() + fun onVideoReset(){ + videoViewPlayer?.onVideoReset() } fun setCacheImageViewGone() { diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2520ae1c9e77acf65aef38a2e9dc559313a5b32d GIT binary patch literal 4704 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 @@ -34,6 +35,7 @@ android:textColor="@color/m2_p_speed_tv_color" android:textSize="@dimen/dp_56" android:textStyle="bold" + android:layout_marginTop="@dimen/dp_4" app:layout_constraintLeft_toLeftOf="@+id/img_drive_bg" android:layout_marginLeft="@dimen/dp_24" app:layout_constraintTop_toTopOf="@+id/img_drive_bg" @@ -43,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_8" - android:layout_marginBottom="8dp" + android:layout_marginBottom="@dimen/dp_12" android:textSize="@dimen/dp_18" android:text="@string/m2_p_speed_unit_txt" app:layout_constraintBottom_toBottomOf="@+id/speed_tv" @@ -51,10 +53,10 @@ + app:layout_constraintLeft_toLeftOf="parent" + android:layout_marginTop="@dimen/dp_16" + android:layout_marginLeft="@dimen/dp_26"/> + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml index 56f76fb6c8..3ba54be149 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml @@ -18,37 +18,37 @@ From ee8c8d653c546606ef512b93a325fb684e120369 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 17 Feb 2023 17:50:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[M2]=20=E9=85=8D=E7=BD=AE=E6=93=A6=E9=99=A4?= =?UTF-8?q?=E5=85=A8=E8=A7=88=E8=B7=AF=E7=BA=BFtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/m2/res/layout/p_m2_driving_info_fragment.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 762e8f0f32..e19840cb66 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -12,6 +12,7 @@ android:layout_height="match_parent" app:mapStyleExtraPath="@string/m2_over_map_style_extra_path" app:mapStylePath="@string/m2_over_map_style_path" + app:isClearArrived="true" app:carDrawable = "@drawable/m2_map_car_icon" app:startPointDrawable="@drawable/m2_map_start_icon" app:endPointDrawable="@drawable/m2_map_end_icon"/>