From 641060c64970b0200bc7eb285219f4fff51581ec Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 9 Mar 2023 13:53:24 +0800 Subject: [PATCH] =?UTF-8?q?[M2]=201=E3=80=81=E5=9B=BE=E7=89=87=E5=9C=A8?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E4=B8=8D=E5=A5=BD=E5=8A=A0=E8=BD=BD=E9=BB=91?= =?UTF-8?q?=E5=B1=8F=E9=97=AE=E9=A2=98=202=E3=80=81=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B7=B3=E8=BD=AC=E8=A7=86=E9=A2=91=E4=B8=80?= =?UTF-8?q?=E7=9E=AC=E9=BB=91=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/ui/widget/video/AdvanceImageView.kt | 8 +++++++- .../bus/passenger/ui/widget/video/AdvancePagerAdapter.kt | 5 ++++- .../och/bus/passenger/ui/widget/video/AdvanceVideoView.kt | 2 +- .../shuttle/java/com/mogo/och/bus/model/OrderModel.java | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) 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 ae1363f2b6..12d2a2b3ac 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 @@ -31,8 +31,14 @@ class AdvanceImageView @JvmOverloads constructor( @SuppressLint("CheckResult") fun setImagePath(path: String){ + imageView?.setImageResource(R.drawable.m2_p_video_holder) 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) + .error(R.drawable.m2_p_video_holder) + .fallback(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 78b5726da8..cf524e0a70 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 @@ -9,6 +9,7 @@ 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.mogo.eagle.core.utilcode.util.UiThreadHandler import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack /** @@ -149,7 +150,9 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter Logger.d(ImageAndVideoRotation.TAG, "onPrepared") if (viewList[mViewPager.currentItem] is AdvanceVideoView){ val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) - videoView.setCacheImageViewGone() + UiThreadHandler.postDelayed(Runnable { + videoView.setCacheImageViewGone() + },500) } } 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 719b87de4c..ca36528d22 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 @@ -199,7 +199,7 @@ class AdvanceVideoView @JvmOverloads constructor( // UiThreadHandler.postDelayed(Runnable { // startDownLoadVideo() // },DOWNLOAD_DELAY) - // todo 测试下网络断掉是否会走opause，且网络回复也不会继续下载 + // todo 测试下网络断掉是否会走onpause，且网络回复也不会继续下载 } override fun onProgress(url: String?, length: Int) { diff --git a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java index 0b5d593906..168aa2af26 100644 --- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java @@ -230,6 +230,7 @@ public class OrderModel { } CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext()); List list = obj.getScreenList(); + CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); if ( list!= null && list.size() > 1){ CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,