From 0b862f636379c029607152f2ef6f9aa1c4b9971a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 2 Mar 2023 14:48:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[M2]=201=E3=80=81=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=96=B9=E5=BC=8F=202=E3=80=81=E8=B5=B0?= =?UTF-8?q?=E9=A9=AC=E7=81=AF=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 27 ++++++++++--------- .../common/module/wigets/MarqueeTextView.java | 2 +- .../mogo/launcher/startup/ConfigStartUp.kt | 9 ++++++- 3 files changed, 23 insertions(+), 15 deletions(-) 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 index 0a55e1b913..2cb70cebd6 100644 --- 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 @@ -17,7 +17,8 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { init { hideWidget() - GSYVideoType.setShowType(com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL) + GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL) + GSYVideoType.setRenderType(GSYVideoType.GLSURFACE) } override fun hideAllWidget() { @@ -50,19 +51,19 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { } 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(mBottomContainer, INVISIBLE) + setViewShowState(mProgressBar, INVISIBLE) + setViewShowState(mCurrentTimeTextView, INVISIBLE) + setViewShowState(mTotalTimeTextView, INVISIBLE) + setViewShowState(mBottomProgressBar, INVISIBLE) + setViewShowState(mBackButton, INVISIBLE) + setViewShowState(mStartButton, INVISIBLE) - setViewShowState(mTopContainer, GONE) + setViewShowState(mTopContainer, INVISIBLE) - setViewShowState(mLoadingProgressBar, GONE) + setViewShowState(mLoadingProgressBar, INVISIBLE) setViewShowState( - mLockScreen, GONE + mLockScreen, INVISIBLE ) setIsTouchWiget(false) @@ -75,7 +76,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { } fun setCacheImageViewGone() { - setViewShowState(mThumbImageViewLayout, GONE) - setViewShowState(mThumbImageView, GONE) + setViewShowState(mThumbImageViewLayout, INVISIBLE) + setViewShowState(mThumbImageView, INVISIBLE) } } \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java index 884d504338..bc1d6a489b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java @@ -21,7 +21,7 @@ public class MarqueeTextView extends androidx.appcompat.widget.AppCompatTextView /** * 自定义 gap */ - private float mCustomGap = 0.3f; + private float mCustomGap = 0.5f; /** * 是否使用自定义 gap */ diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index d952367b9b..38a764668a 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -91,10 +91,17 @@ object ConfigStartUp { HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei } else if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)){ + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache } if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) || + AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode) + || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) || + AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { //是否显示 限速UI HmiBuildConfig.isShowLimitingVelocityView = false //白天模式 From 8ebc0268e0dae70381fcf175243c0c2cf29ceb1a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 2 Mar 2023 15:35:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[M2]=20=E5=A4=84=E7=90=86=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/widget/video/AdvancePagerAdapter.kt | 44 +++++++------------ .../ui/widget/video/AdvanceVideoView.kt | 17 ++----- 2 files changed, 20 insertions(+), 41 deletions(-) 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 d3e4753941..78b5726da8 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 @@ -5,7 +5,10 @@ import android.view.View import android.view.ViewGroup import androidx.viewpager.widget.PagerAdapter import androidx.viewpager.widget.ViewPager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.CountDownTimer import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack /** @@ -26,7 +29,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter private var current = 0 private val time = 5000 private var pause = false - private var thread: Thread? = null + private var countDownTimer: CountDownTimer? = null fun setData(list: MutableList) { if (list.isEmpty()) return @@ -174,34 +177,21 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter } private fun startTimer() { - if (null != thread && !thread?.isInterrupted!!) { - Logger.d(ImageAndVideoRotation.TAG, "thread.interrupt()") - thread?.interrupt() - thread = null + if (countDownTimer != null){ + countDownTimer?.cancel() + countDownTimer = null } - thread = Thread { - while (null != thread && !thread?.isInterrupted!!) { - try { - Logger.d(ImageAndVideoRotation.TAG, "sleep") - Thread.sleep(1000) - if (viewList[mViewPager.currentItem] is AdvanceImageView) { - Logger.d(ImageAndVideoRotation.TAG, "增加1s") - current += 1000 - }else{ - break - } - if (current >= time) { - Logger.d(ImageAndVideoRotation.TAG, "5s到，跳转") - goNextItemView() - current = 0 - break - } - } catch (e: InterruptedException) { - e.printStackTrace() - } + countDownTimer = object : CountDownTimer(5000,1000){ + override fun onTick(millisUntilFinished: Long) { + d(SceneConstant.M_BUS_P + "startTimer", "倒计时秒 = ${millisUntilFinished/1000}" ) } - } - thread?.start() + + override fun onFinish() { + d(ImageAndVideoRotation.TAG+ "startTimer", "5s到，跳转") + goNextItemView() + } + + }.start() } /** 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 d28037cc68..33c84d9efe 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 @@ -14,6 +14,7 @@ import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.BitmapHelper import com.mogo.eagle.core.utilcode.util.FileUtils +import com.mogo.eagle.core.utilcode.util.ThreadPoolService import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.bus.passenger.R import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder @@ -87,7 +88,7 @@ class AdvanceVideoView @JvmOverloads constructor( // BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*/ cacheImage?.setImageResource(R.drawable.m2_p_video_holder) setCacheImageViewVisible() - Thread { + ThreadPoolService.execute { var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath) Logger.d(ImageAndVideoRotation.TAG, "setVideoPath") ThreadUtils.runOnUiThread { @@ -103,19 +104,7 @@ class AdvanceVideoView @JvmOverloads constructor( .into(it) } } - }.start() -// Logger.d(ImageAndVideoRotation.TAG, "bitmap加载") -// cacheImage?.let { -// Glide.with(context).load(cacheImageUrl) -// .apply( -// RequestOptions().placeholder(R.drawable.m2_p_video_holder) -// .error(R.drawable.m2_p_video_holder) -// .fallback(R.drawable.m2_p_video_holder) -// .centerCrop() -// ) -// .into(it) -// } -// videoViewPlayer?.thumbImageView = cacheImage + } } fun clearLocalErrorVideo(){ From 3769f191c089ee538b8a9b407ff87778680a69ea Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 2 Mar 2023 21:37:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[M2]=20=E5=A4=84=E7=90=86=E8=BD=AE=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/PM2DrivingModel.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 33369c39d8..51a719c2e1 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 @@ -290,11 +290,10 @@ class PM2DrivingModel private constructor() { PM2ServiceManager.queryDriverSiteByCoordinate(it, object : OchCommonServiceCallback{ override fun onSuccess(data: PM2RoutesResponse?) { - if (data?.result === routesResult) { - return - } + if (data == null || data.result == null + ||data.result.equals(routesResult)) return - if (data?.result?.sites === null) { + if (data.result.sites == null) { d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate ===== 没有路线") routesResult = null mNextStationIndex = 0