From a60e69ad64ced23340f8d072338f217c0fca0737 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 21 Jan 2021 19:12:24 +0800 Subject: [PATCH] opt --- .idea/gradle.xml | 1 - OCH/mogo-och-taxi/build.gradle | 1 + .../och/taxi/IMogoOCHTaxiArriveCallback.java | 2 + .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 38 ++++- .../mogo/och/taxi/ui/OCHTaxiUiController.java | 5 + .../module_och_taxi_blue_dot.png | Bin 0 -> 828 bytes .../module_och_taxi_dot_line.png | Bin 0 -> 323 bytes .../module_och_taxi_green_dot.png | Bin 0 -> 850 bytes .../drawable/module_och_taxi_panel_bkg.xml | 21 +++ .../module_och_taxi_panel_distance_bkg.xml | 12 ++ .../main/res/layout/module_och_taxi_panel.xml | 152 ++++++++++++++++-- .../src/main/res/values-xhdpi/dimens.xml | 5 + .../src/main/res/values/colors.xml | 4 + .../common/entity/CloudLocationInfo.java | 88 +++++----- 14 files changed, 266 insertions(+), 63 deletions(-) create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/values-xhdpi/dimens.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/values/colors.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 740794bd48..771c1f74d7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -89,7 +89,6 @@ diff --git a/OCH/mogo-och-taxi/build.gradle b/OCH/mogo-och-taxi/build.gradle index dad79886c1..8a55d2b6af 100644 --- a/OCH/mogo-och-taxi/build.gradle +++ b/OCH/mogo-och-taxi/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.androidxconstraintlayout if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogooch diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCHTaxiArriveCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCHTaxiArriveCallback.java index 349f4baf89..1832059020 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCHTaxiArriveCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCHTaxiArriveCallback.java @@ -9,6 +9,8 @@ public */ interface IMogoOCHTaxiArriveCallback { + void onTheWay2StartStation(); + /** * 到达起始站 */ 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 341119683a..231b02e613 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 @@ -2,6 +2,7 @@ package com.mogo.och.taxi.ui; import android.os.Bundle; import android.view.View; +import android.widget.TextView; import androidx.annotation.NonNull; @@ -38,6 +39,11 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i return fragment; } + private TextView mOrderStatus; + private TextView mStartStationName; + private TextView mEndStationName; + private TextView mDistance; + @Override public int getStationPanelViewId() { return R.layout.module_och_taxi_panel; @@ -46,6 +52,11 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i @Override protected void initViews() { super.initViews(); + mOrderStatus = findViewById( R.id.module_och_taxi_order_status ); + mStartStationName = findViewById( R.id.module_och_taxi_order_start_station ); + mEndStationName = findViewById( R.id.module_och_taxi_order_end_station ); + mDistance = findViewById( R.id.module_och_taxi_order_distance ); + if ( MogoApisHandler.getInstance() .getApis() .getStatusManagerApi() @@ -90,22 +101,29 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } private void initOrderStatus() { + if ( MogoOCHTaxiModel.getInstance().checkCurrentOCHOrder() ) { + mStartStationName.setText( MogoOCHTaxiModel.getInstance().getCurrentOCHOrder().startStation ); + mEndStationName.setText( MogoOCHTaxiModel.getInstance().getCurrentOCHOrder().endStation ); + mDistance.setText( MogoOCHTaxiModel.getInstance().getCurrentOCHOrder().travelDistance + " km" ); + } if ( MogoOCHTaxiModel.getInstance().isArriveAtEndStation() ) { Logger.d( TAG, "已经达到终点" ); slidePanelView.setVisibility( View.VISIBLE ); slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_end_station ) ); - return; - } - if ( MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) { + mOrderStatus.setText( "已到达乘客下车地点" ); + } else if ( MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) { Logger.d( TAG, "已经去往终点" ); slidePanelView.setVisibility( View.GONE ); - return; - } - if ( MogoOCHTaxiModel.getInstance().isArriveAtStartStation() ) { + mOrderStatus.setText( "去往下车地点" ); + } else if ( MogoOCHTaxiModel.getInstance().isArriveAtStartStation() ) { Logger.d( TAG, "已经达到起点" ); slidePanelView.setVisibility( View.VISIBLE ); slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) ); - return; + mOrderStatus.setText( "已到达上车地点，等待乘客上车" ); + } else if ( MogoOCHTaxiModel.getInstance().checkCurrentOCHOrder() ) { + Logger.d( TAG, "去往上车站点" ); + slidePanelView.setVisibility( View.GONE ); + mOrderStatus.setText( "收到新订单，正在前往上车地点" ); } } @@ -115,6 +133,12 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i initOrderStatus(); } + @Override + public void onTheWay2StartStation() { + Logger.d( TAG, "去往上车站点" ); + initOrderStatus(); + } + @Override public void onArriveAtEndStation() { Logger.d( TAG, "通知达到终点" ); 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 c29568768c..6b696fef07 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 @@ -94,6 +94,11 @@ class OCHTaxiUiController implements IMogoOCHTaxiArriveCallback { this.mOCHTaxiArriveCallback = OCHTaxiArriveCallback; } + @Override + public void onTheWay2StartStation() { + + } + @Override public void onArriveAtStartStation() { runOnUIThread( () -> { diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png new file mode 100644 index 0000000000000000000000000000000000000000..e1fd463963f85f911b0e9447d663c9770c4f6617 GIT binary patch literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~m(&Q)G+$o^ zEg+kNfw4W4fd!-lh^2s-fq{7eBLg##W(0{XV1mnvEMP{kK?*nB{qUE8foYkii(`m| zVC|H%*}{ne$G&Ud_Vr1w?g&^bw`4)w-mriVdXF|P(70uPsNUh@8&`qAH%Ge@ULRe( zU=h1*=tpIatr<#Do?!P&SZN{%Rr#D@) zIgq_3ySgis<9&~#tDwiR1&dlYsCQ>+wM__Le|;}=zg^7tW$F6SedU)#R2QFLJooKX z`*45zjP19TPclj+xP@4+o}taX^su?S-0FFIOYVPaHV)G&-8M~fQ7Z4R^=0vPvHwbc z-{L>X!@BW+&+4hWZ1;z)W-abFzn)_sapvXkT_pm0^WrS46nPGNaIrBJi*URw$*F&J zVXgV;I3b-~LC?PBuKploU3soz<;=-Z7EC+b+*v=WG%v8)pTaF@5g1jGB(*~Q+bZ{I z51zyWyhK_adH^oE8?oG_7TJ$st~Iiwdr$+~qstj-A=ES?0B;NM6U|R0+c(7Gbg4+V6*A z+AQ^VPPt=!aeu`1>L6>!Y5bxoEbDCZ*2Kj0-acEJ_o;qCTa<<6^_=Fy?zdhsUXzZz z-+FETnRD~41BpASDmjY+nLmVsX}6#+4lXm_1`|8{8_zsty^%GbyKXP|AF%cp^DqiZPw&o z#%gSt^+=m3zQK_7vVmw)f_sC4{lS*>!}l0vD@;rd{&-epp8QN4LQe?Gua+L z?-IC>+>r7wv}nDPn@^Fe;>R5;H7rFhm#VIw@vQehcTKVAY^hGmAE1=$>FVdQ&MBb@ E08IvEV*mgE literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png new file mode 100644 index 0000000000000000000000000000000000000000..186001352c82bb9ad01ac4c1556c3b1e0f551dda GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^Oh9bI!3HFKj%EJ@QjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d~(Q&b9$5{LHz_7f7x3ba4#P z5KZ1%-o0L#n{r)6q;u;dN8?mF!s!=Ufy&zF_GaV6H`Z{09(KZ z{)h<*2Vd+jo~eJrZ$sGx&jRMihI2|QT6Y43?sRmT(vnCofiAP>uRWDh|2#1@(MeIb`>i}1r{un-Wbcl zx?RsjfMxa81x{;jBuHh?u6vUGu40~X@iB+JAD+#rem?K{zVFKWzW;xA+F((nPt`o} z<(wCbewQU|YV6o4C@In)J<-v)KtX=3Bu_xV+OTG0{q=V>LXNGksC$xm&k2 z=zqcMpXD>{1x|*u9^0{yQAK~s>8D9=4_(<~FLs8ZE5*t%>?hOIm30Qemi1Zlc3xSs zHH)ufXY%idH^swW*Gc%ymUeh$z`ENp=fca!9^b6--R&6lf+ zg6URzJ8QK=yfy=MpW5WTu=(qv>HKPdI;EHIY*5jf!JTx5UoAKxd{M*)rOjD< z&UasNbnJ69IVD)I{)yp*`slFsKNoJ;SMJ+>GyBH0uW#P)T%IvU^LF1}$L04IsI6^X zD3Ek*+r9r0UgvZyop%fDe!51VuRQG9v`vRh4BIQ7H@clRpRZdsdv0p2UX|g?X_vc= zuI~*?|9Sh)W!J1rQFrajHox_XD>&Etw&w5FD9hS6E%7|7JB=Hy^i&(an{Bf)&thZe81bwN-z+ z{N2~Jzf1=);T3K0RXMoYA^r* literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml new file mode 100644 index 0000000000..d6aa33cbcd --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml new file mode 100644 index 0000000000..998e8eeaaf --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file 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 30ea93e8e1..20eacb3fbd 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 @@ -1,27 +1,147 @@ + android:layout_marginLeft="30px" + android:layout_marginTop="24px" + android:text="已到达上车站点，等待乘客上车" + android:textColor="@color/module_och_order_status_textColor" + android:textSize="24px" + android:textStyle="bold" /> -