From 059271cb8639e74e68f10fb5fc2f3b39c89990d3 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 13 Apr 2023 19:11:58 +0800 Subject: [PATCH] =?UTF-8?q?[m2]=20[3.0.0]=20[=E9=9A=90=E8=97=8F=E8=BD=AC?= =?UTF-8?q?=E5=90=91=E7=81=AF=E3=80=81=E6=B7=BB=E5=8A=A0=E4=BC=AA=E5=9C=86?= =?UTF-8?q?=E8=A7=92]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/widget/video/AdvanceVideoView.kt | 97 ++++++------------ .../drawable-nodpi/amap_custom_corner_m2.png | Bin 6272 -> 7056 bytes .../res/drawable-nodpi/m2_status_bar_logo.png | Bin 3771 -> 2951 bytes .../drawable-nodpi/m2_video_bottom_left.png | Bin 569 -> 924 bytes .../drawable-nodpi/m2_video_bottom_right.png | Bin 522 -> 920 bytes .../res/drawable-nodpi/m2_video_top_left.png | Bin 587 -> 925 bytes .../res/drawable-nodpi/m2_video_top_right.png | Bin 549 -> 894 bytes .../drawable/bg_driving_arrived_notice.xml | 2 +- .../res/layout/p_m2_driving_info_fragment.xml | 23 +++-- .../src/m2/res/layout/p_m2_fragment.xml | 39 +++++++ .../m2/res/layout/p_m2_view_status_bar.xml | 8 +- .../src/m2/res/values/colors.xml | 4 +- 12 files changed, 90 insertions(+), 83 deletions(-) diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt index 932ad16fe8..8999c7ab14 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt @@ -30,10 +30,6 @@ class AdvanceVideoView @JvmOverloads constructor( private var videoRelativeLayout: RelativeLayout? = null private var cacheImage: ImageView? = null - private var connerTopLeft: ImageView? = null - private var connerTopRight: ImageView? = null - private var connerBottomLeft: ImageView? = null - private var connerBottomRight: ImageView? = null private var videoViewPlayer: AdvanceGSYVideoPlayer? = null private var gsyVideoOptionBuilder: GSYVideoOptionBuilder? = null @@ -44,7 +40,7 @@ class AdvanceVideoView @JvmOverloads constructor( private var mVideoDirPath: String? = "" init { - mVideoDirPath = context.filesDir.absolutePath+ File.separator + "video" + File.separator + mVideoDirPath = context.filesDir.absolutePath + File.separator + "video" + File.separator // mVideoDirPath = Config.downLoadPath initView() } @@ -63,7 +59,7 @@ class AdvanceVideoView @JvmOverloads constructor( private fun initVideoView() { videoRelativeLayout = RelativeLayout(context) val outLayout = LayoutParams(-1, -1) - addView(videoRelativeLayout,outLayout) + addView(videoRelativeLayout, outLayout) if (videoViewPlayer === null) { //视频播放控件 @@ -78,49 +74,15 @@ class AdvanceVideoView @JvmOverloads constructor( layoutParams.addRule(ALIGN_PARENT_BOTTOM) videoRelativeLayout?.addView(videoViewPlayer, layoutParams) - - val imageSize = AutoSizeUtils.dp2px(context, 25f) - if(connerTopLeft==null){ - connerTopLeft = ImageView(context) - connerTopLeft?.setImageResource(R.drawable.m2_video_top_left) - } - val layoutParentTopLeft = LayoutParams(imageSize, imageSize) - layoutParentTopLeft.addRule(ALIGN_PARENT_TOP) - layoutParentTopLeft.addRule(ALIGN_PARENT_LEFT) - videoRelativeLayout?.addView(connerTopLeft, layoutParentTopLeft) - if(connerTopRight==null){ - connerTopRight = ImageView(context) - connerTopRight?.setImageResource(R.drawable.m2_video_top_right) - } - val layoutParentTopRight = LayoutParams(imageSize, imageSize) - layoutParentTopRight.addRule(ALIGN_PARENT_TOP) - layoutParentTopRight.addRule(ALIGN_PARENT_RIGHT) - videoRelativeLayout?.addView(connerTopRight, layoutParentTopRight) - if(connerBottomLeft==null){ - connerBottomLeft = ImageView(context) - connerBottomLeft?.setImageResource(R.drawable.m2_video_bottom_left) - } - val layoutParentBottomLeft = LayoutParams(imageSize, imageSize) - layoutParentBottomLeft.addRule(ALIGN_PARENT_BOTTOM) - layoutParentBottomLeft.addRule(ALIGN_PARENT_LEFT) - videoRelativeLayout?.addView(connerBottomLeft, layoutParentBottomLeft) - if(connerBottomRight==null){ - connerBottomRight = ImageView(context) - connerBottomRight?.setImageResource(R.drawable.m2_video_bottom_right) - } - val layoutParentBottomRight = LayoutParams(imageSize, imageSize) - layoutParentBottomRight.addRule(ALIGN_PARENT_RIGHT) - layoutParentBottomRight.addRule(ALIGN_PARENT_BOTTOM) - videoRelativeLayout?.addView(connerBottomRight, layoutParentBottomRight) } - fun setVideoPath(path: String,cacheImageUrl: String) { + fun setVideoPath(path: String, cacheImageUrl: String) { // https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v // https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4 this.fileNetPath = path this.cacheImageUrl = cacheImageUrl val pathList = path.split("/") - if (pathList.isNotEmpty()){ + if (pathList.isNotEmpty()) { this.downloadVideoName = pathList[pathList.size - 1] } } @@ -129,7 +91,7 @@ class AdvanceVideoView @JvmOverloads constructor( // BitmapHelper.getVideoThumbnail(path) /*获取第一帧图* // OCHThreadPoolManager.getsInstance().execute { // var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath) - Logger.d(ImageAndVideoRotation.TAG, "setVideoPath") + Logger.d(ImageAndVideoRotation.TAG, "setVideoPath") // ThreadUtils.runOnUiThread { // Logger.d(ImageAndVideoRotation.TAG, "bitmap加载") cacheImage?.setImageResource(R.drawable.m2_p_video_holder) @@ -150,9 +112,10 @@ class AdvanceVideoView @JvmOverloads constructor( // } } - fun clearLocalErrorVideo(){ + fun clearLocalErrorVideo() { if (downloadVideoName.isNotEmpty() - && FileUtils.isFileExists(mVideoDirPath + downloadVideoName)){ + && FileUtils.isFileExists(mVideoDirPath + downloadVideoName) + ) { FileUtils.delete(mVideoDirPath + downloadVideoName) } } @@ -178,28 +141,30 @@ class AdvanceVideoView @JvmOverloads constructor( Logger.d(ImageAndVideoRotation.TAG, "setVideo") mOnCompletionListener = onCompletionListener //判断是否已经下载 - if (downloadVideoName.isNotEmpty()){ - Logger.d(ImageAndVideoRotation.TAG, + if (downloadVideoName.isNotEmpty()) { + Logger.d( + ImageAndVideoRotation.TAG, "video local url = $mVideoDirPath$downloadVideoName" ) - if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){ + if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) { Logger.d(ImageAndVideoRotation.TAG, "have cache startPlay") - startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString()) + startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString()) return } startDownLoadVideo() } } - private fun startDownLoadVideo(){ + private fun startDownLoadVideo() { //下载视频， 下载成功后再播放 Logger.d(ImageAndVideoRotation.TAG, "startDownLoadVideo") FileUtils.createFileDir(mVideoDirPath) - DownloadUtils.downLoad(context,fileNetPath,mVideoDirPath - ,downloadVideoName,5,downListener) + DownloadUtils.downLoad( + context, fileNetPath, mVideoDirPath, downloadVideoName, 5, downListener + ) } - fun startPlay(localVideoPath: String?){ + fun startPlay(localVideoPath: String?) { if (localVideoPath === "") return try { Logger.d(ImageAndVideoRotation.TAG, "startPlay") @@ -215,12 +180,12 @@ class AdvanceVideoView @JvmOverloads constructor( videoViewPlayer?.isFocusableInTouchMode = false videoViewPlayer?.setVideoAllCallBack(mOnCompletionListener) videoViewPlayer?.startPlayLogic() - }catch (e: Exception){ + } catch (e: Exception) { Logger.d(ImageAndVideoRotation.TAG, "startPlay e = ${e.message}") } } - fun onVideoReset(){ + fun onVideoReset() { videoViewPlayer?.onVideoReset() mOnCompletionListener = null } @@ -237,7 +202,7 @@ class AdvanceVideoView @JvmOverloads constructor( } } - private val downListener = object : IDownload{ + private val downListener = object : IDownload { override fun onStart(url: String?) { setCacheImageViewVisible() Logger.d(ImageAndVideoRotation.TAG, "download-onStart") @@ -257,21 +222,23 @@ class AdvanceVideoView @JvmOverloads constructor( override fun onFinished(url: String?, threadBean: ThreadBean?) { Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url") - if (url.equals(fileNetPath)){ //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题 + if (url.equals(fileNetPath)) { //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题 //下载完成 ThreadUtils.runOnUiThread { - startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString()) + startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString()) } - }else{//如果当前文件不存在再次去下载当前的 - Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = not current" + - ",currentUrl = $fileNetPath ") - if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){ + } else {//如果当前文件不存在再次去下载当前的 + Logger.d( + ImageAndVideoRotation.TAG, "download-onFinished = not current" + + ",currentUrl = $fileNetPath " + ) + if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) { Logger.d(ImageAndVideoRotation.TAG, "have download startPlay") ThreadUtils.runOnUiThread { - startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString()) + startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString()) } return - }else{ + } else { startDownLoadVideo() } } @@ -281,7 +248,7 @@ class AdvanceVideoView @JvmOverloads constructor( Logger.d(ImageAndVideoRotation.TAG, "download-onError-$errorMsg") //出错再次下载 if (errorMsg != null) { - if (errorMsg.startsWith("initFailed")){ + if (errorMsg.startsWith("initFailed")) { startDownLoadVideo() } } diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png index fd161d3dd6243393d6c81c11380bf6a087f2ae90..6f0795edaf551463ca9516cf3cb9f68aecec5dba 100644 GIT binary patch literal 7056 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 literal 6272 zcmV-`7=P!9P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91J)i>s1ONa40RR91JOBUy01SB|9{>Os>PbXFRA>dwn@f)!$92c6`gtES z91baxqD9o8(`+`TE^SAjx}i(5A?tkF4dXC2E=ku#I<8O0(}x$*3%76njjw-0 zO>_Q}toTc>jQKl7bxk0yCVg^#@M)iTSEY$-l5y z7DJI|b>n8f_oZ{~rpS}qn`QB{yMOIhpJY2f5zxo4j7KxyetvYr<x~y6W!IGrYwq@h|f$RGNpQo#8)xCM|A7^iS@5fN) z{cor0M|`z*PO?+ z4DE?RSV`SY^&9uFcNn^{U-ijh-}T46b8p=F?(B_^+V)uP*8+XyYENusNwb&#gxZLG_ykMDY4u_l4R1wrbM# zwz!nERkvKse(+JdxnBv|`rG%mUmjd?yv&pL7De6~uwLwn<#{Q`h5CY839xFGfR@3_ zP9P8GRF7N=1pwg}iLYOJH zQm&!jyH?gZoB5c%x-XWegaC~Bx=tQpUH2bKzU>d1J~@}%FaPD88-5#~ebV`t zg8tN>S1-1G`uxFscz2!@y)i8Nox3x2UY4b)anixIbGaC$;b|t7-a)Qhk<11ey=bD8 zl3h`Gk}BoR&J?C(;BY)ViAE>F3XiK z#Az`f`(``6cW#7N%AZLJr>#1s$pD&7m2errSFYXS%v6I^9Cha!M;E)f2)yc&OTBAO z-}~F;4=MAc^hD4X{$e~=boCz>F1cMS#x2%b3N7}FI@8@?yXK&D4^^h}Wmb*FQb1u- z>}4Io3Dh1-T`05BvDiDuy!v!&KmZTJT_*e0qXu5Td#OHUSKB&?>fQ-FcD`d=4sJWR z^mJQ4qxQY|?zd@UkyvCvH?bg z)zEV3G?dtmrG^!N<;eTZsKLf?q#!1q+r7M4Zai>jn9I$oa7W?G@<5Kov+k{|7^|$(ecjL1^7{~FSACK1` zVfxBnjmyE0FU);%m-rbkZE-TSOQJi#>SIx90K-I~u~J6kl#ay|405=0YOIc@1lVV8 z$h-B(xscko(=~ZqpGOEPw@~@`JQ`7|z5}Z}IK%X`8gZ1oKQc}rGn1de-$=XE4vkd( zxN*HtE`6*1Jnh;~kAO~3H!u3EJWaE)vqJR4iks<&@zR!OfKllH*lbsgimHqn!yrIm z6i|RH#rk2slpvk##|`nCGe;0g5C+e397$u2RNq{{vwR#8tO;3w0dA@;(}D~#GMdcnx~fIBBUaQ!iJD65;hM#Rf4mE zjfET+>I_@33y4#FmDb|^)&LN2r@Xr z;1pAV4>qn!;+3Z`uYq6baa$*>==CyySUznO}ryXd2vH2{s7mBIXAIqq) zE2Y_@90@!CjATRZnGM4*j7D|dxV1aKV-`>cJD|tq;V_pP9!r>9w*t!bTxWzJ2POfX z8uL*@Pcw zZ=DagCy#DtGTo6oO`YGIo`{JfXF}5bO6Bzap{dr1RNjQTdALd1)O^2ni&84{=<7~i zoVZ39f^Ac;R8`i1ZEw3yYSccf%v;nz{Crj5u|}HPV^}JqofEGU$I`d8_CJ zCxhy3EZC3+nC$|1rhEWLMlXw54jdA89?$XmK;ZS z)$eOAiE^}QHZcx4ux)*}p0`n;u$P)}lxMjVRop;#eSa}ev#mL>X)wWfm!04bB2S;Kru**FFaz5dLj_F-?V60}8x04nX2!S|=u} za8e-#3s}`=BekBK7b=KaSF%l>SsciABZK`Nbt7jWuPC2meZdW!)mMy-z#xQkx<>V> z!=Be~SjV%Ihj1728!?hIM`{{qdMHgSty?8bo-GufmSLg;4OS;mr~URk^(4AJ@S}#{ zLW?R`cO`L|L!g9``ABTquIFwe2NB$fiqDqTAR;215RIh4vGGpA1r#8g{+;oru2t1= zNe9=|`I7Fnmjd%q-N`>of$sP&9OqfkA{CeRp@}x|5pZT-_S+BHqoy6a%dOc-(Iy9J z>T0|keVa^HbM%keGl4)HCK`0J>kv1~yBfRIX64VRm9R`>A3ks%h5-yH^6Ku|czL6| zM(lphjn|)ZeFP8d@85}bdynF#<~TN-8f+85;6Lo9#E$SS(VofW#F>|UyGDD{0@vXe zIJ2blzVyjx69lH(^vNoOLx?Hu84IgNu#wZ&MoPrUxf+0KM_a}YVVSb$&WH2Uy6&z? zpKiWsfM0q^LU_pyFG;w%W#F%=9$0_zi>^mV^TP|~>8XeGQ2(NFx5Vg{EAtXqQ*i@7 zlU<7vG0hZ{1u9lfQ^^9v6m_Ox^!LB&@+8xegw_m(v-xI~lscG0Pz5mC+u(kB!Q5!J z(a~~gwQAjFWo(DOR{gRX-d+f{iduI!)g@hjZg4`XgitsPG~i(#;MqIQBP0@1|Sh2=ZWU6h>?5xm2M!0XQ4o`5RL)cuAoUehrNgDZz^J3SmV zg>KJoxUif>Y!2Y)%m|X~{+@ap)3|T27%cuU4jqTK{-PYYk}kDGD5N+tC{~%sH2355 zPn_l{H14&0H9&sWE>XZ}&-sIUc0ZqN6c#CToj+%3d|B7m&wjhNbsg;b(vIn~+mm4R z%AnriY;8jMM7gm(IWlHX0|?y{EKAc^D@l6SkAvo$>8@hhV>(m>-$9XrS_LOo$iBiO zt33t8o-bHFtN{e3vE|oaw+Ik{BsXr@b$DJ{VA`M?PlpP3Oh-Wy<#8(pE(At9M}|#L z+DI7)wz1))wZ^vcM~$!Z^2fa#nLsNb58V}yNI;qcdxUAr1^C>g9M$_QN;))G6IGEJ zkFC}%SDDkgp7Wm*=$khUBwC)lCQWV0O@(N9BKO(poMpCC)$f))!kjva#0urn*>De!GX~!!CmRhhZI3p{{lQ zz9#VG2@`_<2Ldx_&Y6X_zFsA{0N&mPaAuRTYZ7dWh(yX{wtZQQ!@7K;zx~>q2AKQz z?gc?nPmUi@BC_Kg1E1i%F{?1i81zp+Kx_xzTh~#gIqT54)pvd8e)4_SCQY87_Pr}v z8?LvF%`7sf%rq;rj_o*0)|!KE)|!$Hj$5^mf@RT&@H_mC>c}r+`+i`X-w`;>av+5A zbI*D5ZwaWeeCN*2o)KWHW4m!$vkwB+h|2tsz2Ca3*jXFdMwBrft<}u7QD4~RSypbC zFB9SJR1;TB?WtKhIPFU+dT>N)^(!LNB?;KE3&Dfm7uz(Fp&}}7h4g17;DF))U?~<+ zd9G3E*TpbSk8<19r6jV<^Ek*yS$6KO4KbZZwT5Su?E%F zGdA}f_}XbH{3-Srw3}%hGXM79JKMQnmA6g)i_YZ-Q9vdhk!*b(x<0Xua`z7<4A~Kl z%+rNO&9U)D4G(Ir87rkN%uN7rND+LV-4D-BKw+1Ax3?#uEfZj#4}h62a*mz?0iS4S zi>5_0+l{5g^48Y5>fKV0HY{oPf@1HsJMhVHCryPyqjUf*!ZZ;y2ZA;dGx=IN0! zj5EYr^ZX#cz;F_QhIcT?K&4si3oM^4?}i~I?J)BMi4L?ELi;|a=d@&vMFOh#=k-t= znu@DWV^Ithj|F3&jhDo>VcVRCd`T--aB8rDW23P=2UEEK03IM)0Yd;$2%O*FV>Wb6 zhrZVg4_ZTLPZxz96MQ4a^k_6^&zL7#=%>gd!lW?Gno*!YaihVo;4 zzxW?_q5kwRCJ$6tYsrChyx={p3EQH(*w)&i4Hj%Ixvg|P%Aw5%%~Bd08x1*S7hdDu zBupcPKtk5yHAg;TR7^Nj5(1%RuMygPb$1AecAzN?EppAax3tc*Xd}Tctc!wS%JF`j zD@(Y<6Y2)pv0xF)R(thq>9!Jab#gqo{!Q=0@R(;6XWC;lNAtfV79xN#kY5 zT9&mgsuJMJOf5Lq5P_{LZP!Da1eo?RcWOIwnv8CdzcF_80XuhW z+DLh*`PeB!Q>7N^D384%7NxOsfafOQwd@;JFPNU4?EHaPM@0!&IbhO4SCzvIVje=$ z3R<$WUp)`ICn`t1sC1Vp5ZQ!4g!j@8{0;rGO&Uz0nDxzVk!+jcDecSr>5Z?dgWXGe zwh?lld8PinejKkI%>8>>6Ae>HnqcFutz1si!gzG%q|WK+0jhZ_Ru^G|r5-1TGuPP! zpl6wBfjtW>_RdWAG1-URDx0yBYsDK*w%jei|=NyMXyc$q(_)0ZiLB51*e4#?{B}LJGF2Vz#@d5M#E5~ zr>EL}k$w2~izkBSWpSg8b_f1kBc~QAGPliKGQfGsZljGB_1K0%qnJ4bCaKW&2?M6< zxJ!XMOgo{rVcwcPKdg<_>od)>-a+}q20Q~;owQJ`-elTYxZ7wW&lR^;g^f0&HrfZ<{Ugw9#rC+(5eY`DIv29nszSeHR;%J!< zw*@u;H^%9Y<(kEERCk_<;Bj(+@4zHG7fb_~wcHI55Ra1m7ElE~l-_}r5J@;JvtRiW z`gbDZxRr{HvX5?_yQ9r>&rZWHd;9}`KH$h6FY)!Oi+@+ZwmPlHXEvv8j#}GfgZgm! z>9B*(JgB-cbsaE5BXKr#DX3)#VQ1>PDv$TIaF&pkYaN=<&=JPN`qaUmVY3|0iUAKB zX;A5EQwPA#GCn&e+r< zA&7X}>df{B>o520eP8u0l!ZMF4xW^P3QxmB6(AC%oQ0M;+n!Lp(1IL+*0!m1y-6-7 zUDtl18)A8BOpk7TcAFWF${bvwT}aK@W_BTE+XezSQ+EAI9+lVZEG%Hy!AzWeQMa*vI<&gTrbnwRu((Y5{08BqDK z!%%8(fr6e;Lrn+*Zvi}KJdyre+WT#cN_aLV)bqBld-@5x&ERKstTahn&ne|w)Z zSVN~j;lq`!K3qv2`EbR+Gwr0r%!Pfp0$oTTCN3!xg@di4zRG8{g~bQ^a0T$AUo`D- ztl+dyn(~eRmk(EByW{zhPn2Zkd6BI0Y~1qY4rSP}1UTbZU=W1OvkUX?T0jk?$}4*F za`c4lTB6rSY}(LQt*YORPn06)cs~0WEz`$ny*@@0Gx|=8^>6L_Xwxk3e6LPPAEVhb zxk59Ita^={leWw4W3){_(~NYfPH$8A-{FtZBIy0|tJ+QcowxMa;bQvi(Cecz?RnCE qs~H(C!~X?04s+)Y@)h#{0000(zB@CSgn$TEQ)RM|OctZa zqO?$#aI_==qhcEs6-wROs;%{CTj2;vT#DAZLHh@2tyV>agJ1$=lB2R5S$fc-F_?uR z3kgJ)pkRVzX5PE~-8XsTo5^G$fA;hrxaUmnz2Ek}`@7%$?h>W}O4gs{Io*DmNRkpH z(P+u!5R#4wqDDsyeO9-CI|eXuh8+a~jzTj?V@u^sUD84+=|_FZC^|E3MD>^E687{b zcZL^^Kri4^pOgu@pWZ}-UmY$wK#yrPR={t(3;6H=l4saJAPo4_$K)kaf2VRpdE$`J zVcP2?n%+>tjYHBujg*k8gC*?=nF!FUh77tgBPq>Cv?;Abp4Vgc|61kb6venQt{sDV z_)tGQc2d#E9|+Pg*7&9qsgQfIi_=KN3w|<^85&x|*4> zABUIJ>>0^^O@Amho*(z_f2tT%T1v^C7pomOut>Mr%J$b*?66wQ%`LI-ZQp*ElyV;Y zpA4QcCiu{V=E`9d^Vf!k@*`HA$hPvy7tsC$omsH+L&ZniFNwDZk}tJ3RJ{|aW9>tS zlQIi#mL%`N?+OHp>wD(};E`kR#zf7ym3pMmxXexrcq zc+@HQfT15LtNJ!Uw>K8^n~}UR8F_O^%71~r&t{_=_tjM?n|+qCIfY5xKHnNFr-_1T zF+f;g3a4b{rv!BQ9tJ+nq(#M+31Kyp4#1yxI>?1n z%Xs|m#P7zI5*}-}Q!;pOg~?kwnxw}p-Du4uU89dM5p$z470s2Ep9|1GR-i}9sB{p} z^^Z)@nRo?bve{-IhY2lIlZ3G7LXeDvOqnaApdivlVn+VGf8Z@QKxaOJ@yutNm=+^M z7W8Lf#jZ7Uq`X=?8F)W3eW;Xng1SF6L5KbZA@~jl*(V5_El-eG2p>A&L#(dLS1`$U znLcnzsk|P!J@^5WiW)|alc4LG7x88bxmOdbr4Yx?cg^Kx6#xK}8yE3TE6oz|Au<44 zl79Zwhc<00e+ihxF`0S4$I5udYS$X^E_a>>1I`2B$KmYkXc6to$xD}hxe7MM1H`X{ z)1GEVZL)i2c7XlW%042pY8X3jig&tCF@1DpOkakey$4wN z0rK7Z8a%I=JhM){=(+@-uN$XCsZy_xY>tcCYS-;Se+r}PO`%ZD5M!D*5a>$2shG>L z3*8sewKU*VuB98+1YlkvXqh5n;(zDezwQ0>2?gi6rWD0tK(CW7pYH*^90S{8RZh;D zK2?FPXe{J|(Lh(cw%wIpc5o4-P9U;JA!;8~bX5WzC=PJZ4H$O z46ZiyRIO_YOi-CWgN;{IyRTw^&$QIwGZ}hnf3wDPUu)0=&o@^=UpDsERJAtMd+M!x z-^s42uweu3P{N4hC#<~4c3s_?4g^`LqGN0~U;?nni7to~#L{~?k~UzU>7_6krX%p` z^)OnLPHThbZ3oe1SOH%k0?&a+5&->@ZG25zedW_=V@|>gChZbMLDX*z=S1%bA%b#J ze`ci@6gc(62ggD=UP;Fe;n*Hf#|rhhuM3Wl%m0XJ=!lJZUJzAMV20gy>78i8WHt ztIZ4PQ>t)}p$ZxS`f)>Q5PxK4W-4j!I819XVjvsq>0(T64ct^ty*LOHR9*dge;4F> za%TS;*n$qLG2_UU)4ya7SM&GCv7R{klB3?k+Yb?rU8;Os)8#_dVstEjI%TIDDdBz# z$!JQ_j-jzd>hkLz-k^Nw6!1Y0YIG-c`UTcodeh{r_nIfTpQUx~uVp~C;&)7zryY>x z>7nCK&qsPyvMg<%d4aaMa3?MO{8M=T`FuMAG$_5L9X7ZWQCpT zRE=?7nlk=|&QI2yJ;HzD#0$~%O`5WgfSj-T zn5Y%1R-5a8R3lo!M8uQ7fBTu}JiKN2v=?DW+32HiSs#q=MOJ$PBJdx|2-5C?F&X*u z)%!@KQCDVOzD_vDlf)H(y|L-M%#?9Bor@8DU%|j|srlZ+g>0h9Gi&u6k(e?4Io#@h zWzd)&ZvJ$wkz&-*Qb_T%L6`IkB^Nv`ncBe`m!`=S@T~_5f176!G63%%3KzFCJZP`HNgZ>Tg< zfXVBthVx6|-~C}1D4h4HUNuI86N;#2T~Ed?_!HAVZ17*R-El>0?fM$) zHxje*^AL$;un_|be;UTQ68q8)gwjy}lMVg3m{_$3s1K}!zv?_5D(WWt(wp1Xf>5Z4 zYI0Gn7tFh`@#3LSpNup&3lnbxuUiT+V}E^xaoB)QAg^=ZD0O|cYWG*5+yv_mI2v@O zA7Qrh6rSM?d(cwiW88T&)fX|4RT#)k{g?=`0DLLFxrj;pf3a$|7uzj}E5wkh+ z#V(q>q9t8Ce{+;Psa-!z#H_a79!>e=to$jOuFpfXUXJU10tSVX2UoM?m3Q9u<9Ad} zH)W&M#_MN$`#ePdEXkY+eJ2oZ1kPI>!v6QB+6^ty^sF@X1fj8}R>+m0Uw|p3uF*9vqB~(@mxq@FoCqL%IvMyN8iCi;%Z^z2_)70KNy$gDY`&e-Rt$VN>@^Jum`& z0&l7!H0qhwUzkJEpM|Jarn+a07*qo IM6N<$g1gt7Z~y=R delta 3736 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 diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png index 7b76bef075c6b270d5dfd8a69a61feac9c73cfa5..19ae887a57e7b869f670e67a6bbddc21830a74b8 100644 GIT binary patch delta 863 zcmV-l1EBnh1egaQiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCp;e;%L% z00aO40096103HAU007ECHw6Fy0|H4zK~zW$y;ePIltB>Q+4s%esTcDBf{?=?SOkKF zh1cW%W zoRTanu$&)_OpR}p zvjXGh!eued*81eUjn2OAeBf({F_KHZ6LPHBg-SR}A96OvOJ800d~B(lju7bKo|YeH z1FnL5Y{{i)7H1K$2`Xun4VbI2t!@TQDH`gS)IPXDmKd+U;qJxIts=QJw$kFhw7z({ zq?0U+tFy4rmEBhwP=IP^e-+>Pg7zYL^~Ox9wcYS>_#-@<7{hT&FcROw^ZY|UKU2nQ zufzV?x9}8h1(Y3OqiTI}%{Cn!KBB=)fY;yh#`*W~{^x19V@x%7ErTOl9r47CHtk@| zKLI~@$G0xV?tU1CC)F8k^}mEw4otX})Ty|WK^G4^9Rq7}ttEHRe|t$i1zveI($(e) z%&Tg>Tid&wco>j5w5P|F0H}t!6L!TKumFIPB8wJfuI>7Cuh_JnFveMf5zRqarB6_q zO=B>o;9@WYGlMy-OB+dRfp(d`Z@H@7DK>gr)Sm$3KE+4VY}Sn7BC#L0ZcL#Bur#MC zQ2mR3(WGjjQ*8HMf0&CWz+fC*h(WNkQlsi9#uRjlby|CsesjU~Z{8KAe}KZ4x>`R~ z5nP(cK5jtzN?u!o!Wz?oi6o~yaJV42z2Xl1a%~)uq1nRW=~Y%fuRcn8-;H zBlsh>CSgXNvU9{YZu_IfW!m{1vlla$l~UhDNk1`}T8Sy~HL)@@FoP-^#6{DMe9I3S p*WHO^?OtQi?;bv0dz@3K~zW$wN*<>1The;fOim?S-9{NqB!7f1Q&v! z<2VE3cf5ip5!|>CMDRk=oqATKQ*DQ78HDQEBX}iHjr9UEy?ICUNhk~-DtUrwy7l*V#_XPq4G4Fv~1@&$@E2nl{3zdUE7vVIor;4E*-@%qAu&h8Zv|JAKyCKL0|_fBNV)VC51~ znouRkJR$6gtKQD6y@tdj|D-=fJa{JkTHGkcxMUTAJOM;WGNV=wNs}rICCgyusTqY; z``e8ELf$i{yWixA)LOC5MTW+^$eBw*Moco9CCSiXp6i}6DtokkMKO*an{gGQ$f-G_ zV5wN>UCZkOY#)W-AB*@mf4ECupI-1ksrN5~k#U0!>Fa{^qMo;odxCZC%ffwEail7p6e^6PFT3DE2#Ga4- z_QZ^Gt16CheRxIEu-s}X;aJw+UJqaLw~})uHC`FG%j&gZMsSDRJ}gPr#)8Kn*3K}w zI{6AA5bxT;CD-tn?`difY!vvh@kQt3snhOrNwPLp6>Ds*O_3kNjDQW}=ff~=3zuB8 zxLCcZC8pZeeMy=we-=WW3JYY}^BnH3c)1fJ))HoJX+(;+#l0NU43g%U#l+W#*O}ye z?Si+k&&U_sPC^Yx))-Iz*Z|bYzPjq?VaHO-?fC uzV%cVWlUgA%e1?M+%|pNa{fO^iTN8QRCK}{1*w?;0000i<^l6 delta 527 zcmV+q0`UEv2g?K@iBL{Q4GJ0x0000DNk~Le0000P0000P2nGNE0L1BqW04_9e;J?y z00aO40096102u%P003C?mtFt>0kug)K~zW$wN=eZ12GWJ%m(@f1z$w)CMXErdHNY6=A43l{Ptr%o19Nu46%!}lLs8>>o^e!Zi)a RM(6+l002ovPDHLkV1i1I<3j)d diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png index 7e245de50c80850da29dc21db5aeca7673eb398c..dbc80b225453853011366a6015092ff391691f4c 100644 GIT binary patch delta 837 zcmV-L1G@aB1pWpgiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCp;e;%L% z00aO40096103HAU007ECHw6Fy0_aIZK~zW$wO7k(R6!7}>KQR0vkACW!A&+HC@SJ$ zg1A#rF$m(X_!a(xi1D#-6Cpbjq9mZ3D7X_L`z&G*GIMWvPSx$}I1U6(YdO>%_Mt@Uv>0M<3z#cl)^b*6xjYCW!{52GB4-D2LH-NHPeW za|ff}xTYEV`+DhCLt6p({3v*$0cVu~Vcd;2Efxi12g>ZDr6WgLKeTQ&kj?%V>t*m9 z$5}s8dv(=LYDeaQd%HHfe}hG*aUWY-is&=HpJ6WR2-@}cH_{S&+sQHI|LV(Y)|W$h zYF3}31%_4_h6DJ?GB3+<)rIw&x-%8v?Cz!4_5!fW#3EoW1aS=&*nir-o93qqOrVRe z>?Oi*IfMSuBFW62)!x*B33UE>^$iq#+dci_yyKiXYLZgtQKC5Qf0732K4J|=&Z`F~ zUOVOj=poyKB8*Ao+>`1nBK{21uSXZoHv-M|y&{YWTo2NUC!Z!8Mg~M!Q?K+yIbf4F zk$k|j$#4NmU5*t4-kXzcF(gLM^E_KJZO(X5Ycb&6EBeE8JKumNwHn$icX=MA3iCKK z2ZD@Ai`m0dDX&;je_*nUZz{(JKj>atSzw+k-wF^!VI9EK3NsEk0gp*UK~zW$wUxn21ThSTTk#nLQG5vx3L-4x#YgcX zc#&OKSJz$j9ef4vg5XIIPd>^U3|$bW%`zmNX7VL%!rJ369uxE26c8&h zSsrL}^vPFbc;;8}ZP;uq;o1`2e}neIVp$0Z4XJGp!Fuo^AmUlmXPHL~1J@{4oLK@w zL*NBVz15BoI32$8wIRNP4Ox+xPcZBU06-~;Npv?4-gv@HQ@oE(nrWT22DOqm%MaR1 zH}yKpRwcpHnEhA2F+{iBZ}g0{6g{d{P)#5SQP_X=;Dxt;96w3Wlhij^e;^3FCm{Nz z@1hU{-+gvCq0nLt+Iqw8ZPFr+Mu=5kYE}q4BNGrnpy&u>g}6m`UP38ZAzY>U$eOGW zs^s2F9~b#b!U$>?;Q;ei67QsaH+dnIq+PeIucSl^6Cer6Ur7U^MXfd7^)|`bAv$dN z$Z*O!)!4mYJ0mxg{(3|ZKU_Zm*&ztNb>T)bFc12FQv?Fg=DE9+TJABO#ULJZ=Eg)c fhh0=QPTk}Wc&^3d - + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 2dbbcac38a..ae19ca5741 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -45,7 +45,7 @@ - + + + + + + + + + diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml index a40c28419a..10af0a7b63 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml @@ -85,6 +85,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml index 20461e6c5a..dc4f1090d5 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml @@ -16,7 +16,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" android:layout_gravity="center" - android:layout_marginStart="@dimen/dp_50" /> + android:layout_marginStart="@dimen/dp_40" /> @@ -64,8 +64,8 @@ app:layout_constraintEnd_toEndOf="parent" android:src="@drawable/m2_status_bar_logo" android:scaleType="fitXY" - android:layout_width="@dimen/dp_96" - android:layout_height="@dimen/dp_28"/> + android:layout_width="@dimen/dp_94" + android:layout_height="@dimen/dp_25"/> diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml index ec59b620fe..40e7769b2b 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml @@ -31,8 +31,8 @@ #6617417B #17417B #2D3E5F - #1F860D - #B9E7C0 + #34A61F + #AEEDB8 #43CEFE #1466FB #7094AD