From 65c1d93d1bb33fbde736a19dc4c87ccde2c5c293 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Fri, 18 Jun 2021 15:40:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=20UI=E8=B5=B0=E6=9F=A5=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7custom=20map=20version=20fix=20#797?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/bus/fragment/OchBusFragment.java | 2 +- .../src/main/res/layout/module_och_taxi_panel.xml | 2 ++ .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 3 ++- OCH/mogo-och-taxi/src/main/res/values/dimens.xml | 1 + .../src/main/java/com/mogo/och/view/SlidePanelView.java | 2 +- gradle.properties | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java index 17e26d4f0b..023888b7d8 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java @@ -221,7 +221,7 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese isOperationStatus = launch; if ( launch ) { tvOperationStatus.setText( "收车" ); - showSlidePanle("滑动出发"); +// showSlidePanle("滑动出发"); showPanel(); } else { AIAssist.getInstance(getContext()).speakTTSVoice("已收车"); diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml index 888fec075e..184f70bcd8 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml @@ -72,6 +72,7 @@ android:layout_height="wrap_content" android:text="上车" android:textColor="@color/module_och_taxi_order_start_station_anchor_textColor" + android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight" android:textSize="@dimen/module_och_taxi_order_start_station_anchor_textSize" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station" @@ -116,6 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="下车" + android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight" android:textColor="@color/module_och_taxi_order_end_station_anchor_textColor" android:textSize="@dimen/module_och_taxi_order_end_station_anchor_textSize" android:textStyle="bold" diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml index 95796c9ef6..8e162d85e5 100644 --- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -5,7 +5,7 @@ 15px 25px 25px - 20px + 32px 1px 20px 20px @@ -24,4 +24,5 @@ 32px 36px 17px + 31.5 \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml index 954782677b..ff8e1c5530 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml @@ -24,4 +24,5 @@ 20px 24px 17px + 22.5px \ No newline at end of file diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java index ee4785e198..fd2c4ddd65 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java @@ -57,7 +57,7 @@ public class SlidePanelView extends View { private final Paint blockPaint = new Paint(Paint.ANTI_ALIAS_FLAG); private final Paint textPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - private static int textSize = 40; + private static int textSize = 67; private static int BLOCK_START_X = 15; private static int BLOCK_START_Y = 15; private static int NORMAL_TEXT_MARGIN_LEFT = 40; diff --git a/gradle.properties b/gradle.properties index 5b32afb1b0..995425e5dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -187,3 +187,4 @@ applicationId=com.mogo.launcer applicationName=IntelligentPilot versionCode=80007 versionName=8.0.7 +MAP_SDK_VERSION=1.0.0-vr-8.5.49 \ No newline at end of file From e876fe9a69352e2331d176dd387626f1e53df879 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Fri, 18 Jun 2021 15:52:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20=20ui=E8=B5=B0=E6=9F=A5=20=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E6=BB=91=E5=9D=97icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_och_base_slide_block.png | Bin 4933 -> 15058 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png index ed7b293b90817473c775392fe3ad51d4d7f11d24..c7655b477cf85aea6987d62af30d9353e20d4c64 100644 GIT binary patch literal 15058 zcmV;@IxWSCP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91d7uLT1ONa40RR91c>n+a0J0>v9RL72JV``BRCod1eG9Z*ReA1O`<#SC z66B!>DhL!ri?z1(S%C)ZZLJopim7YvTih5J{on)`@UP=jrytKXtW;d z4Sm!t>a)-68t(Cg0YS8o1KP@b-TG$wKU&F_8UaAwmn zqrvFdZrDF()Q=8BQG za_X^kK4g=*ldc%1ZJZp?PvWt^9ojX6QGZ#tbjkS_9(?lcW_@HIAF)lw71$qt)4Puu z&d$CLL7p(|aN9-evY{Dx_K0Q9^;l!oRbJ6F0G=lR*EyQ?d~(VFnR7ybXBHt|f)nnX z<&Rzd+4Bx~+kHv-NSm`(kC?cQzh(8I!!7-vbi?ko!)|l{1Ir-U53b!8@4Ro;>J(3f zu(L6CZd8>UlXA||75iYuo+}=G>(@q2w_G|rr+1&}2L0JzJmT~(+v1UPtZ_cfF}?KW z)z9c=`crV#tQ?MpQ@&#BmFt#e^DJk`*(x;vV6`S1MVWZCPs;#BzU4~Ats=S^XUF78 z5dgwLRU+YbTz{<}4$i#jnX4|Wh=+Ieus8X*>)-X9VLv(*WjLO#x_Y^pz|-7!kD^%HPxXI(@vpq&lAwCXr-!`Bue#-fOYfWc z#VNy4e-h69-B^k?2$!a5RkGp>L?~nTaZ}6OZFpK6I#}z8?y-_z%}$wPvEH(AOb~EF z1%0ZRQ^GtBxi#2}ds1HTIB{qpqafocAVOb> zk`}z}8KeDA;ALl=n@@D`D*^86i9j2i9p?-dEq&9)zk1TWw0Q^wYDi}!#lT&6j7WA3;mfaI{nX8U_eBJLPA zHIc#yp!lPmgKTEI-Ws0yC^lge-`zJg7`*zD=dAi%5$}QpbK523_?uThdv>P35NGM* zTT;~o9(eYaTQ?GHZ_x}O^=d{|-U=Q|vC^G<)Cg%9i)%sWrQD|k55t;uf%GDsB^lu6Dy z&A)a9-Au=zGg<|$F{#hFHAK7lt|!_C95BK60U z!U22cp5)~=OaXRTxO6;LXq$+K2jc}4Y2oJrL;6@-f+O}4@z4^4yv2+aH;pIojBnh| zKI{){N`S2NOK>>FlE{*ONpu|JU}@XLEgql;J>U7ST=V>Q{F5zq?&#=t0voTQzlP_K zgX;O{L|GIL<%v0+aL={mO>xEwrK*}iCP@NZj!C&7p_C3zN@EH>3l9I36?yC-Di{Tf z0}YFv@yY;ls$@p0#-=Kax1BAE85Waw0f!GC0OacxVMqP_Q-l7+UwXl+%Wbpc$H9(6 zx{mLIH~VeUK@2=vA}STCREAfs>*Nz5yful)l+SUYQi3W1fmlQ(xy*+#$pw?ZlcVC@ z2;O@sS5bo_eUd>g`1HUv6p;Qw`M=+Ca{ULJrJ|zu*H0RqM-5A%J*b6PL5_ zL{vPjZ3_E5DWGTUe8{iDVE&48kG`Az>`TA$M{Q8tnBC?*9s z8G@6`;^&-Jk%W@=AvMhma!_lOn#()nI0>lBN1|vR5L^swfHf+lmJt^TW$dQg3dI#Z zLBw+%jj)l9`n)`x%LFz#0xf>$Z9Mh1auXdqgaRZ!(e&MQ!{P8L8`saAo!mPzC*y)J z{AR;wG>cDUMvE8%!8s=Z_mt+9tK@LD%GOF-VBN}+i-ar|AhzR`9BVnV*fvg~<7lbTu( zkRtseHkd9V8wMVUt@U6VNmlVX*R^n zMIU%IPuz~wey|RInL)uNf8qy&8GI^sg5+0`zIbc=06-Qnw^>b^onafst=yX zv%RsPCi5pc5abDrlV>zsIc9~>%B*9TSil@E8tfoz*9w|kVau7^Bu|;PAtyHFnq{1v zc~Ti)48d42Bqk#Ugsd4ol2@gc&i3*}HAj)te-H>y6ztio;K|u`B|zz&SK3l!eR8&Q zaYOgbhHEe!)ZKaKYN!@8B8sis@@KL(&aA%%o(`s!L*yKV30X3bFk_-D*Xbzt4NusWMxaG((4Q1yzN30$tE_Xx##SYfR0kjx%#ge zWbEOpkYrI4V>`1rfn+ws_$tfhj^QF2H;cGruec1rc-v%*XDT(ynFr$LZX%iR zbZAblfFxYJoRtw59L?Q~_|fd>tQBjv{UU6uP3CVlfD%9WUI(4=kpc5LNdYvn5>(i# z$coRFyznz#frB7%IRl;y%(@KWqfma~VuIv!Y(Yu~#HNxgAZX)fM*K=#&MB|)M+n46 zqxG5qE?T@}rGN8sZr!JUX~C6|+Q{)%r1!>$B}G9P_1|~4zw3<=-MrIQn>_4?{M8i| zh;^c4)eA=@hYfvE#zTh7P!vPa%R-dh8?4m;8$OX5i+OlY*`nJg!m!%$N}s|umw zHDOnZPa7U+LpaxU)&@Gt{jkI=$?N=E8}l%zuy64hT;o%J#}!?&$ib9VXtY+KjkyiI=T&1XIXsraKyUOF+f;`_B2V};0|^C~MCpUDi^cq+`H zBpSK+;&xk0b^8rxZ+*Rp<~hvUuSfIKReNC1y_ANgKHu%sg zn6Q<9W9F?NLn;0vF5z?SnKZ_S91~^E+cVY&uD$1{udNn!HK)n^1#td;uuOndhzumI zp3E)EAhS{s*wH?nD-v1=U*!xid8y_uG34@^AnS~0Be2(@%Dt+XjD==4g(t3c^@gnQ z0tbQ?zhHnPSi?Eu zuO7T1CG9-c(3Uh=VCXXN(4o5FI`eOV_@WdEv@>SQra|PV!PdG3LKg?bO zF}0+PGwX}nzy=4WQ045RSWZ=yV-rOvF|cR_pFY$U$k{65Q%-#FQ6_N~J7?QaXPldB zhMKP^Eet~A?U7EBk3{+x#MI#*vGGDHPwg1dZVb21R>GXS9?5Xl=O<7FX0Erey>V_ooB+`yCw zY(smW0+aYEuQrT^c0@!I6`L8TwO@1FD*aPwtXGu7yva=`1Z3t;d)jc#;TXNLkE#pT z!nc@lACAC0$ndrBUr9k+nyf#g6u(+3#|%P`0Oy|3a2>-*MF2(aWR16>0uMdcB?_#~ z!G&$JASzbKXe16GvxrjhV1kgl4YZNHjEpg!<|eIp%P7w#5=^r&6{g@M%(~F1#k-*f zGqyJW+*rn=sDzJos8T+Tw=!eWu3)(!$LQb{m%iu7pwU#C%)gTb8~pV;$oYtgPep~4 zd67ukDlZL75CAfzVPFIiS%B57y3Q4SWw9qQ{t(9A*^KePTwG$^jBwl};OEHnR8JO5 zXy2X;=C@B;z+?Ly2}$*1z3~|q`5~J|%WES)A5CExl)Wup=b$Cp2xXB~R5u*)5-1+C6E>KHbv6lJ4eBcXU77 z{0kbuivBB}YeyAo>EzMo(#OHZv?#hF5{|nX_w2BHQ6M!rN-SS;-8+8(hWJZ&fB+|= zmJN1{S0&=i8iYRQT5P+ia_$|7G{gmgD1xUngI)lxc!!z=cObOkKOID?=z@y^+jC{S z38NtL-{R9I%t@O86g;^sZ?Dot{d9NyzR&Gmw9l`=5CGK;z5DK}m-@V14lyv}e?j9y=|r+3QJ ze{FEVQ?G|@jIH+46};u8!SKPW_w9$gqWj&){i=L9O4#A+prudf{`(;>@AjGALwV6t zgrzxiV)h)7BEv0f*QM?&9v;#e?9FY#mispyOFj-YS$~Wa))hc=f;?BbiKJ}E9Z?NJ zdf~kqPsE&!GXNoLvZ~(E5KtH&xQwdxPd5ecsQE3x8o!N`A&XYBfjS!=Xa^qoi(8Up z;E7_BJr^zOPCn!hx&xLxPFF5@cm?yJkZ@eoPjxGw^upkbDe#Ix{ux7Kf^~W$XReEM z%of_vQ0LHIm zB>0@dk`75uPZ*8J`w&p=Gaoi-ghjyAFaa8lQcNk#Ko;V;^I01V893m=n6L?M7tL`v64GUSVWi3UCoFz!cgi8J>K?a{f;z&*|RHLpt!fb@`F zLMF>t%OTcAHx8xu+3dhwzzk5F;e@ipD?rH|xlQuwWlSKZHK(vkS#nS=S&6~;f(d+U zLr&wbq8 z`|J%*#X%O;x_^03QuHA5} z`18Qj%sdgN%Lp@QX@s$m`lXd~A&RlM$pd_&^>8^OQ#depmfiANRQqO85~o$*xsKTA z$yU%YX%FyXX*3hDmDD&);xk$LmkrIw@C_#Aw3Qi;_8~l^l$c1-Yi*xRTx0mId&cqu zyORz+P7Nl$G_Y_{hATS)RIYM6>Mr=nmEEOxe5b}9?!&v}s)YlFHtXkDQ7<`iV;5%699IU|I2@Tz5Ci-KcJ}xg&4{h>)2w>6_mg#SBN~fxjnnv1!X#rpfPNTC~6vIwKDU>~T%kX*c zhS~Z)QbB~ZapnmTrgl%C)R4)3d_rj(es~L;XsqH%OrnYJy65k8Sog-KyjYBCo_Nid zd(SGb-9ybE;yCx#f9t+=_jNYrG1AWT9UFupmkHL6gt?g01as@BlNMk%GaNKr!MmKA zX_#rj4IRj?7*}#%2}R+e@rl1gnQj?h+GP{!*+oC{L>u6ryxZR0pY8YC-4VMV&@I99 z-CbKYbYH&v2i+%czoNrm_KRd&d^Q9!;63P@u{XL{GdxEF9bL9I!Y9YL?wEa!=w5%| zZz~sm4$YkOfFItPv&rP&7P*McY+Q!`dEWh|UUCaGv3ApUnA|E%thpZr_;CWB3k)tY_?i-(#Uvf0sWcg`(q zx@&%MvkYjHL%y(KM7bsj*OF-y29(ICGB{_lrH(|&6?UA)>W@mSpItt{e~;iRIr%i> zKrU0(pi&4q4Ki33RmK!YaC&Yg+9!LAUOG#d_Y&EZFKorO3*_rMi zZv0Yr^)GIMMr6V}PA$csHEZjaG0IAAiAOFFI49#}XLe~ae`O<_f`QH_tKyj5w0r;{ z|BE|~cGkK8t!D$PO@I(aURl<0@5C7;trEk9e(DjjqaXY9Zm(&7VifFiroHjuzZ#8O zIuoRyNna@^ICb))AWTVl7CZe@?V=^F>t4D4^Sb}~ME+2P3(STpen>dy+ap0!hWqiR z;g;^>H(uPWTkp3?at)*6BLI#cKw_a}Opc2NuA6lcQ|l-cab88P6uK_sbAulZ(Bx74 z2oMPA&{qW4+Lfj#%aC~;HqN93J*J~QijchFK|T&$x*xr5cc{^az6Q_T`+&zW*+*86 z6g5#^k@hn;eoJtKjoSy)uz$@HkLpg?@A=9@%|%{R>A`jGW1Th|hnu^P{pbtb^&4)Z zV*nf_eesbeRr;Zc*Id-b!hy3Zct>0D$w<6)^$Lavc#X&>qrgjq0Y10xHdq@rN+Ljk zbGVhrd@gLR)2*BVr=nO1IBfZ)JuETbkF$TF!;QwRySbuWAakZ~@)f@k1MT?5RP5ig zWMT6s2dwChd%~~VhIab$tvT0qh8%h}dHt6AyN_OfL3h)}pVGC4{nLjZmO4V}xT4Pf z8NV&kuHs1$Iz9E!)&kF2f6B;KIZ0}sQ8zv4H{fG2J08%hv%k94nHSDPep1U_4 z^gG>)@j{D(jnn&J=(sL2e$Wy6Eb!f1Hg2X%^%J{@ipiaJJ*Z@=Nh z{%;5WUbg~om1v^dFTogUbj->XYub>XcKo@mzy09_-EH^%9MW)+wI#ca;S)=)X;Wq{ zY?HAl?m2i!$Leo_T7Ty#ZaUmb{ik-@bNv86LBaoLumn*T#M!fn87V2*VBdCp%`jj* znkJ^a;)%o1bBXaYsK5tqKHu+!tzFPjjeaT{jaS`jmtl^{Cts0g;;xV4XGT-N{l%fj zbw}>~H07eJmT4d_ofnu1@g6Og+(o?u4gSz|=j&&-$VFfJM#|VlAVsO4cQ`inql|S@ ztgK6kk&9q1^`|vPgE!KZ)}280Cl7lQUwAfNv*Jzn4v<3g{VzjdM_VQ5Z0W&{OEKva zMtoou>cm@ay$pqC>1=7BfR++L-W`ZMu8=VK48V zv*$1Q>O~=m*OiR06eH}~SJK4saohbr?>_v)&v$ok_RARZDo5yCo~#k&);YdnAbV#Y zSQ?5wZ5&UF7ui@~&Q&>$Ugm3Yq7#{@ieI=c#& z^~Utw)f;Zv=|-RRG`zjSi!l%S_DQAi=te%fZuh}%-8-IoLifw~mSKb@2-h5JW;RrM z?p=xQhI@b7edM|ey7im=xw>+JQOQ{(nT=Cd2^d89=aR9gI@qX&+QB)Mx#m`2E#|4e zYw6IU=73l4wf^vTEm-g#svoUW0655y{^T)wUhO0VA6@vs%0;4K#1yc}1W4 z!=1RI7cc90ML$U&m>?cF;E&3_=jpH3TdvYr`LxSyYCGrpJNPcr$F9GqyMGoR+JK8S zar|0oL#k4%sGn;>b**E;Dd`sPlUtN7JpIIO|0R2sP)MImOrK?+fnvV$=QnhJfBhx+w&AR#Zln!r{>~udPCh$B zUNDy~8Dc}cmx+gE7$;W-?3#sNDQo?+e&e;LQ)tMC!(ceACd>A}d}sAPLHP=)NG2oh z+=L`Vc%h?&MkI`x=2EvdRQqfVwPD-@o^bQiR*G2k__3PW}6cm#urO> z-oGBr^bf!Lcare^Um)F3+_s?1=HgHPD-zC>ef4M8cAva)4P*?)`P*sa95GruSFaqx zrd)|4$eLk;MkN2j>PLdWu!$OuU@jg?1cCqT^Jm{YVHH12@HZz0qrn=TiAbJ-@|7FVaryZcwN!!KHc5NA0F7wh;T%?7p`dj zc0)F`=-`XZ_ueN2y=TKOzvG(j6E|H}E`~M-#uwpxCJzN9!;l_lQd>Xbt@g#oL&pHtVJyUj)u&KT7!_{^DduQA8ZW3dp~R5gY+ zz<%*3-|0Se%a@UV#wAi5>X^)hwisZgw$*4iPQG}+V90E|a^ViH++44%x9sz`UDcg;D}FAT_jHa_YU6rHY%)nn z?C71Z8bF-tfvHI#m&`A7G=6LKBV1&~mw6MPF);%Br=c<4&*~y6=I4GZS zMF)K0%)o^SKX#%d6VHISR>ID~S2P-}AMg{#Hu%#2$E*#v@B$L9 z%2||ny2lzq7R{qaqi^X>iAGag9x`=<_#9iB4lu7++U0v?-j&b3>GJMNKmD!=5Nq|3 zo?8D7z|s4t2GP_i;pwGZO{`7S&*a9LJ#&IA@mM%Y+Qp;fA4UnLUZR}IXEd>RW&PP= zibZMig-7sD4~#C+ErSFE#iN{cAaHUF!g`VxnQ(Sk@UW|R^Wvx&6XyamU=Z-1{KiaU z4jXA=qyK8{x%jB@{%Bw{k~o=ij$pI7B9}DIZk6OR1HDj_qW8bGE_)h&!9@hJG#1AWk-#ao{^{bmD9 z7!mz{?;d<$vi380)x8;wh7f~SFu!=^YL8jZzm!6>86R$Z^ty|>uiyDY$0MsIN9+}c zMc6qWfk`Ra%%5Ny`r-I#0;8xOb)sspl(qG%dUTIQ7WOGWdN$Sy##sc-nvO7q@or zSo=?UA5F0eRLigZCS2`jt^0iU-Meq1D;Sw6eQGEF8GmMnN@PQ6TyiD}P{Oop;1$35 zWmE8B#|gNsu{PqeZ^oY|n^=UWBLX?>SIbNwWuwsz-&lFtSEOqWV@;-f(V#z@j+6lQ zT7!ghyS7t?kxpZ+J@Jl;7zQoMA|o*#)Ue=K6YUXvh6^Vh_5t_YV6H)0Kdt~sw;3mf|+56R?RF3sx*c$8WuHD}s8f6tkhIHAi7oU6cgCvxUw zuGCkb)Fqx;*IM?9h03=65l3R8eq8l5Xn*16l^J^Bp-1MTRORfG-;7v`k3p}&b9E_Z7%B%~RWM*m%*`4sMNV4s zJ5OAN834neQoLMN3{}a?79?K2iNT;e6ynKRaF$6)Eb53od3+#4l@pLYu=?114JKmF z?V7?%p0nyggz{~j&E+{p<)IpG7$_a!kU?bd6yZyOaW2KFcn9hL6GmQQL>X(@#Yc@T zI&D=IDgcTJOOROPIs8|=SF)pN6g6W`yg6(9%9-Y3#X+&sFC)c-g5xN!H1E zt4%)g*{A=@pzqe&F<{LZ$1^FL_1YktwpLouQAZ*CZc%)_U9KmgQ z;-#RH3*nWo?mm{4Is@-sq+Ae!HjkzjpB1}#r>!=5b&t2zqwddzV&UZ7$+rc{CQ{Z0 zRJy|?h36a@$3*T>+dSpSL#DaM-0rz{s$>Wb3d256s1lFxjE~k?ESd*EBpJV(CA#F) zE7%rqT!RL8gO`uAcYsyTT!@TjMGUE@G*6Zi9?S*Nfqd07?B9RY%D3MP=~l;9n@q%| z&ws}ygRVbMlt?s-m(G2w$#N?^R?d$oCeK{sA&;{;V>CX~rALgwlP&FvJn+?j*hj%= zM+^%_ziF5Fws_L>idS&X!9HuVs?H4?&mVc|sY>iRC|CG)-1JX!bCYWv54G^2mz__* ziYL0(&+#*6V_gh^TgA;mP9?%#6Naev02_TT2%Zjuu|cOT4+R0;yhHNJl_y$7TGz^JRL~VXozuSr)vs20 z0%Qaws_}Rmye(-r=|4FhJyN3V=+lVvfEynYZ-eHrftVU2i_%NjSu z9M+jPwjetx8@0$#0!_`X}sXVaEkG znRJ)G5affwIdYD@UU(>CY%;)%g?cXoEu*C(D^d;@<0~335kG)d?5=Sk%O%oF`4*&LcwM zRp*Sm!CRhj+4uOJAX-n}#Kn7Dh35dY%vuN!=ZXm$U+w&cZ2yLDz2@|5Y`kN~9d0t| zFFhJRr#&@w9B$qB6?dg7E?&wrxv_loya_2bc3_5`omRQ{SFhXwmTZH+qIq7;OHyf^(S~G@xQaUG~!w@a>hbB zCJ}?nbZpx^`)S~H#fNSVejHOOR`8*Z05U!`57qMwcT%KJN0p6oB2HiuuM8BEvq_BO zt}@>lsvl;k?qvmR3Rm^cQvG)4TzTTEKL&?98N1`hoxYOO)xZ7L>HmnU`7gC+D0nDQ zEK7r_bp5=54U3kAbAeLE28hOWOe2ty-a^`X7ekj5 zv+zG#n2zU}BcpjVJ0UvivUk3+8}^?`)uSjkW5;Dhf*UW@C$B-Ut)k3ni3G?CIY+E&rFPtqt z^cjHsCq}16Z2|&tconbmGzoZF@d{Ug1G8N`Oz@SraCsNZGWeqUq^n-@z+PlUS;r=4 zG$wlBn-y!$eAbrP+0UZUPoV?V0kh8h++gRkd_vwdE3b&O%c5s9QeJsoY-a#|d?hAj z6wS|T3vU%C zXRpzwnX_?zzAT$TQWk+uqb6Q!#!fa7nv?%RxTJ5XMRmXqN%cBA;Ok@@o=c6;3iN#Rl2YfE+LT7o`Z4@@3C(1 zy5ePKtDqw7Jb2Ma&iG{`V$0_oeU!0_z87D`|wI6Ndw+nalyGbV6@#8Le3$;DBUw+YP-(0lY z<9-Ei*gk-y{kDL`$)UF*tZySjk=v^;*X5FEO}WM+n_}8=e7Z^JFf9X>xks?;eLDpFpR zY?@puu)Rc|97bTOKgUL{9OCDdJ6E+Czo_v3(PN%)=0bkxF8Oxl z++?~dX&1(|V$DaF&1|~sjrj9RZ$okLKaY$zQ7om}Ea2qxB`qvZEG2moQ0C^^&JB+) zh}Y}(1egy`9!54751|x9VQ|f1?oD`W^be!K;H<`rwsUUL7& zTVIbq^l>ukb6~9;!h>L}Q4sicYdPt)mti`~%2&LtNax1NJT7zNfsK9b7G>#YZmCLK zc?HwFA8o+j(E8ZaaPWa|yk_gax{{GT6!YB39}2Hq@$siuetgl@Kl$lv@qGOT6z~Ns zwhEcglkAT!muM8XYK+q;J;K5kc_m|3x8~v#Lxx=2G*2clMH4fYASW3>cmRxlHvsX8 z#Z$X~bZfs|DEo)u;OaaKj<@IX=+B>V*i1Kk-Eh>u7KJ?6O~~e=Wn5}NQ#Q4!R9S3{ z@kUseTxsZ1`0C7cwbv>kn0eCR4sbV~Z_gd!PdHpP&u{oopdYravw7IuZ{IPB-XD3v z8Ar~}b}LcW7oomSA8$l+#px<%b0LeXzuejZ=I}l+6zEKtJUJ>}*Jy1jw*74Yt-%jn zeRkhH_W0c7A7LToBW*n5n><;t6&Jj3zx!u49Xs0%j_HQ8$D-VeP8567=$J`w+q%5waXrzy5wCjjQs^ys$R+Vgk4?t~5hKaO>H;j|9TUN=}g zz3v;Y{7e4_jN@(}Rl7%hlebsx7o7XSrTz5m@~+>sd}fCKIpyrsXnJ}*elTtQ^4UGt ouX)v*?!~RWT-@8^do=3*KZ=&YmPo7&SpWb407*qoM6N<$f;pObR{#J2 delta 4908 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 From 5a5b4fd1563d8b2976f1281e6d22b11c73f3b057 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 17 Jun 2021 16:45:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=20UI=20=E8=B5=B0=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_och_bus_ic_autopilot.png | Bin 0 -> 2342 bytes .../module_mogo_och_autopilot_status_bg.xml | 4 ++-- .../module_mogo_och_operation_status_bg.xml | 12 ++++++++---- .../main/res/drawable/module_och_panel_bkg.xml | 4 ++-- .../main/res/values-xhdpi-2560x1440/dimens.xml | 3 ++- .../src/main/res/drawable/yi_biao_pan_bg_nor.xml | 13 +++++++++---- .../main/res/values-xhdpi-2560x1440/dimens.xml | 2 +- .../src/main/res/values/strings.xml | 2 +- .../module_small_map_view_my_location_logo.png | Bin 0 -> 8870 bytes 9 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_bus_ic_autopilot.png create mode 100644 modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_bus_ic_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_bus_ic_autopilot.png new file mode 100644 index 0000000000000000000000000000000000000000..927296d6900963a898b84f78d1f7699c9d5cec12 GIT binary patch literal 2342 zcmV+>3EB3EP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NuUD&1ONa40RR91NdN!<04n#S8~^|akV!;ARCodHn`?*_Wf;djrj}Zf znYvqnXrg&1mC6uNQ%fNc@@qlg3=Uq_s!5^Jktj+JVmt-rfazcq$SNmruovtGUr@B0 zSsiwYJ;j*>HiL_xk|O_#GqF<=O%oKdGr`xOGemJ`rr})`8^}EY4tGXnVq%Jio_n<+ zkQo5Bfm@)KM0~_cFNMw%2+Rk~pqAxN$j#4ErBrV>g5FNh4dA5=!S$Ly0)7VIQ#ia03BU*K2%eMJ0+I)w07!SPsd-h<6)be8~)q$?)!AH-2S zSNQ|QvAL4M;Sg}vk%4Z5wZQ9k%1T)Ag1D}?q4F7$HEz)!M-AX4aFG)zJ(f%0lui^M zh=+?PuZEPN+RSj!6C84hhR!?Sj!Xe_G8T`34+pC#zn-Z>W4y^4qHPelBz2Gq8p2)A zM3+JCrc^X=zQCbCy8mBD6`)E+;s;!wQ_p%)!fAhCo4x;wj-O*M7WpZQClFtgDBu3h zQBmG%@)qt{=Qa6 zHK-uo;J78f{YL5-&#*XXp?`$YNsV{H|6!m!Ofn-e4XnN~S<<&Q(YOnBC=W}X`(o3< zXq?4R>qc6_=<=dGfNdRYT$pJ0@Pwmnyt9V27_Iemc?t4ZV@afaJ*cXtAEt59Z}iv1 zl*5vkbGPyV$}34O&{3SOXirR{9ftdgXYv1Rqx%2EcloyxT&s@vf;)khQgjT@OE)L~ zru_=gQD}yTRxvY+@`1;89IZ@nro}ncWp`Ml*$Ika^GD%{>k$G;*XV`AFdHQ__IsF&hMY=`$#X)7=mcg8Ot8TX&W}Uk4y`dtt)O{Ju1!z%`n$0?O z-`lJa_c<^$p%nV`cLg{Av}B=4?ENLs80%?J%fpCE@cSH`1ZPX2$*-1av^(-9P%Yx* zoaSyjK$0Advnp-Fum{ivg0{p>i&%75O~gZd#49QJC=GOuf+X3YA}vqqrTr@C6?wCq zpsN+m#Xzfiogs>=_|6|dpxX;5&m>u{B549^lBt&3bm+#JKCD^|Y+E;`xITSKQt`Y$ z7{g|&CD2?I$+n)fszVhV8}L0IoVJk2+AaU%9VvBC!*-R0Kx5GeCDTVwdT6H>d=CT% zEJV_F%dghUQ;UV$iO4aE`o9@TqR&7vygG#Run(bqRJNO^(}-FjJ{QL@i; zi;2GS0m>^$PSH`E(`v-sja>yza^KT=f@pjD`Gh{_X5whiY##94`Uzub3Nol^u9qE)m2&}8fbVaKU4YBU&_ym|_ zW2~WPBLOsy@*QwW-+LSsM-4w4fk{4&vn#e?HOpj4pWXx$5*>JS;7224A6e|-K2eo` z6M*TBCQjNJN){CMNXsDFzp~DUk|VVB;6qaw&9PiWdd^dgq}cfA0c`t)dy?#DON<^{t2PYnB*URv~nY*{&dk zf6Ko*fd$5zu6!yl4x)#m_icgALW}Q(z6pp2usx*1u*$DE{qT(w>EoaeFfDI}!F1H? z)oUDuzU{X5x(yUR;K9Kv$}69ZSsXQjGuDu83L2=r4Vx+QIt>Hf?Aoc)IV`J8n_lpEHpQI5g3a_{}^Brcnv0eDS01BN7sF(T zV_i|YM14fd5$i$h!X53CEzTy#agskEzoz95x;u#Y=X(W}6C{A1QLYd3Qii$>v{<$Z zOa;Y7GmcAvNtTKO3R<+2o$Teu^|nGa67kOG8B|`F^4|pN4qS!@5xbZZ?QrO?YFeI= znfj$?+V+v2O~g0bTdcegF24z?H(^b M07*qoM6N<$f)F%O!~g&Q literal 0 HcmV?d00001 diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml index b5596fad13..2379e3bc4c 100644 --- a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml +++ b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml @@ -2,13 +2,13 @@ - + - + diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml index 914743547f..753d85e3ec 100644 --- a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml +++ b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml @@ -1,10 +1,14 @@ - + android:shape="oval"> + - + android:angle="315" + /> + \ No newline at end of file diff --git a/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml b/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml index 204c5fc692..4a08f10745 100644 --- a/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml +++ b/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ android:right="3px" android:top="3px"> - + diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml index 7343943aa4..96770d26e2 100644 --- a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -31,7 +31,8 @@ 414px - 44px + + 49px 13px 12px 350px diff --git a/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_nor.xml b/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_nor.xml index 9c1429d2f4..4bde0e73c1 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_nor.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_nor.xml @@ -7,9 +7,14 @@ + + + + + + android:bottomLeftRadius="130px" + android:bottomRightRadius="30px" + android:topLeftRadius="30px" + android:topRightRadius="130px" /> \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml index 79f55f813d..608a067881 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -5,7 +5,7 @@ 460px 320px 320px - 15px + 20px 110px 40px 279px diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml index 9b05b089d1..2ffaf6481b 100644 --- a/modules/mogo-module-extensions/src/main/res/values/strings.xml +++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml @@ -69,7 +69,7 @@ 提前看看出行路况，试试唤醒小智说，“中关村路况怎么样” - 默认视角 + 近距视角 远距视角 diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png b/modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..fa98de96a11488d712679357263f86e3ccf076cd GIT binary patch literal 8870 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 o Date: Fri, 18 Jun 2021 17:14:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=20=20ui=E8=B5=B0=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_mogo_och_autopilot_status_bg.xml | 16 ++++++++++++++++ .../module_mogo_och_autopilot_status_bg.xml | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_autopilot_status_bg.xml diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_autopilot_status_bg.xml b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_autopilot_status_bg.xml new file mode 100644 index 0000000000..97ac9039cc --- /dev/null +++ b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_autopilot_status_bg.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml index 2379e3bc4c..97ac9039cc 100644 --- a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml +++ b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml @@ -2,13 +2,13 @@ - + - + From 533bce2ca9994671651e2e2667fc77a916bafe63 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Mon, 21 Jun 2021 09:57:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A1=A1=E9=98=B3=20=E7=BD=91=E7=BA=A6?= =?UTF-8?q?=E8=BD=A6=20=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/IOperationChangedListener.java | 6 + .../java/com/mogo/och/taxi/MogoOCHTaxi.java | 44 +++- .../com/mogo/och/taxi/MogoOCHTaxiModel.java | 225 +++++++++++++----- .../java/com/mogo/och/taxi/OCHCarStatus.java | 20 ++ .../mogo/och/taxi/OCHCarStatusResponse.java | 29 +++ .../mogo/och/taxi/OCHTaxiOrderResponse2.java | 2 +- .../com/mogo/och/taxi/OCHTaxiServiceApi.java | 18 +- .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 77 ++++-- .../mogo/och/taxi/ui/OCHTaxiUiController.java | 23 ++ .../main/res/layout/module_och_taxi_panel.xml | 1 + .../res/values-xhdpi-2560x1440/dimens.xml | 2 +- .../mogo/commons/network/SubscribeImpl.java | 2 +- 12 files changed, 369 insertions(+), 80 deletions(-) create mode 100644 OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IOperationChangedListener.java create mode 100644 OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java create mode 100644 OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IOperationChangedListener.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IOperationChangedListener.java new file mode 100644 index 0000000000..af7fc38699 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IOperationChangedListener.java @@ -0,0 +1,6 @@ +package com.mogo.och.taxi; + +public interface IOperationChangedListener { + void onOperationChanged(boolean launch); + void onOrderStatusChanged(int status); +} diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java index d2a0674630..fb79ee489e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java @@ -8,7 +8,10 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.module.common.MogoApisHandler; import com.mogo.och.IMogoOCH; import com.mogo.och.OCHConstants; +import com.mogo.och.taxi.ui.OCHTaxiFragment; import com.mogo.och.taxi.ui.OCHTaxiUiController; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; @@ -20,13 +23,17 @@ public * 网约车-出租车 */ @Route( path = OCHConstants.PATH ) -class MogoOCHTaxi implements IMogoOCH { +class MogoOCHTaxi implements IMogoOCH , IMogoStatusChangedListener { private static final String TAG = "MogoOCHTaxi"; - + private OCHTaxiFragment ochTaxiFragment; + private FragmentActivity mActivity; + private int mContainerId; @Override public void init( FragmentActivity activity, int containerId ) { - MogoOCHTaxiModel.getInstance().init( activity.getApplicationContext() ); + this.mActivity = activity; + this.mContainerId = containerId; +// MogoOCHTaxiModel.getInstance().init( activity.getApplicationContext() ); OCHTaxiUiController.getInstance().init( activity, containerId ); UiThreadHandler.postDelayed( () -> { @@ -38,5 +45,36 @@ class MogoOCHTaxi implements IMogoOCH { @Override public void init( Context context ) { Logger.d( TAG, "init" ); + MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE,this); + MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.TOP_VIEW,this); + } + + private void showFragment() { + if (ochTaxiFragment == null) { + Logger.d(TAG, "准备add fragment======"); + ochTaxiFragment = new OCHTaxiFragment(); + mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiFragment).commit(); + return; + } + Logger.d(TAG, "准备show fragment"); + mActivity.getSupportFragmentManager().beginTransaction().show(ochTaxiFragment).commit(); + } + + private void hideFragment(){ + if (ochTaxiFragment != null){ + mActivity.getSupportFragmentManager().beginTransaction().hide(ochTaxiFragment).commit(); + } + } + + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + if (descriptor == StatusDescriptor.VR_MODE){ + if (isTrue){ + showFragment(); + MogoOCHTaxiModel.getInstance().init( mActivity.getApplicationContext() ); + }else { + hideFragment(); + } + } } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index 0588c710ed..a256c40d2f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -5,12 +5,12 @@ import android.content.Intent; import android.location.Location; import android.net.ConnectivityManager; import android.text.TextUtils; +import android.util.Log; import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.data.BaseData; import com.mogo.commons.network.SubscribeImpl; -import com.mogo.commons.network.Utils; import com.mogo.map.MogoLatLng; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; @@ -93,16 +93,18 @@ class MogoOCHTaxiModel { */ private boolean mIsArriveAtEndStation = false; - /** - * 乘客已到达上车站点 - */ - private boolean mIsUserArriveAtStartStation = false; +// /** +// * 乘客已到达上车站点 +// */ +// private boolean mIsUserArriveAtStartStation = false; /** * 查询订单信息重试次数 */ private int mRetryCounter = 0; + private int mOCHRHCarstatus = -1; + private Object readResolve() { // 阻止反序列化，必须实现 Serializable 接口 return sInstance; @@ -111,6 +113,9 @@ class MogoOCHTaxiModel { public void init( Context context ) { mContext = context.getApplicationContext(); + if (mOCHTaxiServiceApi == null){ + mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi().create(OCHTaxiServiceApi.class, HostConst.OCH_DOMAIN); + } MogoApisHandler.getInstance() .getApis() .getSocketManagerApi( context ) @@ -130,6 +135,46 @@ class MogoOCHTaxiModel { if ( NetworkUtils.isConnected( mContext ) ) { restoreOrderInfo(); } + if ( NetworkUtils.isConnected( mContext ) ) { + querryCarStatus(); + } + } + + public void querryCarStatus() { + mOCHTaxiServiceApi.queryCarStatus( new OCHCarStatus (MoGoAiCloudClientConfig.getInstance().getSn(),0)) + .subscribeOn(Schedulers.io()) + .observeOn( AndroidSchedulers.mainThread() ) + .subscribe( new SubscribeImpl< OCHCarStatusResponse >(RequestOptions.create(mContext)) { + @Override + public void onSuccess(OCHCarStatusResponse data) { + super.onSuccess(data); + Logger.e(TAG,"OCHCarStatusResponse:"+data.data.status); + mOCHRHCarstatus = data.data.status; + //更新view + OCHTaxiUiController.getInstance().onOperationChanged(mOCHRHCarstatus==1); + //刷新数据 + updateData(mOCHRHCarstatus); + } + + @Override + public void onError(Throwable e) { + super.onError(e); + Logger.e(TAG,"OCHCarStatusResponse:"+e.getMessage()); + } + + @Override + public void onError(String message, int code) { + super.onError(message,code); + Logger.e(TAG,"OCHCarStatusResponse:"+message); + } + }); + } + + public void updateData(int status){ + if (status == 1){ + //查询订单 + restoreOrderInfo(); + } } /** @@ -141,6 +186,7 @@ class MogoOCHTaxiModel { if ( mCurrentOCHOrder == null ) { // 订单恢复 String orderInfo = SharedPrefsMgr.getInstance( mContext ).getString( SP_KEY_OCH_TAXI_ORDER ); + Logger.d(TAG,"restoreOrderInfo:"+orderInfo); if ( !TextUtils.isEmpty( orderInfo ) ) { mCurrentOCHOrder = GsonUtil.objectFromJson( orderInfo, OCHTaxiOrderResponse.class ); if ( mCurrentOCHOrder == null ) { @@ -158,6 +204,28 @@ class MogoOCHTaxiModel { } } +// private void restoreOrderInfo_() { +// Logger.d( TAG, "重新查询订单状态" ); +// mRetryCounter = 0; +// if ( mCurrentOCHOrder == null ) { +// // 订单恢复 +// String orderInfo = SharedPrefsMgr.getInstance( mContext ).getString( SP_KEY_OCH_TAXI_ORDER ); +// if ( !TextUtils.isEmpty( orderInfo ) ) { +// mCurrentOCHOrder = GsonUtil.objectFromJson( orderInfo, OCHTaxiOrderResponse.class ); +// if ( mCurrentOCHOrder == null ) { +// // 解决本地没有缓存订单号的问题 +// query2RestoreOrderStatus( null ); +// } else { +// query2RestoreOrderStatus( mCurrentOCHOrder.orderNo ); +// } +// } else { +// // 解决本地没有缓存订单号的问题 +// query2RestoreOrderStatus( null ); +// } +// } else { +// query2RestoreOrderStatus( mCurrentOCHOrder.orderNo ); +// } +// } /** * 查询订单状态，来恢复旧订单（因crash导致应用重启、断网没收到推送等）状态 *

