From 208dcf2699eef73b03b70e81a478e3a4eacf1fc5 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 16 Feb 2023 00:38:56 +0800 Subject: [PATCH] =?UTF-8?q?[1.0.0]=20[m1]=20[=E8=A7=86=E9=A2=91=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=9B=BE=E7=89=87=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/BusPassengerFunctionSoftFragment.kt | 7 +++-- .../bus/passenger/view/ConsultVideoPlayer.kt | 27 +++++++++++------- .../passenger/view/HorizontalDecoration.java | 7 ++++- .../drawable-nodpi/bg_taxi_p_video_index.png | Bin 5600 -> 1454 bytes .../bg_taxi_p_video_thumb_big.png | Bin 0 -> 1974 bytes .../bg_taxi_p_video_thumb_small.png | Bin 0 -> 1454 bytes .../drawable-nodpi/notice_video_start_big.png | Bin 0 -> 814 bytes .../notice_video_start_small.png | Bin 0 -> 595 bytes .../drawable-nodpi/taxi_p_change_normal.png | Bin 1081 -> 1015 bytes ...us_p_function_video_player_change_full.xml | 7 +++++ ..._p_function_video_player_change_normal.xml | 7 +++++ .../bus_p_function_video_player_pause_big.xml | 7 +++++ ...us_p_function_video_player_pause_small.xml | 7 +++++ .../bus_p_function_video_player_start_big.xml | 7 +++++ ...us_p_function_video_player_start_small.xml | 7 +++++ .../bus_p_function_video_player_thumb_big.xml | 7 +++++ ...us_p_function_video_player_thumb_samll.xml | 7 +++++ 17 files changed, 84 insertions(+), 13 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt index 4cd44d6cdf..dcd51a20d0 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt @@ -197,7 +197,8 @@ class BusPassengerFunctionSoftFragment : } } if(HorizontalDecoration.distance!=0){ - rv_aircondition_temperature.smoothScrollToPosition(data.size-1) + rv_aircondition_temperature.scrollToPosition(data.size-1) + adapter.setCheckIndex(data.size-1) } } @@ -326,7 +327,9 @@ class BusPassengerFunctionSoftFragment : val adapter = rv_aircondition_temperature.adapter as TemperatureAdapter if(enable){ adapter.setEnable(true) - iv_temperature_select.visibility = View.VISIBLE + if(rg_select_function.checkedRadioButtonId==R.id.tv_setting_aircondition) { + iv_temperature_select.visibility = View.VISIBLE + } rb_wind_speed_low.setTextColor(ContextCompat.getColorStateList(requireContext(),R.color.bus_p_function_airconditon_pattern_text_color_selector)) }else{ adapter.setEnable(false) diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt index c62073bf50..d351df0d90 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt @@ -58,7 +58,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { constructor(context: Context?, fullFlag: Boolean?) : super(context, fullFlag) override fun init(context: Context) { - mEnlargeImageRes = R.drawable.taxi_p_change_full + mEnlargeImageRes = R.drawable.bus_p_function_video_player_change_full super.init(context) start = findViewById(R.id.start) coverImage = findViewById(R.id.thumbImage) @@ -78,7 +78,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { aivStartPlay.scaleX = 0.8f aivStartPlay.scaleY = 0.8f - mProgressBar.thumb = ZoomDrawable.zoomDrawableImage(context,R.drawable.bg_taxi_p_video_index,0.66f,0.66f) + mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_samll) } private fun addDrageAnchor(){ @@ -105,8 +105,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { titleTextView.layoutParams = layoutParams1 aivStartPlay.scaleX = 1f aivStartPlay.scaleY = 1f - val drawable = ActivityCompat.getDrawable(context, R.drawable.bg_taxi_p_video_index) - mProgressBar.thumb = drawable + mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_big) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { mProgressBar.maxHeight = 6 mProgressBar.minHeight = 6 @@ -122,11 +121,19 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun updateStartImage() { when (mCurrentState) { GSYVideoView.CURRENT_STATE_PLAYING ->{ - start.setImageResource(R.drawable.notice_video_pause) + if(isIfCurrentIsFullscreen){ + start.setImageResource(R.drawable.bus_p_function_video_player_pause_big) + }else { + start.setImageResource(R.drawable.bus_p_function_video_player_pause_small) + } aivStartPlay.visibility = View.GONE } else -> { - start.setImageResource(R.drawable.notice_video_after_pause) + if(isIfCurrentIsFullscreen){ + start.setImageResource(R.drawable.bus_p_function_video_player_start_big) + }else { + start.setImageResource(R.drawable.bus_p_function_video_player_start_small) + } aivStartPlay.visibility = View.VISIBLE } } @@ -156,7 +163,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToNormal() { super.changeUiToNormal() - setViewShowState(fullscreenButton, INVISIBLE) + setViewShowState(fullscreenButton, VISIBLE) } override fun changeUiToPlayingShow() { @@ -237,7 +244,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { } override fun onCompletion() { - start.setImageResource(R.drawable.notice_video_after_pause) + start.setImageResource(R.drawable.bus_p_function_video_player_start_small) } override fun onSurfaceUpdated(surface: Surface) { @@ -375,8 +382,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { cloneParams(this, gsyVideoPlayer) val frameLayout = FrameLayout(context) if (gsyVideoPlayer.fullscreenButton != null) { - gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.taxi_p_change_normal) - gsyVideoPlayer.start.setImageResource(R.drawable.notice_video_pause_big) + gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.bus_p_function_video_player_change_normal) + gsyVideoPlayer.start.setImageResource(R.drawable.bus_p_function_video_player_pause_big) gsyVideoPlayer.fullscreenButton.setOnClickListener { v -> if (mBackFromFullScreenListener == null) { clearFullscreenLayout(gsyVideoPlayer) diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java index 889957bc92..a5f398b392 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.och.bus.passenger.ui.adapter.TemperatureAdapter; public class HorizontalDecoration extends RecyclerView.ItemDecoration { private int space = 0; @@ -55,7 +56,11 @@ public class HorizontalDecoration extends RecyclerView.ItemDecoration { view.postDelayed(new Runnable() { @Override public void run() { - parent.smoothScrollToPosition(shouldScrollTo); + final RecyclerView.Adapter adapter = parent.getAdapter(); + if(adapter instanceof TemperatureAdapter){ + parent.scrollToPosition(shouldScrollTo); + ((TemperatureAdapter)adapter).setCheckIndex(shouldScrollTo); + } } }, 500); SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putInt(distancekey,distance); diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png index 61f22d3bf00f362deadb53bc21dc2a706a17fe6c..dc69247e9e4ff4a7394cbca88964a2c0e00635af 100644 GIT binary patch delta 1401 zcmV-<1%~?IE3OM6iBL{Q4GJ0x0000DNk~Le0000a0000Z2nGNE0Q?20Adw+ReuFwAQLY+M>2} zQiRlIiiCxU@h>o%ux4x60UH;t{1Y&N6(M0mV!ARe&|r!Qi3?W*Br#Tr5WYkQ@cCVM zre|*N2(%}8=A8Gu=i|BOe!P>be>t7xGQzWb2dTL9I<@_9nN{rJ?x7W9Y+E}vu4D5o zJNleo)^%ko+n|w~MV)24f*Ycv?R{(Sd7bELgknPiSsQ19ZJ*=a#AML>LR@QEAp0u!n)HMyj<|`Nnn-{=lA#bOWWJqe=aXC|1>o1e{1Wvfq{Wflnbfr z!dt?t!VAJV;TeI+Gl&X8EFi>mV9j(|go{F(aD8-i^wZOjF{_P@jbA%EJ3ms5_k_0v zrp?r!7nl+Q@RVd8if0Ha_^S9R5*N?qTCXv<)3k%b#cSpD>viWxWD^W+&2>=$RMe< ztE;P5`mrUK%jE|L2j5o#E-%wGMhs5KsL0;R%F2(YX`U53H#c{mT1Rm0*e^+g zP&G16E=^8OeiP!7#MAuj?(Y7jBj*R@_|T*olW=BAH0*U zXJ%%;QjOaJe`gxU$3=mYfD?g}q5NT#od|?@CHZLi=-^;|MR-$qr@OoRgU!v&<&%&mD*lepCA=$et1byV3Y?Yc>2Tr61gzt9Am&@hZGQTf6^bbv$ONV!^8JiS67(`lh{oGAKxTTsN&&fs6^cj&mFvHMZeiuAStk z3Atzt_H*V$)?B5DcsencSQ=YL+jWSKHtX_RPnIlFKe3VRYC5LU1aUKyN&6j>1p9{u z|0mwh(rKUT#K!oJTRSh&E?VKtSj4z$b~?>O@K>|bIW_+Q%m(7`+Py+t00000NkvXX Hu0mjf&w!>q delta 5580 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 literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png new file mode 100644 index 0000000000000000000000000000000000000000..dc69247e9e4ff4a7394cbca88964a2c0e00635af GIT binary patch literal 1454 zcmV;f1yTBmP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91B%lKT1ONa40RR91BLDyZ0GKX6>;M1-7)eAyR9Fe6md#IGWfaDl!W2}% zT8n73)~Z3;qPBEWgw$q=goTOmFEE<0W^3318yBwp6EJ}lAz?#ex-u@%V2TNe3s(dr zF;jDk())GWxIkKqNDA7YwvlT=xT&wLjqYFXM$~?l#+vu9~geZ=_~>VdGgGk7MCSyV-a#jHm_)Usf#DqMRf8+y96P*^OML#4VWo1YwNdx zfq_qy3#seETf(ct3&J_!8G*?&hzde1AjEWF&2(CXi$a@leROp6)6xhqs&iCO!PK4H#4cnl8%m!5BvN3A;2U&4G6fu`&QgH z6C=nVskW=Dt5^E5C6~+P2L}h=R{<_CsVVIq?wi!diP#yn6KY#pT6n{rNZQ)kc*{H$ zYSSx%`pGTBh!RO93H9~$Jb+Imjg5`ehy>iHqOK=Y;Y=^|(Tkt_^!AC?dP8H4OlEl;e?C$RVr6cDD<@nI0c2!c;hFCnu_^h`IuL&F*1)WXz z(jUB&u4iUuzEX|b0%sb>$3=mYfD?g}q5NT#od|?@CHZLi=-^;|MR-$qr@OoRgU!v& z<&%oEsV%x-Eho zO-)S~_|E8m(jT+4v-88l!}nKLSD6Tt*i8W+-y~0{;^BsbB@%+INhJrY){rte+di9; ztJ6NCrvbNuriO2m*O_D#pZTBK_miSgVlxVw48+rfAVmy_BTBo1jN zWt${~HSpC_*b{_|r|UR3Bo5me+k4btew@>`ZHQa`bg?P@xv(gblclS%s>lLY&R z2LC7C&(dk1>%_+Rj$1n~(Jory%vi*@YIZu!MDSO$(>XQ&0n7&C@7ldWTmS$707*qo IM6N<$f<^|W#Q*>R literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png new file mode 100644 index 0000000000000000000000000000000000000000..661a22faa271013f731a9059f61a4a921123a720 GIT binary patch literal 814 zcmV+}1JV46P);&ph00001b5ch_0Itp) z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91ET97b1ONa40RR91GXMYp03P1w@Bjb;m`OxIRA>d&na@iWK^Vu~%ySph zw2OEO4ZUjigYbV)x^#|s#ZpM3Kf(VXLXkwGpw3}h2d_yM>MP#VtNp^d7`}ZTVPIHx z-<{dn*`0Ub%gjFW%*ecol>owhbgqtTc^U(j!~fyTrhWC2cKD_B{N)vS(`&Rd0P=K8nk=DiFW`BI49EP$ZyH@J z6x?ue7q_nrzFio!3yI~}m-zQMgIg}@>i&xf9;4i85($CxUE5Ev&5&9YMW1YkR<#Qo z1oR`ZT0y-w&{Y8|#(OmCK+mEMWo%Ygl@duzI~b=(ll7!dWve>EibLuFv__;~p{sg_ z-VO;^aZS>YGkXGp;aRN8lAsQLXWTxzsbc&D*+4q zc<3piM_AgutrX!ifCpMB!t=Z>_Hyr<;?K(C^*(dUtL?q45psn8!uJeaSFi#cYJ}gy z_6X2Jfz(TAzS<6qSw^>!#J@dv1E>LIWNN!4+HKakn+jpm;Tc#?rQ{E0alaLh!15Qq$0m42 zz8-+TG3Onl#q&572<-eB%80)pVENE@#b`lSCr98d#@}*fuo|BeSbePaf2I+?8%ton z#{qG;q-zUcIdBiWww6*sDms20sq)r-X__%0ssI207*qoM6N<$f={_%ng9R* literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png new file mode 100644 index 0000000000000000000000000000000000000000..e6ed9652f3fb55f4420ff4e718f5137dff2474f9 GIT binary patch literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^Qb4TA!3HE_(td6OQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+DZYV_;xjz{tQ1q!~eC3z!hH3z*?-Rgl8`9W!Hr%JzD?IEHxe z?w!8di`h}6ZS%*bgMKW5ERK#J7+p4O*dXY5#O+|nzNV?YQ+t76YVX{wt-ZaPEZp3R zt=F_T99abg_Z-bX;v4gsOnpWENxe|L%S&IW*7F z`1Gv3i;W)Nt)6_K>k9YrCBJ-m0{xz6N`4jG;OL^Xz;{XFKU-4o QCn!QaUHx3vIVCg!06nGfSpWb4 literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png index b3ceb81fb6182bb75f19614bb1d82e1824707741..5d2427b6f7b9559658d6312ee292c499ba4006c0 100644 GIT binary patch delta 959 zcmV;w13>(_2=@meiBL{Q4GJ0x0000DNk~Le0000j0000g2nGNE04E>PB9S3Te=VQ` z00aO40096104e|g008ue*+2jQ17S%-K~z`?&6zuB6j2n0cVn_X;tK;}AqtvC6ciFg ziLp{F6zoDo1Rue|B4A+=6>UVZvJeCd3n79as074-h!L?9L5Ltm5CsW{h$cRx$@-l& zGYlv9?w$8|;LpxI_uO;7oxP9Qe@&^Bu~n-|II4{VD{|cvCK++_(0w&lnmg1 z>X^}4DqSg;%Toq_dM*GaP|(iS%T8bmdKw%MxW3ADgN(2Jsh23PK7f`{e`^S}8ERg_ z*OU2OmcoF9y3@q1K(CO=&KcfBb}k5<(8RQ&wj7!S@qsfBS}GN4|8HYJg~H4J++0Xsabf{%&Ag(6SKQqmq@Q4u}#D z&~M^x>t>R^<7n8CbBz9H%yr3Cv#g;fsM0iDE6K}q26qBJE=jU}_DJidtcP`<0E=Y} z{qA3xRQ~$YBb98nB+ThONVc=2_Lv0zx1O{*eYAS9u2)GaJHbf`jJkpo_XFIHz(n$rTc3)xOOx=NMc2_}xhj5pSZ`jN}hI0cix zPbe$smWy_}zj$asf99e=3-DKizgTF17NAE4Fmc^PXXHXzrqFd)IUq}zSP#%P!vwpA zuN%peT&`w?26!nXa!|+~uI)08gX|FUO#FWsz{}A~WU>oEN&@-}L77gEVEx)P0ISd& z1Bkdz>jC(Rg$7^^dXG$YOan`sz~Z1Oz5#tO(8@19^7LmkfBJHVt{ue`mj7kkLyHxe z{Ni(f1$SNf3vJ4=+yTKLny*M?E9(aMw({$y|NNpmGHV0<0%`k>V`rG6#PzDd@(Yr6 zD-Dy=8AE|js^}PP(_v!FMeJ%6{2thE3{2BW!BfaHS%{mW=4Z@0bRHc=m8j!m#Zzbt h+KXCZCCGWu6<^u)_oHD|1cU$p002ovPDHLkV1oI*v=RUS delta 1025 zcmV+c1pfQ?2e}9#iBL{Q4GJ0x0000DNk~Le0000$0000!2nGNE0GmM_Z;>HLe?XuE z00aO40096106qW!0002993B7w1EWbqK~!i3?VC@i4N)A&-}R@L=TH9R5sC7MLJ}!r zK~f|Ol7%D-Nfwf9Y-C{}3maL=j%2|~Sg5zMqbNy|Klu|v?>+xrpL07?GspRznKSpj z+c|UZsc&b_@8A5s-h=0)Fs@DLW@$ovEVu&hg7H~z#a9sS1~))5 z!W4n--rCU2@u6N1xDCt^o(N`#$-1ln`UiFvn`QI2;kqV2}+?#m|aPHbhE@t5y5v5 zs8d@S-*Iex?WMc8Wx zQJd=>#${nM^6bvWQn0cHillJcp8>XuU>^ss%mqqaIIn?f z{ZdopOy<@(1>6HZf1?$5nj-Bt7X#zz;Jy!Y9UFuIwvRwzMIbVZ;5%S(;iSL0eAsi;}TBwey;lCg>3}!5%5+6CQHB@8>5u%0^5x{33GJ> zfXoW;0l3E5w5kMFLjZ`Z0iRvW@tsPOSKHX)7XT6)K;A1Uf5%Pol@I{pTR`3`DTi(3 zqZa_;JAmtzlt1|QOXQ;#0AhQ9dgn$Ozi{k!k&jjYh#dgx=t|=Uj_rBmqZ9yQMIv)fY^x~^6Hkhz9{*q1c2D-9P;Xwl+`}uqYwa6HE=G6{CoV%eaXinz+}ih zatQDmU+J&ASLBBOBuJC$|7>g`JjXu2%#lxWq7Xozsxu4`p0J*i5GgxTLy4_YCneY&_=bx*!2-Av57Jt+~|8PrJx>qWj00000NkvXXu0mjf#BArt diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml new file mode 100644 index 0000000000..a5ff8d8fec --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml new file mode 100644 index 0000000000..decd1b9565 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml new file mode 100644 index 0000000000..492202b07a --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml new file mode 100644 index 0000000000..9aa045579c --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml new file mode 100644 index 0000000000..946fe33874 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml new file mode 100644 index 0000000000..079662335f --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml new file mode 100644 index 0000000000..b6cb08fb60 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml new file mode 100644 index 0000000000..a7ad6f0091 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file