From b18b332874806d3fd262ea75ef8e99be487601d8 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 20 Jul 2022 19:45:01 +0800 Subject: [PATCH] =?UTF-8?q?[140=20bus=E4=B9=98=E5=AE=A2=E5=B1=8F]=201?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E5=85=A8=E8=A7=88=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=202=E3=80=81UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/assets/map_style.data | Bin 60420 -> 58605 bytes .../src/main/assets/map_style_extra.data | Bin 7070 -> 8926 bytes .../passenger/model/BusPassengerModel.java | 12 ++--- .../presenter/BaseBusPassengerPresenter.java | 2 +- .../ui/BusPassengerBaseFragment.java | 21 ++++++++ .../ui/BusPassengerMapDirectionView.java | 32 ++++++------ .../drawable-sw320dp-xhdpi/station_arrow.png | Bin 0 -> 594 bytes .../main/res/drawable-xhdpi/station_arrow.png | Bin 0 -> 594 bytes .../main/res/layout/bus_p_base_fragment.xml | 3 +- .../src/main/res/values-sw320dp/dimens.xml | 2 +- .../src/main/res/values/dimens.xml | 2 +- .../model/TaxiPassengerModelLoopManager.java | 46 +++++++++++++---- .../ui/TaxiPassengerBaseFragment.java | 2 +- .../och/taxi/model/TaxiModelLoopManager.java | 47 ++++++++++++++---- 14 files changed, 122 insertions(+), 47 deletions(-) mode change 100644 => 100755 OCH/mogo-och-bus-passenger/src/main/assets/map_style.data mode change 100644 => 100755 OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/station_arrow.png create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/station_arrow.png diff --git a/OCH/mogo-och-bus-passenger/src/main/assets/map_style.data b/OCH/mogo-och-bus-passenger/src/main/assets/map_style.data old mode 100644 new mode 100755 index 2be43925c74e2465c7e40b7ff5f66ea2011afa48..4deed98e6a1ae45541c64b288d21f5a77c712730 GIT binary patch literal 58605 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 literal 60420 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 diff --git a/OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data b/OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data old mode 100644 new mode 100755 index 6a172a62e5b64829bc0239599b2dbee18d5528a0..a3c0811e86a6f11f16ca16fc136a8c0f69b87092 GIT binary patch delta 8779 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 colorList = new ArrayList<>(); - List textureList = new ArrayList<>(); - List texIndexList = new ArrayList<>(); + private List colorList = new ArrayList<>(); +// List textureList = new ArrayList<>(); +// List texIndexList = new ArrayList<>(); private int mHaveArrivedIndex = 0; private List mLineMarkers = new ArrayList<>(); @@ -232,9 +232,9 @@ public class BusPassengerMapDirectionView polylineOptions.useGradient(true); polylineOptions.width(10); //线段宽度 polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound); - polylineOptions.setCustomTextureList(textureList); - polylineOptions.setCustomTextureIndex(texIndexList); -// polylineOptions.colorValues(colorList); +// polylineOptions.setCustomTextureList(textureList); +// polylineOptions.setCustomTextureIndex(texIndexList); + polylineOptions.colorValues(colorList); // polylineOptions.setCustomTexture(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow)); // 绘制线 @@ -248,16 +248,18 @@ public class BusPassengerMapDirectionView * 添加画线颜色值 */ private void addRouteColorList() { - for (int i = 0 ; i < mHaveArrivedIndex; i++){ - textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow)); - texIndexList.add(i); +// for (int i = 0 ; i < mHaveArrivedIndex; i++){ +// textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow)); +// texIndexList.add(i); +// } +// +// for (int i = mHaveArrivedIndex; i < mCoordinatesLatLng.size(); i++){ +// textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow)); +// texIndexList.add(i); +// } + for (int i = 0; i < mCoordinatesLatLng.size(); i++) { + colorList.add(Color.argb(255, 70, 147, 253));//路线颜色 } - - for (int i = mHaveArrivedIndex; i < mCoordinatesLatLng.size(); i++){ - textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow)); - texIndexList.add(i); - } - } @Override diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/station_arrow.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/station_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..114c7a2ba7d9ee76a60ea706d225fa0fab31cb03 GIT binary patch literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz7!3HF2?ytWAq!^2X+?^QKos)S9qzoXL_NwQ^z7 zwch#blMVE*D6|CMn7evQVdMs;(13q7CJ9XkX1MRHIbK+QgKI*?@$ajg?-Zqb9n9^& za4R%$-@SEOa}$${+dszbd-@|}!`;wz8bvpk7##~-JLmJd`fmSeA(y*KZpmugnGqUN zDb4Tye9nw-9-gHe%@ZaIyt%fauF+~%?23X($^TU3S!2#_{+A}!z}s?fgZanGt!6n4 z3A}H9-ZywOqhC6m&qQc$;*p&e87*feW;p-&ajlJAB*QIZhr^-M0*xU}i{9{aM=%t2 zY>6o=P*CLEo;=AcU(ZD{_fg{66&#|1mp*B3-XEI4)|K13<;`YEwP$~q`h+lQu)RMb z<9a)h>4tv`t47w0Ew6bdi0=z}ZRk`e`l5CH!6h=zTO5}t)-4E{EFQOOt6rD&(|w2A zcx04TUDGSOk$s}-)Tv!@FD5OV!JYpwPmS@CzQX!>-->v>vSuyX>HfIEPJRCY!M+Wy S8>d_b#iysMpUXO@geCx4VedNt literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/station_arrow.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/station_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..114c7a2ba7d9ee76a60ea706d225fa0fab31cb03 GIT binary patch literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz7!3HF2?ytWAq!^2X+?^QKos)S9qzoXL_NwQ^z7 zwch#blMVE*D6|CMn7evQVdMs;(13q7CJ9XkX1MRHIbK+QgKI*?@$ajg?-Zqb9n9^& za4R%$-@SEOa}$${+dszbd-@|}!`;wz8bvpk7##~-JLmJd`fmSeA(y*KZpmugnGqUN zDb4Tye9nw-9-gHe%@ZaIyt%fauF+~%?23X($^TU3S!2#_{+A}!z}s?fgZanGt!6n4 z3A}H9-ZywOqhC6m&qQc$;*p&e87*feW;p-&ajlJAB*QIZhr^-M0*xU}i{9{aM=%t2 zY>6o=P*CLEo;=AcU(ZD{_fg{66&#|1mp*B3-XEI4)|K13<;`YEwP$~q`h+lQu)RMb z<9a)h>4tv`t47w0Ew6bdi0=z}ZRk`e`l5CH!6h=zTO5}t)-4E{EFQOOt6rD&(|w2A zcx04TUDGSOk$s}-)Tv!@FD5OV!JYpwPmS@CzQX!>-->v>vSuyX>HfIEPJRCY!M+Wy S8>d_b#iysMpUXO@geCx4VedNt literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index d16730cb71..177cea6b79 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -81,7 +81,8 @@ app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_name" app:layout_constraintBottom_toBottomOf="@+id/bus_p_cur_station_name" app:layout_constraintRight_toLeftOf="@+id/bus_p_cur_station_name" - android:layout_marginRight="8dp"> + android:layout_marginRight="@dimen/dp_10" + android:src="@drawable/station_arrow"> diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml index a3ceb619eb..8fac096ef4 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml @@ -50,7 +50,7 @@ 685px 309px 50px - 38px + 10px 44px 55px 40px diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml index c32aec9eff..d4bfe96b27 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml @@ -51,7 +51,7 @@ 638px 316px 38px - 38px + 10px 44px 55px 40px diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java index 30be0829b1..115ce91022 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java @@ -8,8 +8,12 @@ import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst; import java.util.concurrent.TimeUnit; import io.reactivex.Observable; +import io.reactivex.ObservableEmitter; +import io.reactivex.ObservableOnSubscribe; import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; +import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; /** @@ -31,8 +35,8 @@ public class TaxiPassengerModelLoopManager { private Disposable mInAndWaitServiceDisposable; //进行中、待服务订单列表轮询 private Disposable mQueryOrderRemainingDisposable; //心跳轮询 - private Disposable mRouteWipeDisposable; //轨迹擦除 - private Disposable mReadyToAutopilotDisposable; //轨迹擦除 + private CompositeDisposable mRouteWipeDisposable; //轨迹擦除 + private Disposable mReadyToAutopilotDisposable; //轮询是否可开启自动驾驶 public void startReadyToAutopilot() { if (mReadyToAutopilotDisposable != null && !mReadyToAutopilotDisposable.isDisposed()) { @@ -56,23 +60,45 @@ public class TaxiPassengerModelLoopManager { } public void startRouteAndWipe() { - if (mRouteWipeDisposable != null && !mRouteWipeDisposable.isDisposed()) { - return; - } CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startRouteAndWipe()"); - mRouteWipeDisposable = Observable.interval(TaxiPassengerConst.LOOP_DELAY, - TaxiPassengerConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) - .map((aLong -> aLong + 1)) + Disposable disposable = startLoopRouteAndWipe() + .doOnSubscribe(new Consumer() { + @Override + public void accept(Disposable disposable) throws Exception { + + } + }).doOnError(new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + } + }) + .delay(TaxiPassengerConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS, true) // 设置delayError为true，表示出现错误的时候也需要延迟5s进行通知，达到无论是请求正常还是请求失败，都是5s后重新订阅，即重新请求。 .subscribeOn(Schedulers.io()) + .repeat() // repeat保证请求成功后能够重新订阅。 + .retry() // retry保证请求失败后能重新订阅 .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> TaxiPassengerModel.getInstance().loopRouteAndWipe()); + .subscribe(new Consumer() { + @Override + public void accept(Integer integer) throws Exception { + } + }); + mRouteWipeDisposable.add(disposable); + } + + public Observable startLoopRouteAndWipe(){ + return Observable.create(new ObservableOnSubscribe() { + @Override + public void subscribe(ObservableEmitter emitter) throws Exception { + TaxiPassengerModel.getInstance().loopRouteAndWipe(); + emitter.onComplete(); + } + }); } public void stopRouteAndWipe() { if (mRouteWipeDisposable != null) { CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopRouteAndWipe()"); mRouteWipeDisposable.dispose(); - mRouteWipeDisposable = null; } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index 8c20c113b0..1c0829b359 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -179,7 +179,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment aLong + 1)) + + Disposable disposable = loopDynamicCalculateRouteInfo() + .doOnSubscribe(new Consumer() { + @Override + public void accept(Disposable disposable) throws Exception { + + } + }).doOnError(new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + } + }) + .delay(TaxiConst.LOOP_CALCULATEROUTE_2S, TimeUnit.MILLISECONDS, true) // 设置delayError为true，表示出现错误的时候也需要延迟5s进行通知，达到无论是请求正常还是请求失败，都是5s后重新订阅，即重新请求。 .subscribeOn(Schedulers.io()) + .repeat() // repeat保证请求成功后能够重新订阅。 + .retry() // retry保证请求失败后能重新订阅 .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> TaxiModel.getInstance().dynamicCalculateRouteInfo()); + .subscribe(new Consumer() { + @Override + public void accept(Integer integer) throws Exception { + } + }); + mCalculateRouteDisposable.add(disposable); + } + + private Observable loopDynamicCalculateRouteInfo(){ + return Observable.create(new ObservableOnSubscribe() { + @Override + public void subscribe(ObservableEmitter emitter) throws Exception { + if (emitter.isDisposed()) return; + TaxiModel.getInstance().dynamicCalculateRouteInfo(); + emitter.onComplete(); + } + }); } public void stopCalculateRouteInfLoop() { if (mCalculateRouteDisposable != null) { CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopCalculateRouteInfLoop()"); mCalculateRouteDisposable.dispose(); - mCalculateRouteDisposable = null; } } }