From ab0ea94455e4c0084b5952336041605418d97d48 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 26 Apr 2023 18:23:14 +0800 Subject: [PATCH] =?UTF-8?q?[3.2.0]=201=E3=80=81=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?120s=202=E3=80=81=E7=B1=BB=E9=AD=94=E6=96=B9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8A=A0=E5=87=8F=E9=80=9F=203=E3=80=81=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=90=8C=E6=AD=A5opt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charter/bean/QueryCurrentOrderResponse.kt | 2 + .../och/charter/fragment/DriverM1Fragment.kt | 1 + .../mogo/och/charter/model/DriverM1Model.kt | 9 +- .../och/common/module/bean/dpmsg/DataBean.kt | 4 +- .../module/wigets/DriverMoFangFunctionView.kt | 5 ++ .../common/module/wigets/OCHCommitDialog.kt | 79 ++++++++++++++++++ .../src/main/res/anim/count_down_rotate.xml | 9 ++ .../main/res/drawable-nodpi/count_down_bg.png | Bin 0 -> 2698 bytes .../drawable-nodpi/count_down_rotate_bg.png | Bin 0 -> 1930 bytes .../src/main/res/layout/dialog_bus_commit.xml | 17 +++- .../res/layout/bus_p_route_fragment.xml | 1 + 11 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 OCH/mogo-och-common-module/src/main/res/anim/count_down_rotate.xml create mode 100644 OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_bg.png create mode 100644 OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_rotate_bg.png diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt index ac80e14fb6..3e77f463b2 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt @@ -24,6 +24,7 @@ data class QueryCurrentOrderResponse(var data: Result):BaseData(){ //线路id , var endTime: Long, var passengerPhone: String, val arriveStatus:Int?,//1:未到达 2:到达 + val writeVersion: Long = 0 //更新时间戳 ){ override fun equals(o: Any?): Boolean { if (this === o) return true @@ -40,6 +41,7 @@ data class QueryCurrentOrderResponse(var data: Result):BaseData(){ //线路id , && wgs84Lon == result.wgs84Lon && Objects.equals(passengerPhone , result.passengerPhone) && arriveStatus == result.arriveStatus + && writeVersion == result.writeVersion } companion object{ diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index 9bd996b04c..1204f1d985 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -185,6 +185,7 @@ class DriverM1Fragment : CharterBaseFragment 0){ + countDownTxt?.visibility = View.VISIBLE + countdownRotateIv?.visibility = View.VISIBLE + }else{ + countDownTxt?.visibility = View.GONE + countdownRotateIv?.visibility = View.GONE + } } fun setClickListener(clickListener: ClickListener) { @@ -54,11 +83,53 @@ class OCHCommitDialog: BaseFloatDialog, LifecycleObserver { fun cancel() } + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if (mCountdownValue > 0){ + startCountDown() + } + } + + private fun startCountDown() { + subscribeCountDown?.let { + if (!it.isDisposed) { + it.dispose() + } + } + subscribeCountDown = Observable.intervalRange(0L + , mCountdownValue.toLong(), 0, 1, TimeUnit.SECONDS) + .map { aLong -> mCountdownValue - aLong } + .subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe { + UiThreadHandler.post { + mCountdownValue -= 1 + countDownTxt?.text = mCountdownValue.toString() + } + } + + val mAnimation: Animation = AnimationUtils.loadAnimation(context, R.anim.count_down_rotate) + val lin = LinearInterpolator() + mAnimation.interpolator = lin + count_down_rotate_iv.startAnimation(mAnimation) + + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + subscribeCountDown?.let { + if (!it.isDisposed) { + it.dispose() + } + } + } + class Builder{ var titleStr:String = "" var tipsStr:String = "" var confirmStr:String = "" var cancelStr:String = "" + var countDownValue: Int = 0 fun title(title: String) : Builder{ this.titleStr = title @@ -75,6 +146,14 @@ class OCHCommitDialog: BaseFloatDialog, LifecycleObserver { return this } + /** + * 不传倒计时没有， >0 有倒计时 + */ + fun countdownValue(value: Int): Builder{ + this.countDownValue = value + return this + } + fun cancelStr(cancel: String) : Builder{ this.cancelStr = cancel return this diff --git a/OCH/mogo-och-common-module/src/main/res/anim/count_down_rotate.xml b/OCH/mogo-och-common-module/src/main/res/anim/count_down_rotate.xml new file mode 100644 index 0000000000..cd58374b98 --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/res/anim/count_down_rotate.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_bg.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..8d3650e9ba1c70df7edd5132f7dce637a811f2c8 GIT binary patch literal 2698 zcmV;53U&2~P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91L7)Qw1ONa40RR91K>z>%0Q{GrLjV8?^hrcPRCod9TU~D)R~dfK%7K2;s(?U zegV0u+6&TDk?bS{S&?OtMyWsI&-L!i9G>Uwp4l_&^~c)YdOaP$9Q4V&H!KgY|4`Mo ze_(%i4i$vUuj-NYyqwW_8PTz9?Yjfz+o_{G(JGXMfuh|1;3sOKU7P*XZ56b`UO3#J zdrQi-syv~U6nA@E^~olNMI{yqIR$(lUplH!4NoM%G$;VTzIOeDs0=VVnC3iL#oz3| ze=73_oh}Cg;nHvQ32#x(L5Y$;xYmnb4wHGQ5X+L6lSfaC%i2G#s;ISHYx$dh*Z%CZ zoQMM%ssu8usxpkxmB>mE?1gn?*;jJ+=4)!r)^(aD9e48JKFvf`~J0l zxu~PY(02g9SD7ysW%m7_sg=&e*n8`*y{!iqHKv|OIrS9e$oaB*Ldz|z7aOU2yA(PC z;j3@za#iGlS?wL=VZc@ghvaTIm2cI9U@Ry(Cow*TBa6p1WvYPv!hC%{k0yd`Z69WNg3f>US@9oSk3Jw7p&6G z7e_!V0OHBokS{lS0RT#W{SEb~ye2pBeVP^mg<33Q6Mxd9J8LLSv(v62*MN;!Cd@rM z0&?={Q{!@HFQ%?tpWUpZX`P;x^Dqx5-E~3-GIjfv?bnEHrvt6PMnS%uxV!)%001BT zLT(+!{NF2hTqnNx2e}AG?4*5$i)E=MA8ltf+D-@h0W^b&72qhq6yONxWdNu&$H{AjPU18%1HUOX*q!obYS8*Tg_58K(t4e-TrYXN&AHrD9UV0b$wOlC>IG?x| zun(~vi!?^>kQ$b~Xv8a6&^v?AxIr~7aU1nveSh0Rdoq9;g4$d->|`thqq z{#7e`tflnaU(zmj3IuM4ZDXc%g?oJ=bmeWAr~D)Ra@W1LUQ6qlfN*(IkGSywZiYU~ zy?`s^Vdvj}Nv&Y~yL*Y^#5;P#z9#`;J(4rFk|}qCZuz+9AL~!+gZM!5){Ed>`??DI`ecb1a7rM^ zTQa^84@Qzr5^faGs23GDESazhEZNv(H5C8(zsaD-lcD4VSSGwsjyy<`$kT;PWi_qe z;tD`8M`L_hBPPSJco*K?GhKdZG_79_M}r>E2Calx6gQ8{PSMKTX=?OS=DgFy?L#dC z9uG(DDB#IZr=1?h_Sh3u%q9_w1ENlS1Od9&FNCG+nqjLlnIcGB*Ar#}%KLDlnj2^A z9X=NzM1E6GSjGV1`MSfzPY%xs#q3|$9430=u+&4jS>XbbWhkO*a|!SQ5JTW0CQ|?l zM#G`ZG6b0a$^k)>Ap<6eQ5ouERD3Q#2>qs>P#z%EIYI^p5+t%c2I|_u03>>XIIziG ze+y@0&_s9}+l_o>PEoUu%quS7~G4XL;x#5u}=PF8yj9boH zzEDl;_n0p$9(jVK$ysH|5wiI#rePlXHAVr=h{2n4Q1MQdN_VpbK@q4G3h4GPX#si9EpySYlaH z-s%#DO}!9P)Wzj`EY*NOsw^5T*tvqU{St{$_Tem~=l=I8(uHarMO)<(}2aP1}M%x;)w9$4fm~shtr zf=vBq@Q<#r2Tw5N2;sd9l;Edkw|80tTE*)K1U`KE9sC9gWNA22O)sp`D>|DeORSq< zPX>)aH6#d1)U2dAHrhos23_x6)#M2GVN zG_&uA@4{Z7|0I4F`HiifV5;2?g#&@We(9W$E8L*U7L(8JY)6?* z>OqhoKY+*MJROGL5hIA>`H=)X88QbW_FRB3aQb1KQ ztS-tKe7zAUW%^E(w+**Z%HB@WHtiS^V?>An5jP%?JhRWtp@Lv#AXAh?NeElUc~&U~ zOU&LgX&VKT`@Bcw8g0yKkEk$%qKpaJkXX|G5Hei>!Ig{Cg)}*`#7L4NM~D;|GDJv_ zAU{AUiE;J;YX|cN-V~OV literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_rotate_bg.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_rotate_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..3e49a07b0045f38ec6c371e4fb8446b13a9a26c3 GIT binary patch literal 1930 zcmV;52X**~P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91FaQ7m0KbExe*gdm^hrcPRA>d|T3c)sRT%!x%fq_&`v+M8gXvNYb#4FDi*9yr2&TB3I<8gwo-bdw0oPGO)4i*wjwFW9-!z3t+;1jk3%V1esyap0l^RDDl57sj$L6@%`l0x_w3LLb@ zEwr_SReU_hJgx*R+@T+E96ZWS@3k#x0ZI#7Bq0Iq5|AuAumxxuxE6BkBxu%IRDxym zx%BgVHo-nD(?Ej#pZ6K~_rzPOdpwA^ZUVH{>Y*K|g@IKBRY9v;1SFOv1ukeAye-z} zM?iNo@8GAO^$~~iH#7`_HECg=2?W{5C;g-e5b#2RL)A!~PLL$vqQ40L9N&Z|w(0;m*A2p~ZT(}c~yaQ+40 z!dL_5m>zf2DxyYRZ`jxgz+%-3-{nAsm)~C12|0^sl#RdGMoB`2njB zuO4Yo?Zb6^v+qgZTkXfWVuc9*AX5*Gq$ahZC=}L=&AHQ6U7&7{zSBxz53L^%pXcMU zl-+lDwW#6R7aqBXF@CiY7w*}NX{HT7rzI=FxG=!{^&<4=nj&*5Ahbgla<1LZ2p=R= zSN#P4*YqG7Z)fmAql|A&0XhY|TstwSDMe79fQBSFQkR`_5|EgJ&9r55`>p_og^$s9!|xDAC7YT~ABNVD zdPcQM-9$-T8e4@xPj4?(Kn1jM^c^H&s0s!VApXOkx0QA`CFs%o68GOb^qe|6QGjQU zQ?||(+;FAqVx3U+4Mdcc23^$c#nZI>^_g9sq_jVXlU{fajmZ^a64JXw~YII}3J0;`OuTEwoIbeVvq-{>b;y@0xR8}Mu2 z!DrQPnWhuBB=MlPfIFD8K&bjE1W*_+2}DkPl1Lo3xh0Q$)z%`8Dxj}52LYkIdKz&* z?glzAaV)d zYHx)Ll((4Tg+YAnmOS?L!xq>rt%FrytUs##tXfK};`fT7|L1*=DJ~zpmt;n$sUfa# zCJq>voM>gO1q@|k zzQ81UHv-6suJ>SP5N+8)1=MG*4IXB?1V|MbXy>M_C5Z!}lSyL>I++D3Q`Q#+ zoRLber~O#~`Bn;dWcWZ&);-S_LoTx9TENHXS4apjZa>-*4J~z!{n1` zf%&2I&3wqCZBWfApzdZUA3$egl(WI~b>0ymF3&exDt$7PcLX#vbKa{;+n+HYQ_PRj z$&)ZG{v%#rf6@)|P62#b;u_sO@1r~96#?S^Jn3->sP3i$xE9DO0+uzQz==RPBL8Z- ze3<{sm>-^>M0pk{GzOsU^!AS{pu8cVX1(?Y`rwlnrRC(Ka3*&HTm + + + + diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml index 8567a7a783..89d0b70386 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:padding="@dimen/dp_40" android:background="@android:color/transparent">