@@ -171,62 +239,65 @@ class MogoOCHTaxiModel { * @param orderNo */ private void query2RestoreOrderStatus( String orderNo ) { + Logger.e(TAG,"query2RestoreOrderStatus:"+orderNo); queryOCHOrderStatus( orderNo, new OCHOrderStatusCallback< OCHTaxiOrderResponse2 >() { @Override public void onSuccess( OCHTaxiOrderResponse2 data ) { - if ( data == null || data.result == null ) { + + if ( data == null || data.data == null ) { Logger.d( TAG, "订单已取消或已完成" ); clearCurrentOCHOrder(); - OCHTaxiUiController.getInstance().removeFragment(); + OCHTaxiUiController.getInstance().onOrderStatusChanged(OCHOrderStatus.None.getCode()); return; } convertCurrentOrder( data ); - OCHOrderStatus status = OCHOrderStatus.valueOf( data.result.orderDispatchType ); + OCHOrderStatus status = OCHOrderStatus.valueOf( data.data.orderDispatchType ); + OCHTaxiUiController.getInstance().onOrderStatusChanged(data.data.orderDispatchType); switch ( status ) { case Completed: TipToast.shortTip( mContext.getString( R.string.module_och_taxi_order_completed ) ); clearCurrentOCHOrder(); - OCHTaxiUiController.getInstance().removeFragment(); +// OCHTaxiUiController.getInstance().removeFragment(); break; case Cancel: TipToast.shortTip( mContext.getString( R.string.module_och_taxi_order_cancel ) ); clearCurrentOCHOrder(); - OCHTaxiUiController.getInstance().removeFragment(); +// OCHTaxiUiController.getInstance().removeFragment(); break; case ArriveAtEndStation: mIsArriveAtEndStation = true; mIsArriveAtStartStation = false; mIsOnTheWay2EndStation = false; - mIsUserArriveAtStartStation = false; - OCHTaxiUiController.getInstance().addFragment(); +// mIsUserArriveAtStartStation = false; +// OCHTaxiUiController.getInstance().addFragment(); break; case ArriveAtStartStation: mIsArriveAtStartStation = true; mIsArriveAtEndStation = false; mIsOnTheWay2EndStation = false; - mIsUserArriveAtStartStation = false; - OCHTaxiUiController.getInstance().addFragment(); +// mIsUserArriveAtStartStation = false; +// OCHTaxiUiController.getInstance().addFragment(); break; case UserArriveAtStartStation: mIsArriveAtStartStation = true; mIsArriveAtEndStation = false; mIsOnTheWay2EndStation = false; - mIsUserArriveAtStartStation = true; - OCHTaxiUiController.getInstance().addFragment(); +// mIsUserArriveAtStartStation = true; +// OCHTaxiUiController.getInstance().addFragment(); break; case OnTheWayToEndStation: mIsArriveAtStartStation = false; mIsArriveAtEndStation = false; mIsOnTheWay2EndStation = true; - mIsUserArriveAtStartStation = false; - OCHTaxiUiController.getInstance().addFragment(); +// mIsUserArriveAtStartStation = false; +// OCHTaxiUiController.getInstance().addFragment(); break; case OnTheWayToStartStation: default: mIsArriveAtStartStation = false; mIsArriveAtEndStation = false; mIsOnTheWay2EndStation = false; - mIsUserArriveAtStartStation = false; +// mIsUserArriveAtStartStation = false; mOrderMsgListener.onMsgReceived( mCurrentOCHOrder ); break; } @@ -256,24 +327,24 @@ class MogoOCHTaxiModel { if ( mCurrentOCHOrder == null ) { mCurrentOCHOrder = new OCHTaxiOrderResponse(); } - mCurrentOCHOrder.orderNo = data.result.orderNo; - mCurrentOCHOrder.orderDispatchType = data.result.orderDispatchType; - mCurrentOCHOrder.endStation = data.result.endStation; - mCurrentOCHOrder.startStation = data.result.startStation; - mCurrentOCHOrder.travelDistance = data.result.travelDistance; - mCurrentOCHOrder.orderType = data.result.orderType; + mCurrentOCHOrder.orderNo = data.data.orderNo; + mCurrentOCHOrder.orderDispatchType = data.data.orderDispatchType; + mCurrentOCHOrder.endStation = data.data.endStation; + mCurrentOCHOrder.startStation = data.data.startStation; + mCurrentOCHOrder.travelDistance = data.data.travelDistance; + mCurrentOCHOrder.orderType = data.data.orderType; mCurrentOCHOrder.drivingRoutes = new ArrayList<>(); OCHTaxiOrderResponse.OCHTaxiStation startStation = new OCHTaxiOrderResponse.OCHTaxiStation(); - startStation.lon = data.result.startStationCoordinate.get( 0 ); - startStation.lat = data.result.startStationCoordinate.get( 1 ); - startStation.siteId = data.result.startStationId; - startStation.siteName = data.result.startStation; + startStation.lon = data.data.startStationCoordinate.get( 0 ); + startStation.lat = data.data.startStationCoordinate.get( 1 ); + startStation.siteId = data.data.startStationId; + startStation.siteName = data.data.startStation; mCurrentOCHOrder.drivingRoutes.add( startStation ); OCHTaxiOrderResponse.OCHTaxiStation endStation = new OCHTaxiOrderResponse.OCHTaxiStation(); - endStation.lon = data.result.endStationCoordinate.get( 0 ); - endStation.lat = data.result.endStationCoordinate.get( 1 ); - endStation.siteId = data.result.endStationId; - endStation.siteName = data.result.endStation; + endStation.lon = data.data.endStationCoordinate.get( 0 ); + endStation.lat = data.data.endStationCoordinate.get( 1 ); + endStation.siteId = data.data.endStationId; + endStation.siteName = data.data.endStation; mCurrentOCHOrder.drivingRoutes.add( endStation ); cacheOrderInfo2Native( mCurrentOCHOrder ); @@ -294,6 +365,47 @@ class MogoOCHTaxiModel { } }; + public void changedOperationStatus() { + if ( mOCHRHCarstatus == -1){ + querryCarStatus(); + return; + } + + if (checkCurrentOCHOrder()){ + TipToast.shortTip( "订单未完成,无法下线收车" ); + return; + } + + int status = mOCHRHCarstatus == 1 ? 0 : 1; + mOCHTaxiServiceApi.updateCarStatus(new OCHCarStatus(MoGoAiCloudClientConfig.getInstance().getSn(),status)) + .subscribeOn(Schedulers.io()) + .observeOn( AndroidSchedulers.mainThread() ) + .subscribe( new SubscribeImpl< OCHCarStatusResponse >(RequestOptions.create(mContext)) { + @Override + public void onSuccess(OCHCarStatusResponse o) { + super.onSuccess(o); + mOCHRHCarstatus = o.data.status; +// mIsWork = mOCHRHCarstatus.status == 1; +// mOCHRHCarstatus.status = status; + OCHTaxiUiController.getInstance().onOperationChanged(mOCHRHCarstatus == 1); + updateData(mOCHRHCarstatus); + Logger.d(TAG,"changeCarStatus:"+status); + } + + @Override + public void onError(Throwable e) { + super.onError(e); + Logger.d(TAG,"changeCarStatus:"+e.getMessage()); + } + + @Override + public void onError(String message, int code) { + super.onError(message, code); + Logger.d(TAG,"changeCarStatus:"+message); + } + }); + } + /** * 自车定位 */ @@ -301,12 +413,12 @@ class MogoOCHTaxiModel { @Override public void onCarLocationChanged2( Location location ) { - Logger.d( TAG, "定位已判断是否达到上车站点: 起点(%s, %s), 当前位置(%s, %s)", - mCurrentOCHOrder.drivingRoutes.get( 0 ).lon, - mCurrentOCHOrder.drivingRoutes.get( 0 ).lat, - location.getLongitude(), - location.getLatitude() - ); +// Logger.d( TAG, "定位已判断是否达到上车站点: 起点(%s, %s), 当前位置(%s, %s)", +// mCurrentOCHOrder.drivingRoutes.get( 0 ).lon, +// mCurrentOCHOrder.drivingRoutes.get( 0 ).lat, +// location.getLongitude(), +// location.getLatitude() +// ); onLocationChanged( location ); } @@ -331,9 +443,9 @@ class MogoOCHTaxiModel { if ( mIsArriveAtStartStation ) { return; } - if ( mIsUserArriveAtStartStation ) { - return; - } +// if ( mIsUserArriveAtStartStation ) { +// return; +// } judgeStartStation( location ); } @@ -392,14 +504,14 @@ class MogoOCHTaxiModel { return mIsArriveAtEndStation; } - /** - * 用户是否达到上车站点 - * - * @return - */ - public boolean isUserArriveAtStartStation() { - return mIsUserArriveAtStartStation; - } +// /** +// * 用户是否达到上车站点 +// * +// * @return +// */ +// public boolean isUserArriveAtStartStation() { +// return mIsUserArriveAtStartStation; +// } /** * 设置去往终点状态 @@ -446,7 +558,8 @@ class MogoOCHTaxiModel { if ( !isArriveAtStartStation() ) { registerCarLocationListener(); } - OCHTaxiUiController.getInstance().addFragment(); +// OCHTaxiUiController.getInstance().addFragment(); + OCHTaxiUiController.getInstance().onOrderStatusChanged(mCurrentOCHOrder.orderDispatchType); } } @@ -510,7 +623,7 @@ class MogoOCHTaxiModel { break; case UserArriveAtStartStation: mIsArriveAtStartStation = true; - mIsUserArriveAtStartStation = true; +// mIsUserArriveAtStartStation = true; OCHTaxiUiController.getInstance().onUserArriveAtStartStation(); break; default: @@ -576,11 +689,13 @@ class MogoOCHTaxiModel { if ( callback != null ) { callback.onError(); } + Logger.e(TAG,"updateOCHOrderStatus:"+e.getMessage()); } @Override public void onError( String message, int code ) { super.onError( message, code ); + Logger.e(TAG,"updateOCHOrderStatus:"+message); if ( callback != null ) { callback.onFail(); } @@ -620,6 +735,7 @@ class MogoOCHTaxiModel { @Override public void onError( String message, int code ) { super.onError( message, code ); + Logger.e("MogoOCHTaxi","queryOCHOrderStatus:"+message); if ( callback != null ) { callback.onFail(); } @@ -635,7 +751,7 @@ class MogoOCHTaxiModel { mIsArriveAtStartStation = false; mIsArriveAtEndStation = false; mIsOnTheWay2EndStation = false; - mIsUserArriveAtStartStation = false; +// mIsUserArriveAtStartStation = false; SharedPrefsMgr.getInstance( mContext ).remove( SP_KEY_OCH_TAXI_ORDER ); } @@ -646,8 +762,7 @@ class MogoOCHTaxiModel { */ public boolean checkCurrentOCHOrder() { if ( mCurrentOCHOrder != null - && mCurrentOCHOrder.drivingRoutes != null - && mCurrentOCHOrder.drivingRoutes.size() >= 2 ) { + && mCurrentOCHOrder.drivingRoutes != null) { return true; } return false; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java new file mode 100644 index 0000000000..761fa03877 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java @@ -0,0 +1,20 @@ +package com.mogo.och.taxi; + +import com.mogo.commons.data.BaseData; + +public +/** + * + * 修改/查询网约车-出租车订单状态的数据结构 + */ +class OCHCarStatus extends BaseData { + + public String sn;// 不排除本地没有缓存订单号的情况 + public int status; //0 收车 1出车 + + public OCHCarStatus(String sn, + int status ) { + this.sn = sn; + this.status = status; + } +} diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java new file mode 100644 index 0000000000..62c76e6233 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java @@ -0,0 +1,29 @@ +package com.mogo.och.taxi; + +import com.mogo.commons.data.BaseData; + +public +/** + * + * 修改/查询网约车-出租车订单状态的数据结构 + */ +class OCHCarStatusResponse extends BaseData { + + public String sn;// 不排除本地没有缓存订单号的情况 + public int status; //0 收车 1出车 + public Result data; + + public OCHCarStatusResponse(String sn, + int status ) { + this.sn = sn; + this.status = status; + } + public static class Result{ + public int id; + public String sn; + public String areaCode; + public String plateNumber; + public int status; +// String remark; + } +} diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java index 16d92726fb..d01f18014b 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java @@ -13,7 +13,7 @@ public */ class OCHTaxiOrderResponse2 extends BaseData { - public Result result; + public Result data; public static class Result { public String _id; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java index b9ef5421cf..d1fed854ac 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java @@ -23,7 +23,7 @@ interface OCHTaxiServiceApi { * @return */ @Headers( {"Content-type:application/json;charset=UTF-8"} ) - @POST( "/yycp-onlinecar-hailing/onlineCarHailing/order/updateOCHOrder/v1" ) + @POST( "/yycp-onlinecar-hailing/onlineCarHailing/order/updateOCHOrderState/v1" ) Observable< BaseData > updateOrderStatus( @Body OCHTaxiOrderStatus status ); /** @@ -32,6 +32,20 @@ interface OCHTaxiServiceApi { * @return */ @Headers( {"Content-type:application/json;charset=UTF-8"} ) - @POST( "/yycp-onlinecar-hailing/onlineCarHailing/order/queryOCHOrderDetails/v1" ) + @POST( "/yycp-onlinecar-hailing/onlineCarHailing/order/queryOrderForCar/v1" ) Observable< OCHTaxiOrderResponse2 > queryOrder( @Body OCHTaxiOrderStatus status ); + /** + * 查询网约车状态 + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) + @POST("/yycp-onlinecar-hailing/onlineCarHailing/order/queryTaxiCarStatus/v1") + Observable queryCarStatus(@Body OCHCarStatus sn ); + + + /** + * 更新网约车状态 + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) + @POST("/yycp-onlinecar-hailing/onlineCarHailing/order/updateTaxiCarStatus/v1") + Observable updateCarStatus(@Body OCHCarStatus status ); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index a8861ae85e..d78518eaad 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -8,12 +8,14 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.mogo.cloud.commons.utils.CoordinateUtils; +import com.mogo.commons.voice.AIAssist; import com.mogo.map.MogoLatLng; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; import com.mogo.och.BaseOchFragment; import com.mogo.och.taxi.IMogoADASAutoPilotStatusChangedListener; import com.mogo.och.taxi.IMogoOCHTaxiArriveCallback; +import com.mogo.och.taxi.IOperationChangedListener; import com.mogo.och.taxi.MogoOCHTaxiModel; import com.mogo.och.taxi.OCHOrderStatus; import com.mogo.och.taxi.OCHOrderStatusCallback; @@ -35,6 +37,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i IMogoStatusChangedListener, IMogoOCHTaxiArriveCallback, IMogoADASAutoPilotStatusChangedListener, + IOperationChangedListener, IMogoCarLocationChangedListener2 { public static final String TAG = "OCHTaxiFragment"; @@ -52,7 +55,6 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i private TextView mStartStationName; private TextView mEndStationName; private TextView mDistance; - @Override public int getStationPanelViewId() { return R.layout.module_och_taxi_panel; @@ -62,6 +64,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i public void restartAutopilot() { // 在自动驾驶中，才会有重新开启自动驾驶的操作 if ( MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) { + Logger.d( TAG, "restartAutopilot" ); MogoOCHTaxiModel.getInstance().startAutoPilot(); } } @@ -74,9 +77,11 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i mEndStationName = findViewById( R.id.module_och_taxi_order_end_station ); mDistance = findViewById( R.id.module_och_taxi_order_distance ); - showPanel(); +// showPanel(); + hidPanel(); initListeners(); - updateOrderStatus(); + // TODO: 2021/6/18 调整接口刷新时间 +// updateOrderStatus(); if ( MogoApisHandler.getInstance() .getApis() .getStatusManagerApi() @@ -85,8 +90,8 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } else { flatMode(); } - // 出租车不需要开启按钮 - tvOperationStatus.setVisibility(View.GONE); + + tvOperationStatus.setVisibility(View.VISIBLE); } private void initListeners() { @@ -96,6 +101,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i .registerStatusChangedListener( TAG, StatusDescriptor.VR_MODE, this ); OCHTaxiUiController.getInstance().setOCHTaxiArriveCallback( this ); OCHTaxiUiController.getInstance().setAutoPilotStatusChangedListener( this ); + OCHTaxiUiController.getInstance().setOperationChangeListener(this); MogoApisHandler.getInstance() .getApis() .getRegisterCenterApi() @@ -117,6 +123,12 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } } + @Override + protected void onChangeOperationStatus() { + super.onChangeOperationStatus(); + MogoOCHTaxiModel.getInstance().changedOperationStatus(); + } + private void vrMode() { if ( mRootView != null ) { mRootView.setVisibility( @@ -151,15 +163,17 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } else if ( MogoOCHTaxiModel.getInstance().isArriveAtStartStation() ) { Logger.d( TAG, "已经达到起点" ); mOrderStatus.setText( R.string.module_och_taxi_waiting ); - if ( MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() ) { - Logger.d( TAG, "乘客已上车" ); - slidePanelView.setVisibility( View.VISIBLE ); -// if ( MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_ENABLE ) { -// } else { -// slidePanelView.setVisibility( View.GONE ); -// } - slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) ); - } +// if ( MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() ) { +// Logger.d( TAG, "乘客已上车" ); +// slidePanelView.setVisibility( View.VISIBLE ); +//// if ( MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_ENABLE ) { +//// } else { +//// slidePanelView.setVisibility( View.GONE ); +//// } +// slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) ); +// } + slidePanelView.setVisibility( View.VISIBLE ); + slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) ); } else if ( MogoOCHTaxiModel.getInstance().checkCurrentOCHOrder() ) { Logger.d( TAG, "去往上车站点" ); slidePanelView.setVisibility( View.GONE ); @@ -247,6 +261,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i .unregisterStatusChangedListener( TAG, StatusDescriptor.VR_MODE, this ); OCHTaxiUiController.getInstance().setOCHTaxiArriveCallback( null ); OCHTaxiUiController.getInstance().setAutoPilotStatusChangedListener( null ); + OCHTaxiUiController.getInstance().setOperationChangeListener(null); MogoApisHandler.getInstance() .getApis() .getRegisterCenterApi() @@ -269,7 +284,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i Logger.d( TAG, "更新状态成功" ); MogoOCHTaxiModel.getInstance().clearCurrentOCHOrder(); MogoOCHTaxiModel.getInstance().cancelAutopilot(); - OCHTaxiUiController.getInstance().removeFragment(); + OCHTaxiUiController.getInstance().onOrderStatusChanged(0); } @Override @@ -284,8 +299,8 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } ); return; // 乘客已确认到达起点，前往下一站并开启自动驾驶 - } else if ( MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() - && !MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) { + } else if ( !MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) { +// MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() && MogoOCHTaxiModel.getInstance().startAutoPilot(); } } @@ -367,4 +382,32 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } mLocation = location; } + + @Override + public void onOperationChanged(boolean launch) { + isOperationStatus = launch; + if ( launch ) { + tvOperationStatus.setText( "收车" ); +// showSlidePanle("滑动出发"); +// showPanel(); + } else { + AIAssist.getInstance(getContext()).speakTTSVoice("已收车"); + tvOperationStatus.setText("出车"); +// hideSlidePanel(); +// hidPanel(); + } +// changeLayoutViewStatus(launch); + } + + private void changeLayoutViewStatus(boolean launch) { + getPanelView().setVisibility(launch ? View.VISIBLE : View.INVISIBLE); + } + + @Override + public void onOrderStatusChanged(int status) { + getActivity().runOnUiThread(() -> { + getPanelView().setVisibility(status != 0 ? View.VISIBLE : View.INVISIBLE); + updateOrderStatus(); + }); + } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiUiController.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiUiController.java index 3cec64867f..a7d025469a 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiUiController.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiUiController.java @@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentManager; import com.mogo.module.common.MogoApisHandler; import com.mogo.och.taxi.IMogoADASAutoPilotStatusChangedListener; import com.mogo.och.taxi.IMogoOCHTaxiArriveCallback; +import com.mogo.och.taxi.IOperationChangedListener; import com.mogo.och.taxi.MogoOCHTaxiModel; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; @@ -31,6 +32,7 @@ class OCHTaxiUiController implements IMogoOCHTaxiArriveCallback, IMogoADASAutoPi private IMogoOCHTaxiArriveCallback mOCHTaxiArriveCallback; private IMogoADASAutoPilotStatusChangedListener mAutoPilotStatusChangedListener; + private IOperationChangedListener mOperationChangedLisnter; private OCHTaxiUiController() { } @@ -101,6 +103,10 @@ class OCHTaxiUiController implements IMogoOCHTaxiArriveCallback, IMogoADASAutoPi this.mAutoPilotStatusChangedListener = autoPilotStatusChangedListener; } + public void setOperationChangeListener(IOperationChangedListener listener){ + this.mOperationChangedLisnter = listener; + } + @Override public void onTheWay2StartStation() { runOnUIThread( () -> { @@ -167,6 +173,8 @@ class OCHTaxiUiController implements IMogoOCHTaxiArriveCallback, IMogoADASAutoPi } + + /** * 进入鹰眼模式，设置手势缩放地图失效 */ @@ -178,4 +186,19 @@ class OCHTaxiUiController implements IMogoOCHTaxiArriveCallback, IMogoADASAutoPi .getMapUIController() .openVrMode( false ); } + + public void onOperationChanged(boolean b) { + runOnUIThread( () -> { + if (mOperationChangedLisnter != null){ + mOperationChangedLisnter.onOperationChanged(b); + } + } ); + } + public void onOrderStatusChanged(int status){ + runOnUIThread( () -> { + if (mOperationChangedLisnter != null){ + mOperationChangedLisnter.onOrderStatusChanged(status); + } + } ); + } } diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml index 184f70bcd8..a9ccf96c3e 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml @@ -2,6 +2,7 @@ diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml index 8e162d85e5..7c13d7dcbd 100644 --- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -24,5 +24,5 @@ 32px 36px 17px - 31.5 + 31.5px \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java index ab0aa03504..d673a53dbe 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java @@ -43,7 +43,7 @@ public abstract class SubscribeImpl< T extends BaseData > implements Observer< T @Override public void onNext( T o ) { if ( o != null ) { - if ( o.code != 0 ) { + if ( o.code != 0 && o.code!= 200 ) { onError( o.msg, o.code ); } else { onSuccess( o );