From 38c439830d4c5cc953b309de1781427bd72a10e6 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 20 Sep 2022 19:48:39 +0800 Subject: [PATCH] =?UTF-8?q?[2.11.0]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E9=9D=A2=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/bean/BusRoutesResult.java | 6 + .../callback/IRefreshBusStationsCallback.java | 8 +- .../mogo/och/bus/fragment/BusFragment.java | 313 ++++++++++++------ .../com/mogo/och/bus/model/BusOrderModel.java | 104 ++++-- .../mogo/och/bus/presenter/BusPresenter.java | 36 +- .../mogo/och/bus/ui/BusStationCommonItem.kt | 65 ++++ .../bus_no_line_icon.png | Bin 0 -> 13534 bytes .../icon_arrow_blue_bus.png | Bin 0 -> 377 bytes .../icon_arrow_green_bus.png | Bin 0 -> 400 bytes .../icon_arrow_grey_bus.png | Bin 0 -> 402 bytes .../icon_no_bus_line.png | Bin 0 -> 13534 bytes .../icon_point_blue_bus.png | Bin 0 -> 1427 bytes .../icon_point_green_bus.png | Bin 0 -> 3797 bytes .../icon_point_grey_bus.png | Bin 0 -> 1580 bytes .../bus_no_line_icon.png | Bin 0 -> 13534 bytes .../icon_arrow_blue_bus.png | Bin 0 -> 377 bytes .../icon_arrow_green_bus.png | Bin 0 -> 400 bytes .../icon_arrow_grey_bus.png | Bin 0 -> 402 bytes .../icon_no_bus_line.png | Bin 0 -> 13534 bytes .../icon_point_blue_bus.png | Bin 0 -> 1427 bytes .../icon_point_green_bus.png | Bin 0 -> 3797 bytes .../icon_point_grey_bus.png | Bin 0 -> 1580 bytes .../res/drawable-xhdpi/bus_no_line_icon.png | Bin 0 -> 13534 bytes .../drawable-xhdpi/icon_arrow_blue_bus.png | Bin 0 -> 377 bytes .../drawable-xhdpi/icon_arrow_green_bus.png | Bin 0 -> 400 bytes .../drawable-xhdpi/icon_arrow_grey_bus.png | Bin 0 -> 402 bytes .../res/drawable-xhdpi/icon_no_bus_line.png | Bin 0 -> 13534 bytes .../drawable-xhdpi/icon_point_blue_bus.png | Bin 0 -> 1427 bytes .../drawable-xhdpi/icon_point_green_bus.png | Bin 0 -> 3797 bytes .../drawable-xhdpi/icon_point_grey_bus.png | Bin 0 -> 1580 bytes .../main/res/drawable/bus_task_time_bg.xml | 6 + .../src/main/res/layout/bus_no_line_view.xml | 28 ++ .../res/layout/bus_stations_common_item.xml | 54 +++ .../src/main/res/layout/fragment_och_bus.xml | 162 ++++----- .../res/values-xhdpi-2560x1440/dimens.xml | 3 +- .../res/values-xhdpi-2560x1600/dimens.xml | 3 +- .../src/main/res/values/colors.xml | 4 + .../src/main/res/values/dimens.xml | 2 + .../src/main/res/values/strings.xml | 8 + .../common/module/wigets/OCHCommitDialog.kt | 95 ++++++ .../wigets/OCHRoundConstraintLayout.java | 165 +++++++++ .../src/main/res/layout/dialog_bus_commit.xml | 82 +++++ .../src/main/res/values/colors.xml | 4 + .../src/main/res/values/styles.xml | 16 + 44 files changed, 928 insertions(+), 236 deletions(-) create mode 100644 OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_no_line_icon.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_blue_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_green_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_grey_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_no_bus_line.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_blue_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_green_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_grey_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_no_line_icon.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_blue_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_green_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_grey_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_no_bus_line.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_blue_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_green_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_grey_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_no_line_icon.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_no_bus_line.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_blue_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_green_bus.png create mode 100755 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_grey_bus.png create mode 100644 OCH/mogo-och-bus/src/main/res/drawable/bus_task_time_bg.xml create mode 100644 OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml create mode 100644 OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java create mode 100644 OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml create mode 100644 OCH/mogo-och-common-module/src/main/res/values/colors.xml create mode 100644 OCH/mogo-och-common-module/src/main/res/values/styles.xml diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java index ba188d3bee..485c68f0ec 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java @@ -14,6 +14,7 @@ public class BusRoutesResult { private int lineType; //线路类型，0:环形 private String description; private int status; + private long taskTime; //线路时间班次 //线路轨迹相关字段 public String csvFileUrl = ""; //轨迹文件下载的cos url，默认“” @@ -44,12 +45,17 @@ public class BusRoutesResult { this.sites = sites; } + public long getTaskTime() { + return taskTime; + } + @Override public String toString() { return "BusRoutesResult{" + "sites=" + sites + ", lineId=" + lineId + ", name='" + name + '\'' + + ", taskTime='" + taskTime + '\'' + ", lineType=" + lineType + ", description='" + description + '\'' + ", status=" + status + diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java index 40ea27c44a..758fd4b0bf 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java @@ -9,6 +9,12 @@ import java.util.List; * @date: 2021/10/22 */ public interface IRefreshBusStationsCallback { - void refreshBusStations(String lineName,List stationList, int currentStation, int nextStation, boolean isArrived); + void updateBusTaskStatus(String lineName,String lintTime, + List stationList, + int arrivingOrArrivedIndex, + boolean isArrived); + void clearBusStationsMarkers(); + + void updateEmptyUi(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 7278755f1a..62fd42cd80 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -7,6 +7,8 @@ import android.view.View; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.Group; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.voice.AIAssist; @@ -25,17 +27,17 @@ import com.mogo.och.bus.R; import com.mogo.och.bus.bean.BusStationBean; import com.mogo.och.bus.constant.BusConst; import com.mogo.och.bus.presenter.BusPresenter; +import com.mogo.och.bus.ui.BusStationCommonItem; import com.mogo.och.bus.ui.BusSwitchLineActivity; import com.mogo.och.bus.view.SlidePanelView; import com.mogo.och.common.module.utils.OCHThreadPoolManager; +import com.mogo.och.common.module.wigets.OCHCommitDialog; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.List; -import mogo.telematics.pad.MessagePad; - /** * 网约车小巴界面 @@ -46,18 +48,24 @@ public class BusFragment extends BaseBusTabFragment implements SlidePanelView.OnSlidePanelMoveToEndListener, View.OnClickListener { private static final String TAG = "BusFragment"; - private TextView mCurrentStationName; - private TextView mNextStationName; - private TextView mCurrentTag; - private TextView mNextTag; +// private TextView mCurrentStationName; +// private TextView mNextStationName; +// private TextView mCurrentTag; +// private TextView mNextTag; private TextView mSwitchLine; //切换路线 private TextView mLineName; - private int mCurrentStation = 0; + private TextView mTaskTime; + private Group groupStationsPanel; + private ConstraintLayout noDataView; +// private int mCurrentStation = 0; // private View mBus; private BusStationBean startStation = null; private BusStationBean endStation = null; + private BusStationCommonItem firstStationItem; + private BusStationCommonItem secondStationItem; + private BusStationCommonItem thirdStationItem; @Override public String getTagName() { @@ -67,22 +75,20 @@ public class BusFragment extends BaseBusTabFragment @Override protected void initViews() { super.initViews(); -// mBus = findViewById(R.id.module_och_bus_tag); - mCurrentStationName = findViewById(R.id.module_och_bus_current_station); - mCurrentTag = findViewById(R.id.module_och_bus_current_station_anchor); - mNextStationName = findViewById(R.id.module_och_bus_order_end_station); - mNextTag = findViewById(R.id.module_och_bus_next_station_anchor); +// mCurrentStationName = findViewById(R.id.module_och_bus_current_station); +// mCurrentTag = findViewById(R.id.module_och_bus_current_station_anchor); +// mNextStationName = findViewById(R.id.module_och_bus_order_end_station); +// mNextTag = findViewById(R.id.module_och_bus_next_station_anchor); mSwitchLine = findViewById(R.id.switch_line_btn); mSwitchLine.setTag(0); mLineName = findViewById(R.id.module_och_bus_line_name); - //调用测试面板 - mCurrentStationName.setOnLongClickListener(v -> { - debugTestBar(); - showHideTestBar(); - return true; - }); -// } + firstStationItem = findViewById(R.id.bus_panel_first_station); + secondStationItem = findViewById(R.id.bus_panel_second_station); + thirdStationItem = findViewById(R.id.bus_panel_third_station); + mTaskTime = findViewById(R.id.bus_task_time_tv); + groupStationsPanel = findViewById(R.id.group_stations_panel); + noDataView = findViewById(R.id.no_line_data_view); CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()); // 初始化的时候设置 UI 按钮状态 @@ -122,78 +128,64 @@ public class BusFragment extends BaseBusTabFragment super.onResume(); } - /** - * 根据站点列表信息刷新车站面板，滑块面板 - * - * @param stationList 车站列表信息 - * @param currentStation 当前站点 - * @param nextStation 下个站点 - * @param isArrived 是否都站 - */ - public void refreshBusStations(String lineName,List stationList - , int currentStation, int nextStation, boolean isArrived) { - mCurrentStation = currentStation; + public void hideStationsPanel(){ + groupStationsPanel.setVisibility(View.GONE); + noDataView.setVisibility(View.VISIBLE); + } + + public void showStationsPanel(){ + groupStationsPanel.setVisibility(View.VISIBLE); + noDataView.setVisibility(View.GONE); + } + + public void updateLineEmptyUI(){ + hideStationsPanel(); + } + + public void updateBusTaskStatus(String lineName, String lineTime, + List stationList, + int arrivingOrArrivedIndex, + boolean isArrived){ + if (getActivity() == null) { return; } + getActivity().runOnUiThread(() -> { if (stationList == null) { // 获取小巴数据失败 return; } + showStationsPanel(); + + mLineName.setText(lineName); + mTaskTime.setText(getString(R.string.bus_line_time_tag)+ lineTime); // 渲染小巴路线数据 - renderCurrentStationStatus(lineName,stationList, currentStation, nextStation, isArrived); + updateBusStationStatus(stationList,arrivingOrArrivedIndex,isArrived); }); } - /** - * 重新刷新站点信息 isArrived 是否到站 - */ - private void renderCurrentStationStatus(String lineName,List stationList, int currentStation - , int nextStation, boolean isArrived) { - CallerLogger.INSTANCE.d(M_BUS + "MapMaker ", "currentStation=" + currentStation + ",nextStation=" + nextStation + "isArrived=" + isArrived); - String currentStationName = null; - String nextStationName = null; - - boolean isArriveEndStation = false; - boolean isArriveAtStation = false; - boolean isArriveAtStartStation = false; - - mLineName.setText(lineName); - - // 获取当前站点的名称 - currentStationName = stationList.get(currentStation).getName(); + private void updateBusStationStatus(List stationList, + int arrivingOrArrivedIndex, + boolean isArrived) { startStation = stationList.get(0); endStation = stationList.get(stationList.size() - 1); - // 是否到达起点 - if (currentStation == 0) { - isArriveAtStartStation = true; - mCurrentTag.setText(getResources().getString(R.string.bus_arrive_to_end_start)); + //切换路线和结束路线按钮切换 + if (arrivingOrArrivedIndex == 0 && isArrived){ + showOrHideSwitchLineBtn(true); + }else { + showOrHideSwitchLineBtn(false); + } + if (arrivingOrArrivedIndex == 0){ setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER, startStation.getLat() , startStation.getLon(),R.raw.star_marker); setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat() , endStation.getLon(),R.raw.end_marker); - } else if (currentStation > 0 && currentStation < stationList.size() - 1) {// 是否到达站点 - isArriveAtStation = true; - mCurrentTag.setText(getResources().getString(R.string.bus_arrive_to_current_tag)); - mNextTag.setText(getResources().getString(R.string.bus_arrive_to_next_tag)); - - setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() - , startStation.getLon(),R.raw.star_marker); - setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat() - , endStation.getLon(),R.raw.end_marker); - } else if (currentStation == stationList.size() - 1) {// 是否到达终点 - isArriveEndStation = true; - nextStationName = "--"; - mNextTag.setText(getResources().getString(R.string.bus_arrive_to_end_end)); - - setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() - , startStation.getLon(),R.raw.star_marker); - + }else if (arrivingOrArrivedIndex == stationList.size() - 1){ if (isArrived) { setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat() , endStation.getLon(),R.raw.end_marker); @@ -201,47 +193,158 @@ public class BusFragment extends BaseBusTabFragment setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat() , endStation.getLon(),R.raw.end_marker); } - } - - // 获取下一站点名称 - if (nextStation > currentStation && nextStation <= stationList.size() - 1) { - nextStationName = stationList.get(nextStation).getName(); - } - - // 是否到达终点 - if ( nextStation == stationList.size() - 1 || nextStation == -1) { - mNextTag.setText(getResources().getString(R.string.bus_arrive_to_end_end)); }else { - mNextTag.setText(getResources().getString(R.string.bus_arrive_to_next_tag)); - } - - if (currentStation == 0 && isArrived){ - showOrHideSwitchLineBtn(true); - }else { - showOrHideSwitchLineBtn(false); + setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() + , startStation.getLon(),R.raw.star_marker); + setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat() + , endStation.getLon(),R.raw.end_marker); } // 重置滑动按钮文字 - if (isArriveEndStation) { + if (arrivingOrArrivedIndex == stationList.size() -1 && isArrived) { showSlidePanle("单程结束"); - } else if (isArriveAtStartStation) { - showSlidePanle("滑动出发"); - } else if (isArriveAtStation) { + } else if (isArrived){ showSlidePanle("滑动出发"); } - mCurrentStationName.setText(currentStationName); - mNextStationName.setText(nextStationName); + if (stationList.size() > 2){ //只有两个站点 + updateMoreThanTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived); + }else { + updateTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived); + } + updateBusTestBarInfo(); } + /** + * 有两个以上站点的路线 + * @param stationList + * @param arrivingOrArrivedIndex + * @param isArrived + */ + private void updateMoreThanTwoStationsUI(List stationList, + int arrivingOrArrivedIndex, + boolean isArrived) { + secondStationItem.setStationTag(""); + thirdStationItem.setStationTag(""); + secondStationItem.setVisibility(View.VISIBLE); + thirdStationItem.showOrHideStationArrowBg(false); + + if (arrivingOrArrivedIndex == 0){ + firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start)); + } + if (arrivingOrArrivedIndex + 1 == stationList.size() - 1 + || arrivingOrArrivedIndex + 2 == stationList.size() - 1){ //确认是否显示 "终" + thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end)); + } + + //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 + if (arrivingOrArrivedIndex == 0 && isArrived){ + firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); + secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); + thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); + + firstStationItem.setStationName(stationList.get(0).getName()); + secondStationItem.setStationName(stationList.get(1).getName()); + thirdStationItem.setStationName(stationList.get(2).getName()); + + firstStationItem.setStationPointBg(1); + secondStationItem.setStationPointBg(2); + thirdStationItem.setStationPointBg(2); + + firstStationItem.setStationArrowBg(2); + secondStationItem.setStationArrowBg(2); + + }else if (arrivingOrArrivedIndex == stationList.size() - 1){ + firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); + secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); + thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); + + firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -2).getName()); + secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName()); + thirdStationItem.setStationName(stationList.get(arrivingOrArrivedIndex).getName()); + + firstStationItem.setStationPointBg(0); + secondStationItem.setStationPointBg(0); + thirdStationItem.setStationPointBg(1); + + firstStationItem.setStationArrowBg(0); + if (isArrived){ + secondStationItem.setStationArrowBg(0); + }else { + secondStationItem.setStationArrowBg(1); + } + + }else { + firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); + secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); + thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); + + firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName()); + secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex).getName()); + thirdStationItem.setStationName(stationList.get(arrivingOrArrivedIndex + 1).getName()); + + firstStationItem.setStationPointBg(0); + secondStationItem.setStationPointBg(1); + thirdStationItem.setStationPointBg(2); + secondStationItem.setStationArrowBg(2); + if (isArrived){ + firstStationItem.setStationArrowBg(0); + }else { + firstStationItem.setStationArrowBg(1); + } + } + + } + + /** + * 只有两个站点的路线 + * @param stationList + * @param arrivingOrArrivedIndex + * @param isArrived + */ + private void updateTwoStationsUI(List stationList, + int arrivingOrArrivedIndex, + boolean isArrived) { + + secondStationItem.setVisibility(View.GONE); + secondStationItem.showOrHideStationArrowBg(false); + + firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start)); + thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end)); + + firstStationItem.setStationName(stationList.get(0).getName()); + thirdStationItem.setStationName(stationList.get(1).getName()); + + //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 + if (arrivingOrArrivedIndex == 0 && isArrived){//到站 + firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); + thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); + firstStationItem.setStationPointBg(1); + firstStationItem.setStationArrowBg(2); + thirdStationItem.setStationPointBg(0); + + }else { + firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); + thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); + if (isArrived){ //到终点 + firstStationItem.setStationPointBg(0); + firstStationItem.setStationArrowBg(0); + thirdStationItem.setStationPointBg(1); + + }else { //到终点途中 + firstStationItem.setStationPointBg(0); + firstStationItem.setStationArrowBg(1); + thirdStationItem.setStationPointBg(1); + } + } + } + private void showOrHideSwitchLineBtn(boolean isShow) { if (isShow){//显示切换路线 -// mSwitchLine.setVisibility(View.VISIBLE); mSwitchLine.setTag(0); mSwitchLine.setText(getResources().getString(R.string.bus_switch_line_btn)); }else {//显示结束路线 -// mSwitchLine.setVisibility(View.GONE); mSwitchLine.setTag(1); mSwitchLine.setText(getResources().getString(R.string.bus_close_line_btn)); } @@ -307,12 +410,10 @@ public class BusFragment extends BaseBusTabFragment if (launch) { // 出车的时候重制站点状态 mPresenter.queryBusRoutes(); -// tvOperationStatus.setText("收车"); tvArrived.setVisibility(View.VISIBLE); showPanel(); } else { AIAssist.getInstance(getContext()).speakTTSVoice("已收车"); -// tvOperationStatus.setText("出车"); tvArrived.setVisibility(View.GONE); hideSlidePanel(); hidPanel(); @@ -410,7 +511,25 @@ public class BusFragment extends BaseBusTabFragment Intent intent = new Intent(getContext(), BusSwitchLineActivity.class); startActivity(intent); }else {//结束路线 - mPresenter.resetCurrentLineStatus(); + OCHCommitDialog.Builder builder = new OCHCommitDialog.Builder(); + OCHCommitDialog closeLineConfirmDialog = builder + .title(getString(R.string.bus_dialog_title)) + .tips(getString(R.string.bus_dialog_tips)) + .confirmStr(getString(R.string.bus_dialog_confirm)) + .cancelStr(getString(R.string.bus_dialog_cancel)) + .build(getContext()); + closeLineConfirmDialog.setClickListener(new OCHCommitDialog.ClickListener() { + @Override + public void confirm() { + mPresenter.resetCurrentLineStatus(); + } + + @Override + public void cancel() { + + } + }); + closeLineConfirmDialog.show(); } } } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index f8e5b3bd17..12db987a6e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -4,6 +4,7 @@ import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_ADAS; import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; +import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_ARRIVING; import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_STOPPED; import android.content.Context; @@ -54,6 +55,7 @@ import com.mogo.och.bus.presenter.BusModelLoopManager; import com.mogo.och.bus.util.BusAnalyticsManager; import com.mogo.och.bus.util.BusTrajectoryManager; import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil; +import com.mogo.och.common.module.utils.DateTimeUtil; import com.mogo.och.common.module.utils.PinYinUtil; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -429,20 +431,76 @@ public class BusOrderModel { || data.getResult() == null || data.getResult().getSites() == null || data.getResult().getSites().isEmpty() ) { + //当为空时,显示无绑定路线图 + CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据:空 " ); + if (refreshBusStationsCallback != null){ + refreshBusStationsCallback.updateEmptyUi(); + } return; } CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + data ); - renderBusStationsStatus( data.getResult()); + updateBusStatus( data.getResult()); } @Override public void onFail(String failMsg) { // 重复请求小巴路线，直至成功 - queryBusStationDelay(); + //改为任务，为空不再去一直取 +// queryBusStationDelay(); } }); } + /** + * 更新正在运行的任务UI + * @param stations + */ + private void updateBusTaskStatus(List stations) { + + int arrivingOrArrivedStationIndex = 0;//已经到站或者即将到站的索引呢 + + for (int i =0 ; i< stations.size(); i++){ + BusStationBean station = stations.get(i); + + if (i == 0){ // 首发站 显示在最上面 + if (station.getDrivingStatus() == STATION_STATUS_STOPPED + && !station.isLeaving()){ //到达第一站 + arrivingOrArrivedStationIndex = i; + break; + } + }else { + BusStationBean preStation = stations.get(i-1); + if ((station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()) + || (station.getDrivingStatus() == STATION_STATUS_ARRIVING + && preStation.isLeaving())){ + //到站未离开 | 即将到站 显示在最中间 + arrivingOrArrivedStationIndex = i; + break; + } + } + } + + BusStationBean arrivingOrArrivedStation = stations.get(arrivingOrArrivedStationIndex); + + String lineTime = DateTimeUtil.formatLongToString( + busRoutesResult.getTaskTime(), + DateTimeUtil.TAXI_HH_mm); + + if (arrivingOrArrivedStationIndex == 0 || + arrivingOrArrivedStation.getDrivingStatus() == STATION_STATUS_STOPPED + && !arrivingOrArrivedStation.isLeaving()){ + if (refreshBusStationsCallback != null){ + refreshBusStationsCallback.updateBusTaskStatus(busRoutesResult.getName(),lineTime, + stationList,arrivingOrArrivedStationIndex,true); + } + }else { + if (refreshBusStationsCallback != null){ + refreshBusStationsCallback.updateBusTaskStatus(busRoutesResult.getName(),lineTime, + stationList,arrivingOrArrivedStationIndex,false); + } + } + } + /** * 重置路线站点状态--结束路线，当前路线恢复到始发站 */ @@ -517,20 +575,21 @@ public class BusOrderModel { clientPkFileName = "sn" ) private void leaveStationSuccess(BusRoutesResult result, boolean isRestart) { - renderBusStationsStatus(result); -// if (slidePannelHideCallback != null) { -// slidePannelHideCallback.hideSlidePanel(); -// } + + updateBusStatus(result); + //开启自动驾驶 2.10.0: 如果自动驾驶状态下开启， 非自动驾驶状态下不开启，需手动点击自动驾驶按钮开启 if (isRestart || CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ startAutopilot(isRestart); } + if (isGoingToNextStation) { // 为了避免恢复自动驾驶时重复的接口请求 return; } isGoingToNextStation = true; + AIAssist.getInstance( mContext ).speakTTSVoice( "欢迎乘坐’蘑菇车联‘无人驾驶小巴车，请您坐好，注意乘车安全，行程即将开始" ); } @@ -546,10 +605,6 @@ public class BusOrderModel { BusStationBean currentStation = stationList.get( backgroundCurrentStationIndex); BusStationBean nextStation = stationList.get( backgroundCurrentStationIndex + 1); -// if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -// == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { -// ToastUtils.showShort("自动驾驶状态为不可用！"); -// } AutopilotControlParameters parameters = new AutopilotControlParameters(); parameters.isSpeakVoice = !isRestart; parameters.routeID = busRoutesResult.getLineId(); @@ -601,7 +656,7 @@ public class BusOrderModel { public void onSuccess(BaseData o) { CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation success"); if (!isRestart){ - renderArriveBusStation(); + arrivedBusStationSuccess(); } } @@ -617,13 +672,16 @@ public class BusOrderModel { }); } - private void renderArriveBusStation() { + private void arrivedBusStationSuccess() { List site = busRoutesResult.getSites(); if (site != null && site.size() > 0){ backgroundCurrentStationIndex ++; if (refreshBusStationsCallback != null){ - refreshBusStationsCallback.refreshBusStations(busRoutesResult.getName(),stationList, backgroundCurrentStationIndex - , getNextStopStation(),true); + String lineTime = DateTimeUtil.formatLongToString( + busRoutesResult.getTaskTime(), + DateTimeUtil.TAXI_HH_mm); + refreshBusStationsCallback.updateBusTaskStatus(busRoutesResult.getName(),lineTime, + stationList, backgroundCurrentStationIndex ,true); } } } @@ -739,7 +797,6 @@ public class BusOrderModel { }else { ToastUtils.showShort("出车收车状态查询："+failMsg); } -// queryOperationStatus(); } }); } @@ -759,20 +816,21 @@ public class BusOrderModel { /** * 渲染站点信息 * 服务端返回的OchBusRoutesResult逻辑， 离开站为当前站， 到达下一站后才会将下一站置为当前站， - * 车机端展示 离开站为当前站点，前往站为下一站， 下一站到站后在置为当前站 + * 车机端展示 三站： 中间为即将到到达或者刚到达的站 * @param result */ - private void renderBusStationsStatus(BusRoutesResult result) { + private void updateBusStatus(BusRoutesResult result) { if (result == null) return; busRoutesResult = result; List site = result.getSites(); currentLineId = result.getLineId(); stationList.clear(); stationList.addAll( site ); + for ( int i = 0; i < stationList.size(); i++ ) { BusStationBean s = stationList.get( i ); - CallerLogger.INSTANCE.d( M_BUS + "renderBusStationsStatus--", + CallerLogger.INSTANCE.d( M_BUS + "updateBusStationsStatus--", "Index="+ i+" ,name = "+s.getName()+" ,"+s.isLeaving()+","+s.getDrivingStatus()); // 是否正在开往下一站 @@ -790,7 +848,7 @@ public class BusOrderModel { CallerLogger.INSTANCE.d( M_BUS + TAG, "渲染站点信息服务端currentStationIndex="+backgroundCurrentStationIndex - +" isLeaving()="+currentStation.isLeaving()); + +" isLeaving()="+currentStation.isLeaving()); //当前站点是始发站，告诉服务端到达始发站。 如果没有这个节点， 服务器不知道始发站到达状态 // ，订单开始站下在始发站的状态流转有问题 @@ -808,15 +866,13 @@ public class BusOrderModel { CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); } - if (refreshBusStationsCallback != null){ - refreshBusStationsCallback.refreshBusStations(result.getName(),stationList - , backgroundCurrentStationIndex, getNextStopStation(),!currentStation.isLeaving()); - } - if ( currentStation.isLeaving() && slidePannelHideCallback != null) { slidePannelHideCallback.hideSlidePanel(); } + //更新bus路线面板 + updateBusTaskStatus(stationList); + //需放在currentStationIndex赋值之后 BusTrajectoryManager.getInstance().syncTrajectoryInfo(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index 15b161f032..435252fefa 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -123,20 +123,44 @@ public class BusPresenter extends Presenter } } +// @Override +// public void refreshBusStations(String lineName,List stationList +// , int currentStation, int nextStation, boolean isArrived) { +// mStationList.clear(); +// mStationList.addAll(stationList); +// mCurrentStation = currentStation; +//// functionDemoModeChange(); +// CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); +// if (mView != null) { +// runOnUIThread(() -> mView.refreshBusStations(lineName, +// stationList, currentStation, nextStation, isArrived)); +// } +// } + @Override - public void refreshBusStations(String lineName,List stationList - , int currentStation, int nextStation, boolean isArrived) { + public void updateBusTaskStatus(String lineName,String lineTime, + List stationList, + int arrivingOrArrivedIndex, + boolean isArrived) { mStationList.clear(); mStationList.addAll(stationList); - mCurrentStation = currentStation; -// functionDemoModeChange(); + if (arrivingOrArrivedIndex == 0 || isArrived){ + mCurrentStation = arrivingOrArrivedIndex; + }else { + mCurrentStation = arrivingOrArrivedIndex -1; + } CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); if (mView != null) { - runOnUIThread(() -> mView.refreshBusStations(lineName, - stationList, currentStation, nextStation, isArrived)); + runOnUIThread(() -> mView.updateBusTaskStatus(lineName,lineTime, + stationList, arrivingOrArrivedIndex, isArrived)); } } + @Override + public void updateEmptyUi() { + runOnUIThread(() -> mView.updateLineEmptyUI()); + } + @Override public void clearBusStationsMarkers() { runOnUIThread(() -> mView.clearBusStationsMarkers()); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt new file mode 100644 index 0000000000..8ce6f38d16 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt @@ -0,0 +1,65 @@ +package com.mogo.och.bus.ui + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.LinearLayout +import com.mogo.och.bus.R +import kotlinx.android.synthetic.main.bus_stations_common_item.view.* + +/** + * @author: wangmingjun + * @date: 2022/9/15 + */ +class BusStationCommonItem @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr){ + + init { + LayoutInflater.from(context).inflate(R.layout.bus_stations_common_item,this,true) + } + + fun setStationName(name: String){ + busStationNameTv.text = name + } + + fun setStationNameColor(color: Int){ + busStationNameTv.setTextColor(color) + } + + fun setStationPointBg(type: Int){ // 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 + when(type){ + 0 -> busCircleIv.setImageResource(R.drawable.icon_point_grey_bus) + 1 -> busCircleIv.setImageResource(R.drawable.icon_point_green_bus) + 2 -> busCircleIv.setImageResource(R.drawable.icon_point_blue_bus) + } + } + + fun setStationArrowBg(type: Int){// 0:灰色 过站 1：绿色 前往下一站 2：蓝色 未到站 + when(type){ + 0 -> busArrowBg.setImageResource(R.drawable.icon_arrow_grey_bus) + 1 -> busArrowBg.setImageResource(R.drawable.icon_arrow_green_bus) + 2 -> busArrowBg.setImageResource(R.drawable.icon_arrow_blue_bus) + } + + } + + fun setStationTag(tag: String){ // 0：起 1：终 + if (tag.isNullOrEmpty()){ + busTagTxt.visibility = GONE + }else{ + busTagTxt.text = tag + busTagTxt.visibility = VISIBLE + } + } + + fun showOrHideStationArrowBg(isShow:Boolean){ + if (isShow){ + busArrowBg.visibility = VISIBLE + }else{ + busArrowBg.visibility = GONE + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_no_line_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_no_line_icon.png new file mode 100755 index 0000000000000000000000000000000000000000..fc20dca73c6966b7a0ef7a1fe7d41b167fe900d1 GIT binary patch literal 13534 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 Uh9g@3`?p9^RPJZBuwKCb09^Nox&QzG literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_arrow_blue_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..026c36086ffd6c895244972e447844158dd17e76 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^96)T#!3HEJ?9iABq!^2X+?^QKos)S9Eak- zA^3KxBOjxqfNTB9BLddd8>imr6u!ZsC}<`mt@nV(%r8kj`Nj>aM&=#uE(RJ`FIV{( zyT9;D+qLSRf9dj|xk@<|jGI?QEb^RKc-4<%#^i>6pZi+?VnxH*!`r|7 zF8KT4*TJucmoq7T7x)xY8MjMgqilh6kAq$OvcMGkIUKrzxydW8w6xi7Zdl#I-NhM` z*s*f%L5Bq00=7lh|I2#xX(TIsSSfUq>5!ahPvG+QrmWh21(|>&9uH!b|C%=~ej>HN vd%H=Eak- zA($NU+kR&wBUgpwji~cR%l@~0bTm0#&(>C@(x|5(?aC-TNhR#r3MP*YJ#B|GEELiw zT>N4%OU~^wvkHsJKmU(`f9+NIk0giuwU>-|>A)b*Ed4#aEq+_Qq=Xrh>y4Qb5}N~z z&V{$#_j5S;Rl#$D*aAOgF#%?_hDoa%bNB@2Pi!nK6mc%I>f&^;H8>giizlg*x2NZS zfKS7#82zIQWcSXxD43zZ%-qG8XAa|S$-Q+--c2`r9Ojx!NJQA?8>!X1O=tOB`p3|NkG(Y{=em{=|tL5!25b%EmJK6p2n=nw;b; z@z`EO`+%CE(VFW|(|h7%kNpro;%>;8@h&W_?qf$A+gtmDqYg}oOv;b#GF@*zxXOEL zf5IdMsT`&Yj_E%lZ!)PpU-{2v8q3C+4U^1o%#g5sUV5{}Z925d$ V*!Oz|J=y~b4^LM=mvv4FO#mstjFA8U literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_no_bus_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_no_bus_line.png new file mode 100755 index 0000000000000000000000000000000000000000..fc20dca73c6966b7a0ef7a1fe7d41b167fe900d1 GIT binary patch literal 13534 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 Uh9g@3`?p9^RPJZBuwKCb09^Nox&QzG literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_blue_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..dc4c4f6f0da0a03c903cf6a1e7f84dc2864a3204 GIT binary patch literal 1427 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 LNkvXXu0mjfKvgIU literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_grey_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_point_grey_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..d43e34bb2634ebe1ea0028dff390741c8fa32990 GIT binary patch literal 1580 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 Uh9g@3`?p9^RPJZBuwKCb09^Nox&QzG literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_arrow_blue_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..026c36086ffd6c895244972e447844158dd17e76 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^96)T#!3HEJ?9iABq!^2X+?^QKos)S9Eak- zA^3KxBOjxqfNTB9BLddd8>imr6u!ZsC}<`mt@nV(%r8kj`Nj>aM&=#uE(RJ`FIV{( zyT9;D+qLSRf9dj|xk@<|jGI?QEb^RKc-4<%#^i>6pZi+?VnxH*!`r|7 zF8KT4*TJucmoq7T7x)xY8MjMgqilh6kAq$OvcMGkIUKrzxydW8w6xi7Zdl#I-NhM` z*s*f%L5Bq00=7lh|I2#xX(TIsSSfUq>5!ahPvG+QrmWh21(|>&9uH!b|C%=~ej>HN vd%H=Eak- zA($NU+kR&wBUgpwji~cR%l@~0bTm0#&(>C@(x|5(?aC-TNhR#r3MP*YJ#B|GEELiw zT>N4%OU~^wvkHsJKmU(`f9+NIk0giuwU>-|>A)b*Ed4#aEq+_Qq=Xrh>y4Qb5}N~z z&V{$#_j5S;Rl#$D*aAOgF#%?_hDoa%bNB@2Pi!nK6mc%I>f&^;H8>giizlg*x2NZS zfKS7#82zIQWcSXxD43zZ%-qG8XAa|S$-Q+--c2`r9Ojx!NJQA?8>!X1O=tOB`p3|NkG(Y{=em{=|tL5!25b%EmJK6p2n=nw;b; z@z`EO`+%CE(VFW|(|h7%kNpro;%>;8@h&W_?qf$A+gtmDqYg}oOv;b#GF@*zxXOEL zf5IdMsT`&Yj_E%lZ!)PpU-{2v8q3C+4U^1o%#g5sUV5{}Z925d$ V*!Oz|J=y~b4^LM=mvv4FO#mstjFA8U literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_no_bus_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_no_bus_line.png new file mode 100755 index 0000000000000000000000000000000000000000..fc20dca73c6966b7a0ef7a1fe7d41b167fe900d1 GIT binary patch literal 13534 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 Uh9g@3`?p9^RPJZBuwKCb09^Nox&QzG literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_blue_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..dc4c4f6f0da0a03c903cf6a1e7f84dc2864a3204 GIT binary patch literal 1427 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 LNkvXXu0mjfKvgIU literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_grey_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_point_grey_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..d43e34bb2634ebe1ea0028dff390741c8fa32990 GIT binary patch literal 1580 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 Uh9g@3`?p9^RPJZBuwKCb09^Nox&QzG literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..026c36086ffd6c895244972e447844158dd17e76 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^96)T#!3HEJ?9iABq!^2X+?^QKos)S9Eak- zA^3KxBOjxqfNTB9BLddd8>imr6u!ZsC}<`mt@nV(%r8kj`Nj>aM&=#uE(RJ`FIV{( zyT9;D+qLSRf9dj|xk@<|jGI?QEb^RKc-4<%#^i>6pZi+?VnxH*!`r|7 zF8KT4*TJucmoq7T7x)xY8MjMgqilh6kAq$OvcMGkIUKrzxydW8w6xi7Zdl#I-NhM` z*s*f%L5Bq00=7lh|I2#xX(TIsSSfUq>5!ahPvG+QrmWh21(|>&9uH!b|C%=~ej>HN vd%H=Eak- zA($NU+kR&wBUgpwji~cR%l@~0bTm0#&(>C@(x|5(?aC-TNhR#r3MP*YJ#B|GEELiw zT>N4%OU~^wvkHsJKmU(`f9+NIk0giuwU>-|>A)b*Ed4#aEq+_Qq=Xrh>y4Qb5}N~z z&V{$#_j5S;Rl#$D*aAOgF#%?_hDoa%bNB@2Pi!nK6mc%I>f&^;H8>giizlg*x2NZS zfKS7#82zIQWcSXxD43zZ%-qG8XAa|S$-Q+--c2`r9Ojx!NJQA?8>!X1O=tOB`p3|NkG(Y{=em{=|tL5!25b%EmJK6p2n=nw;b; z@z`EO`+%CE(VFW|(|h7%kNpro;%>;8@h&W_?qf$A+gtmDqYg}oOv;b#GF@*zxXOEL zf5IdMsT`&Yj_E%lZ!)PpU-{2v8q3C+4U^1o%#g5sUV5{}Z925d$ V*!Oz|J=y~b4^LM=mvv4FO#mstjFA8U literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_no_bus_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_no_bus_line.png new file mode 100755 index 0000000000000000000000000000000000000000..fc20dca73c6966b7a0ef7a1fe7d41b167fe900d1 GIT binary patch literal 13534 zcmcIrQ*YOEkP}Dzj`tl53=C0H;-}JAfB)6C;9$P4j3G(vUmduklDIHf^(4W`*Ue93 zHAxd$Suol!3n zU;qippF%2b;1}NCGPT6rk5sSD+dbvX3uktC`N4DQqUwTrm!Z&^N1|^~p|Q|OU}V6k zUe|(MkPJe%f7DJIsA25}>7tpVhZ6jN2^RulL`ws8NLp+BnnHHtaOg!NeMKUq`c1M# z63x41fFvGNt@W=t0NxRLRFTFkhU5k+?*6I4`7Lcj_oHanLJBS9FGNEhNojmtD_qBO zmaZ(%^BaCpaW{U}uBp&5#uLLvqC{VFo?W5H z<6&Oc&E3Yv?FteCB6nJ6I*63@_b~Ov!C!6Ge8R$8NFf8>Tjrj^j-EFn!;j-Y@-XFO+gbB zE%YI=ve9~_=NVsLmo?~6^T$i(-^IxhOzu^)^U}g|D*{@d6Yd#+e@`fX^p>8wBF929 zAhlp=1}lneypAd7tLimvpI2#=m}2C`KRos>eA8JGK0OfhntvTm?oc`v#p%rl4khn* zZg8H!R2zzO=wK!(6;?wOBDMcqp5@UtTg^(1)X)v0cxyG)+d3xk*Qd=-)2%MFrBYT3 ziwv?6Tj`m%505fQ$D9eak4tEnBUJ6CrG;W5O=|lFj(g(?m}(ip-qD#nh->-*OuYWA zjFe$s9rDwJO94vOprkJZHt|i%UW_~cD!i=5!nRS2#4Y9xGp@W|Aoz(igw-XVY^?Mn zon(zea>@DWpP5?oLzxz%a-BlHK^b5hYux3Dw$&jVvrIKwKg?moV4i_|+QIv}04Z*L zdI$v%hWYetbb7ThFmbd{$Rb0gpJW59Y)5~n(1jpWs)+S~vUqXWV5Y+MrM2^w|9X-w zM#wj`qL0puQ1lej4|_-x8ka|lZbuO}o*#*Y;we>P!2JD%6mPSZe|i!)Z;}rh4~^kb zH0IGyH_07L7&U_E_QtEp`Rr$k@sh(S_|M9p(8v59#pQ?E?l@fd}`V# z)uY-!Z$4Lyc*k~>Eqfwk5i&r9?r!eSLTNwVG8JR+{-PbTXaEA<8yDIv!;+Ij7|E}wj!ufsgc zq&)qb?$<7i-T*UHE1MBQg9e_5jcc+L@%^Y*1HZL<5pehF!O?kz@S$MIuiv5*$AeHc z|BF>hsw4pbXh_bVIsSuM$pXe)2l;77YBTh4)9iB_gM7z9dGs(Q8rRmjTF_qPpS&m= z`11M+VZhlhJT)*R*we@S)`THCwb>*RV%O{QY?Ck13FJRr3L)*u3xm?)VxPU4b?UfI z8SVzQnba_UFyY21%iHqQI)EPkNn{Tv+qaD@?Jruwx5}`MnHgsjT0>h=)Rv!rSA_l@ zOTYFVV9P`xj#lg+!Xmk6IBag=k?u7$>}(z}>`p9}fb);LzG-o%ima1C z&i$0di+xq{qDW#xvT8-lS-;8>j}j5#u20{H@ZN8_ZIWdWqLCoA6be`$S_`91n{<4= zW9VdM6ofXawyiZw&%g(-$lUxe7;N%`;}1o3=Sr0w&Q)xo#0Dwiirj+UuGqPR;9(TL zDZ?^>vejmFEv`-ddWTV?{T@$??*pvJ%|a=>rRDKCQO>#}*;KSIF)`)ug7pPzkvI=_ zh0A=_)afSknUJWnK#H;m*kvFqQ-El&Uf90%N~$Y)=wVdHk<<|@%H-%naQE*Rm&GAu z(bHCw-?n)Ee$^*xhB_ks{UWKnj(SN4-#Tk27D%0nWN>9*0i=fMS3?5#$2)H2+v6gO zvGN(N?JHH9BD@5ug*wX>^Cg%hJ$RhaQP_cjoj6M37C-L3f3F7p)+JNRJJXg;Z(V$# zR*s0<5-$+QgT%i4=);cox;oP(1~xgGK5=BzDJ`v#&RbKF_eiVYKADv$?SwrawK6i* zYexq+jXOtUAxZPe6W8vYrNAqKh-=2j}gcoc(Hcq*25}eTdmcR1F}sc=4DTDv{M)~ z6HtGLRc-W=x)6eaSz5=hVpbn*+6_KcaBr$p$CEizr_;y?hp39=gt1y$JpcpCw(;m} z$g4HEzQ(v#%ifEE(3_ESEJ`MZw;H-z7Nkb1D^fKwl^;4ct$v3DFy*2AU4>CtYD5CJ zTFONub5D*CjZNPRb{_hD(36GnDq}T^vcy0j8OK9#G5?`tK&CB*F*Ujl_#=~dzsB|L zXq&)FQaLPX2o*~>4x>zDM&^R)$C>fN1rf0T(Rqi3Z+JyQY(XuY_FIce^4>~i=^$Tq z8$`NY5}7l);KeF^UR6m+@d=!Z7UuV0y-%mqy6yKZIQ~<~tE6K5z&X}F-sVF;B+5#oP33etqAjx@!y?mA{$XRX0D1;YG;UKwlh=m} zWUp>c5;8L=B$^H&Ms$!k`Uj^I`i^495lhh%-?+W6-8jR}4Y+C{lDIs4QXvKnMvaSuS7$3o<2uqxDkj&<+B6NX>P^4n{vi*IA<>$_3Aibtfiq2%(c5YW&a-w5k9y;SvRDp< z1TU7~AmJ*B1W+4uBi229*IlEy-{p+C(Dr4fAF6wHRw>Mm3GvucfO4ar{7l)2Wp&uc zIb8LUBmCUb5(Ys+)AAsvZ@#F;!54xjMgJVE^8OOENxs|VDKro1Z z!2{V`Cx_N*Hmkgbb(t(tPUY_4g^PZ zb*VSPT9&uk25X%js6pmDM@-g1KPy+%5fLE-6UQTRi29t&EynM{EcFbq8-bSME3 zn=uRUnni8L4?6scFX#cKnrn799u+%}yDd(~%{i&codjnh!yVl55=yii^1pwG5L9Qd zI~{PTHhywfW(k^~);4KrJ8Us&@uVOiG+u;7sX`o8X?i))J$vC0P+?Bw28e`x{whSW z-&-K#$$@P2{oG44n8&*%*qXk83%HWb9A5tw=VRed->^ih6xwuBjtQ*jWNK%4NSL|G z&MRTH6|bCF1MG;SGSsgk%sZ2c2*&XkA^z@cQPTR1s~LvLda|=2`xMJdYv!qTg_acZ zvGdcu=Psk`5B4K-ZdtAPZf-h~xy857dxMX1`5>qES2z4AJvk<}lh&CZB4VC!Zb->$ z>aqzQw!2Y>j&jql^sadip>&*&D^zl7P-!7^r`^z^lJ+mxmu=)8TCwe5RL+WJ(c?K0 zZH)TTaZ?LC{6tL%tnkma4z306;jxf1MGcw?GH1FOUHz4{ri*F#nVrV8PQ#iT8FV8o zRl`Qwlm7gRz-d}%sxObE){pJP?qe8Jhf`xo`>@_STh(zyN8D`a8bz04|Gnr1aV6*6 zBda&MB_n+y=!%{&$IY`&C3}WeW6+kD*rsmaWnNxeh%w&@k#&zK*P%@dYXnh{);AS`QQl*^m zYk9A-Xg2cNbePt7-=qfy9teLrca>Q$1-GC9YTlFZzp+||M0>B=mFm06-sh$2twh5nA%qn~+13gyq^6v@U*~i~TCVXrxQa3uH zOC&acRw@77*Eq^-yR4?be%mpk^IM13JRrg`V8DmuFCP(1s?1CPxfdJMSsztKtkg>5 z$v_qj6=e4oxgEI(G?$+H&xstZkEUKsx8rK*-U;)f0+uGYCafT@)X_h+eJ(#>Ak~lu z{`OcA``a}|iw1HQI}vYs|@?qUU-taJ2;b4>Dr!|8Jkb?>TDkgdO*a8d== zq~2fJ3{TV$IB{8^21KvqeZ3}DG}3ub{#B@hIZ^b~xb-X)GSZ$6d>6^>Imo7DKM8S$ zT^R4T>g_+5_)%*zjE*~th#zQ0Ul8gtUq?%rUlvTQ#EH2nb$B&)c@jtVkmI!RhQpzI z=Pq-o;NnqCho;%!48;`msEXEq&hUdLtcNnbXT5vRsJ`H6ZqWa_47>3n@)C$yE0rL(5PK z==jO7aTsR&ouF3_RzQOdqVctB+xE<{+BXsF9K=o9eGG4k>VCIQLL zUJn7xz4tnnw4S!)yA77+ct6d~=0~}!-|(H27spt%SYZ);a%MquwU|uqvUI+BWK;ZB zEg)Pwg3%v)4fcB^Sxx2)_YXe;*~;mRvOE7Kp*5?n$Q)0EtM`HemEp&3r+dw zlw0E^O8gWu*!+%54qu}8*EM5yV*CLTRlE7&E#S!1`CrFo0c$dNawic79CAsxN1^nd z%+@r27PaR)$;0Q{nZUBg+oosEA0mf0BGPd_76vq?_!@oAsRo;L!#H!xH&9M@gWtMo zhRsRj$xHdWqwPalcHB(C z)gq#0WT-NFd4Z-Vke^a5<#)H~EG%o=Q!nqO_iiidmiMm#6jgU49kuua(kwt_)-idQ zO+6Jcoq+op-`3kl9I@G}%hjfb)ZQPm`*P>NMNGh}+Yu>;3&1eClGF(W;7AG1It=-5 zVwPq&j&_YYV<9>!MvKbn9cIeWvs@(?p7rsK)x2-{2jLZw*^9l*Om#v!f8p~rV84VB zPj+v(#-wAB>I$1)_H#8v`XpwuG+e@9TUnS5w_Qnk= zom(zV1>$VdqF$8m;=S(eY&W#f3lhP=5=elg6`7o^OElG5xAaCy$}&5I+@+cQ$#z?1 z)r~291>1Rbt6lf7koYoS=dz^SUN3EFC3+gn>@r{CH?1(0oaaB0r0*in6XI+tdYA;b z>&mYm#aMk#Ez(>5N4=Ee<`e`Oobu1_Xt#q?8~x?JnlZ+fz*XS;(ADryiA5-?UpsuFZ80a6k*DNE!d!tkZ5shJiOCDPBpL1S(PxlMY5Ut71PQbg7vKu(h&Q+ z?b)bkVw>LOPLzUM)^1KX2O)af+V)vVoyOIjsyq6fDN+r`?HBEe_&LHeP zD+~sF<>Xjvkf#&9YEeSRW#)Ids>;=S_T>#%Uvlk+gSD}E{@gfMMuI_vCNuq4da*t# z`?4-!i;hUsZHcq*)e<(Ihrl|=xL3?FY;cMR-5ZNAq<%HDZ2j}iGB|BhOM{hiE`3}7 zb}HCLF6^_xQ~@U2>GJx*bela{08Zpd@}cE<)L%7?!SD}*!HO%qXfQQvy%Soj3bhve zY~K{4C;m2$5Rso-L23v1`rbD9*?R7gDZSBLvswI~Z+wxHr)y%%j3;yzO0tBGX7JTH zv{6Gz)_+n7w63rvHft_JFnok|~r^n+sckrO4)NTR0+_VDkVLf2j>_?9Gj zHPRKdxr5B1sIx(XX{LaSI6XRlaUY?lRnDRJnVX^@r9z$WxcAA_*tG*eSP^hFnR-Hgj@C0~QPr&Ff@9KB8yKllGYY7jHGQz5~dQ0PJFp zj)$#t>=+b197hEGKYHITatf<`wQ}yd8`(TRzRB&v*C{O~2D_EYfA{Bx>U!%*67XK? zZ0A3CdC|{lSklk(U>NFA`)zg!z>k54QuEtNy~3yqa_&L@NHBW!y_r?MBX7KSsCJ*n z4;J)>^SXI#{@C9P&GyoB>VAE!*5%QB6#b5$l`&@VKs`)^q>8>5jU*zAo?1C9yNNSZ65jjwZR5iGd&l~^|(WDB8G;O0ZVIE1xZ zSp_D9b<7w1e{-yyVb)gGS}~C#4(1Q3>Bup8Yry`#WE0~>X4CdsW>#prUg)3|lMF&c zR5p|uB}${zTVK^nl)Vx~Wc1rhh8228Ij+eLYL^t5AT`&x;p_(evgf4&H3mVJmrS^{ zmB33f47UH>I-?x~n|MdM>gp ze17-A^MkuA(pFcApRtW!PpP9WrV#N#=$TXnX>OgROzZ~C>svWGQQ zD&2Je%0{itmRTEG7F(1*{jP&`cfZzi)gko4^_O2S<=hw72l}GzVuI>pDhJWmb;eMS z7yPuEUR%%-<1$s4r7r^-E?EcpTdXxcCng|ioPb(?3Gr>XPi}r1aD|)PP>*?2%2<{3XH|o z#-jm-PaRoK0g3ExOaeJ+;u5rH8$k=_bxURZT;nuVqIrG;GtVSYVX#c@43qf!*iZwp$u1{sfwYfsgDn)1Gk<6jdiZGT-(3LD$de4h`;_x=`LgCe+x9>RYpIni%t&$=&4 zxB23dN~yj(_}z9meidj)O;OsA<;63eVzay^Il2V}MN7`f5_I##u~9r%ufBrnbsQ#@ zIlsA5X@c3o7JkQ>eV6efOv;Q5uJe9f)X_J8p$c?#a<$r&&+}f3E8KjTa1SXsOF1j7 z@{i(eh$?`x<%j4Xs*dv)xjK$7wJyofH2_H;ODN4<*D?YhP3xS%x6q6aY6i**McT=f(*8DH$2eczJW zOhLEc+mvoWW~&8QRRvS9D(R?B$~twiO~m}gGIn9J{BSO9o)%!O&UsaZvP_hGKaHFm z@+%Om{2V34svs}HvJQ702{x#J=dk#$yQdAdBVWE3+Ku=N5d#7qMWIj!Ec7K81y0~A zcI?=S{DKVbf%pHI!BIq;wD1E_^ooU7)S@@6 z2Fl>Qb;NB-6jq@e@AkKBhDOnd3Omar5<~*-VMID$}1$_ubKTn|Ry@IR<3wO6elQ*AZ4zgQwwsU*9#2j4zd{gwmn{I*f3g*Dkfv4QaJ4y+p`b zv|(@IzZs;JD#nF!n?PX5$}E(4QS)9+jxvpdSm_*=81B!*|I#lx8ywWm;0DKjHYn{C zir(HYK`h$S@xfSf-yTC)S4n95sw%p2;Db|JFlh8lr=?VL0e)pIG6D%?+Wp+0q3WDF z=3sXs=Ko!$(th%w`sGEk(;El~GNlqdowV6fSdwGg=7v#X zLzTb1sjf32fJ>^)l}tggT;vpgp_y{$uo8&NZ?;erM^?wexP9&Y%({ias{ zv3}`jL`}3um}I%?gFSSW`g_K)D`8k)C81@;QTz@b?A{Me)F|{ zoYdoOXNwc~Us;;6jrIzY6a^tczskmF7GZyBXIvvwg!gGZ{$L4$l~rzRS;BP ze7XO%K1Qq7zByY0z)hoU2q(U#Meg{CP#t!{&%2WPHR>XNc8(XV>N&}R-T>tI`wA0+ zPP7LW{OBS{$K0j&ouqNU#f0$OKVM=aHanly90r2Fq2Y?XI`THJkw}=RwOS1ASt{mY zCo4r|KVi~xF1jr4YI(msDx7WTDAAIuVlf&Q(1MFZ{r6{4htS*}Rx8DH?u_FjR#O0( zGkmYAC{v7IXpcW*nDvc_ug>Rh>3+~!v6@)mWih~S;HCCjMCTI>^+W5&*JdDgf#lSp8 zXEmXCv>Hc6$=I+5z z+|WNEtH{4iimg^zf67Y>9^@;rooF!s6HzpXxZ~fEY>c`*o_eXe4lyACUY!m zeuyG-w!Bd-Vu}Rg&~c+oqVhm(=j}XCqWT!=Kc@yXnB(@wzN*APp1dxflX|d==x}B| z!pKc9$$XWV`{y;ZX(|dG_=N^ts^VWG(!A>?%Uluaw5>Ze~p1brs?ZFAu>eq$`uuvvfUR=ZJLN=ALcX~>;2$) z^rmsEAr9M*>lnsQi@o zKoU5c&_=hOp6Dg(Y<4^NRc3)vGyckr%owiHYQEXi)O-8eFX3SY)RfqKkr6PHg(f*S zw??(_kupTZs#Eg14o^SSd#E$tl|<6M3LYy~|4{GFCsCCrdFl?rV+zSfq`A{aN-q;y zCg%cYVMqtGBuLLKAi|X;6V8Paz7L}V_|n1s(e{)6jaAh@auj@DIQ*8jkuTS(7#RPK z_aNV2Rv6*Q9`&p7qh`?D_w%*JTi#5*Otr8&zpmf=TLq1ixo7;{GFl0@h~FUe01no%quFo`~0=M+DyEaknARppreQM~qtTyffHN$R+Miqj7|==TY?C+(0k*09a%$Ad$V|#&XOz z7+d7V!#GMTd)VhxB`rR%Xzbje&PpGP8hhkM${@6c*VA>=VYnl2)PS?$(e*3&Ztyos z56cAhO3QajXnYExSwX>vOv&tv#XkRxGZ~4hbj~bAm6X|QS!Qi8^dCa5Eb4PZ!>h$T z$fh11%~`oj!f!n3`IMd$8=#1MWT{gppE|a}f?sNZ&O&;pK9D2k%zk|YPEI1aD-|NS zLo#9zgVtL_0!^b6*i%ED+W{cZX>3GFtJ{cmDiXyK0eL^|+;XG{Ah@;3%1+@U_+IA) z9rXB=hciZn$72{V8)!uhMTBGX${c(!EX&izBsr|}N4fP!r+=3-NQ}g<8b>=@x>pW-4#9pvdpVn!Lt3 zBdjx_dAW&p$SC&)>;a9e(D86P);uaC@v_9ZlZj=1sUZ?t5&bs6#7 zDRzSB7ke)Xa9f*!R6a6XnrIDyZZ9~>Fcvqc60y)>77KKS*3iK2LoHThOp1tBroDV; z`aE;ZmK&-h3@;l&-trxP6%lAwk3#C}A6F~>S<;Dy=dp*OryZqKL1&n}T$erSx9y16 z4owc1%;g88A34%1-S%UJDHGR^conYcv`71}JR}xxI!vDbVcW7~z5mMf_Mn1YB&Huv zzc*@;9vd51e-EZ9-M|lr0z1Zzgfj$>?S=^Ox7{$1u^`I@PAf7H3MF_B)h= z-TG;7y@R#*@yd|Cfn!8rNvUano*rSlA4N@aiHpYzJI)`>gcr`w%U(wT9Vda^WNF(( z;RnB(rs1EW>GiDHQf8E`BqA`1Yc!WFo3cc$0AEu9-F@7AO8Y#ij8(aD^=<);itP$!u?>z zy^$cLj9iTv@Fa#Qk%^^OU4W<9+H~?Ei-(0^`E7%5ei{Jemkg}8bQ)U~ECwKYuKEPcu_01_j zLFM#*xR2FOsYD%LDA0+P8yp`bvw+{Zn!nOHTXv-XdRRsb&(5dbcl{wPyyKjFI3T+r z&3RIE&){4DFKq)*cQD9B8qN}6t#}8gCHX*#vV)TiGN$JNQ6S3jqENcUv{I?lnjO7# zdHUOqu<4WG-Rk1uGY7@pNEt&(gUF4`(u7} zSQ|{)b>Bj_x(~&XyFU1?m#iBam{dC`l>}a%3T`@|A-lu5LE0qFm2s=j#&K9(@MC%f zAxyB5ayv^`zUScLT?bv_f3;hO5E-o7FfQ-|UFWGi289`#QCc}Zf+Tf2j<_&k(CnuE z2=1M_3Cb!P*!_uzEb!+{54p%WA92X%8}Hk3nb`QzTW7*0w7U)pM>1Gii9wFb{OO96 zjpRH}h>Ty7+urV~d-1uNW6TM;BAs)a)B2lkM7r>LNm}Fwip%oANY4*ty?gjAgDrF8 zcFKtkwt(-1ksIsg&e_yG$dLREBjdeci#I_z1qH9jn~z5;zC$Tn9M*g0psn?kzbjTE z!}z}v@EjsOUsQA6YOma{9^Mv6@3iK?$bYYf-L(|&b3dxbc%MSQJ;XS6yAI-0GJ93F zf@<*7R`fAvBLdxELUzub53#HfYP6-0i4nDA*tx3gG+J<>`Y+voRpA8mK%%D>?l2?= z%vf`YoV+Whub;tsmgzTCUB(S31~z9*6U1@v^;llM&QaM2pQMPa*}(8|Ta^W)mi2P* zO_hys$YTIw<+jO@MN@Zk**qAgD4w=@7K5%lQ7W7Wo7{B50wFK`inq?PtGr(Yd?{YB z7kOUv3qnrTmCL1wKTogLbr^Y(4Sh0@4q1O~EIdWxFwQk}*)E4`)^mDa4-QJTT&U)p zE@hqYwYc~l9aTvltAxp{EUjS^6t(RtBECe}=r4DkP>dn;rxmm@uBDf&D${yo53Hv> z>Z7|T;F3I?Z&z%#*+1n=o{#Zdix5bAB7hV26h9MciRf~fo_;&EN9vgw$m@(-nwEHz zVVz6BxDX&C=PTg;=Y)8NkD?Cq-FEQ8g$!%@*pbyd%!axw40c*S6XEu;%Txf5*yY2p zXuo6dS+y z$vb%Bo)d|;`DZ-ipeG?h5ldZ`@HUJfJ8zJw_m-|twtA}2U$iSgwM2%;7< zLwt!nN;7o?#EdKjWg;gvoY64V<=BCZp%@$D=OrX8z6dFRzQ5rSIViU6GS*%>AF$xCt&% zw&6NOe(~QEq{!ke*DQ=Ox4Epcm5TimU%T$7bgc_9Tqf7y66f6&?k5aq5Tcz7#R|!^r12ah7o7MjJoqL zAp8rho)6pMT+Lv2?D)jF&w3}|Az5undar4Nv3UMf`AlU`un7M-8+nmZS;t7Z{4or;@YV4K1xPQ)&A@#qkGki!4!Pp>&%AvbPuy3}?5GEOl3 z4)AJ5zYsZIX=8ziPr=+ZsB+e6-G9TXjI;G8y+XKq)*(=hh8Ls^?QI1UM%A?_@ku!xKGh}QZm}_+3)9n z#`d4L4g)KVtZL5|Kk}Gu#~Zimul?DFfHx5;M`~-#XetIumDcw;*wF(4bJ(JR^7f_- z?|KJ?Lt#)FJgcq*XR~l_(}F7&W#VQv(0X-2_yeEGi;4rvYcbPuMG8RdnfYyiXkH_e zQ?dE=z3ax)-KBtUez~libhN<3`}H)UTKHPTePh#w6wsrmRoouv^z`$#r$zB1EZ~B~ zKS$6jem3J#$>0KYGQabM$!LCC4)=_2k!7gv7j)_xPVznVNTwRBuz181gl-54w0Fj9 zGgX2bsEaQr=OgModP`e5>NxUYH`J9clNx&+S)Z$&7Kw5Ju5F&(F{!4cuEpD)c(_Zh zGW1u2FEG`U;n(7+PmC!IeSZfdVeo=x5gsZWrS5V+AB*HOFjE-{OH%DIm>ybctR%JA zvKe#zP2Bgr#^*gT)QL&zlzh0vW{~+#3P>RgBjmk%3lgl~Zfp5y)!SSxpXP-x43!}$ zV_W2mzCRgi7i6TaKo`hWq@qIEaB@Iv_w4V~CQ;DJ{$n2EmO?Go)NL#7vQl3!Pj-Lx zd6vRjt?7ZCTwA$KGZT*3WtO$AOOR2xAL6a18iK7Lji@v|TRT!u%Jkh;N+({ij04I+ zIn3g_FfS5O7-4K`B=Fyz(1AC?`J!ZD_S4A>15SxnKM+P7dB z__D@(XS0TnOHHQ6TxvETo@x8-RxIHzvJ=+_Y-X8u*_V0`L$-2!-gXe-R_*#FHAk_G zmiUOrxI#r=!c4)BkO?ib?mM2|D5HI=b`)Cm_8@F^N>8DuI7N?7dGV3k384yL$~uuU z#F@TB%whN2>5kBiCnRwC?$5-KC=HC8N6)vOgpY4mcxhC)>UYv>SZ?V@WjnOe06&hojfek$5Q28*MT14#oHdYSc(G*ZRj>}CI2|n|HZ9>-Y@v0Y0t3~ zl6x$Amnd*F34Crv&`alw;c~5SpM^!G`%POi(CGAjYP1Tvc5)K(#T+&`3!cJu-Gt(! zCO_V$h#zb~{o8du2*qa#-;M>3^|-N|Z>|#e6IXdYDa);PmExucYs4oT15soJAptj6s?qYy?{g4MxP;^ zyhpr>B7RO7Ti2N4PiPzqJt4BXZ|iZzEIWGCnotjzM3bhpm&jLI0@ay^K3;nij_wVk zGN$f9yIuuiuMg5DGm8%RWRe$~H8AnO0d@8m(NwAk@v4(pujhyrl_5i6*lTQzrRkL( z{v?~Ui#OLSPvA5&VT*ox;pK^)P?~8OZhD3jOp^QA@3qD@M%E1s5Ccq++oI=lMiI`7MLmAcOW zkZjEjjCsf`b3B9$sH!bj8`uhpEq#%8kKN-BI*1v>ExTJ0?I(Cq-OcwK-acX5bf@{N Uh9g@3`?p9^RPJZBuwKCb09^Nox&QzG literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_blue_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_blue_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..dc4c4f6f0da0a03c903cf6a1e7f84dc2864a3204 GIT binary patch literal 1427 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 LNkvXXu0mjfKvgIU literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_grey_bus.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_grey_bus.png new file mode 100755 index 0000000000000000000000000000000000000000..d43e34bb2634ebe1ea0028dff390741c8fa32990 GIT binary patch literal 1580 zcmV+{2GjY8P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91CZGcV1ONa40RR91CIA2c0EF@&TL1tBmPtfGR9Fe^mQ8FMMHI)qYkQqI zveVFnmL3{fL_-BcDu)89#0ex+(GS7Bv=?q1xO3;W-kf7TsApbI zfhiPfaSnrLPo8@|H?aK-+Y?JCa2C)(a^{S|;vd|(_t5Mg)1S{0!kKjOjl@Y!%a|D+ z-9OM@yzjKCWXdIq*z@F6V_dJ>IaSW6DBe!JzJZa`!^8UrBq1+LZgRx7B(Nrw>z;x%~FS=KN3=61(IE zP(d0BCGd58WQ<}4PLy=}W z^WrCzDc=vqWmis&?^{(&^KtH)Ee?!DoVggR2chSU5Y(2?-8!d+f^wYAnG-+rEDBlJ zhy>HYHR z?K#d^^Y)2i=FMHtXTl!#h`k+< zw$!Mi@CMc?B|q#=$uPC@Pid+xc)}nFj7&6BrC+{!`(nMi&i@*kiM33&w?JGF`zdi{ zq@r^vr?VD|OxW;r;iTDiPb{`1!_Cpasb*qku~s>$s+ z0+bg3vJtxP7yD#<>*}S6a`|qVm}10MKovr!Y~uiSHfoQthH-;}oAck@9NP8BHu>1@ zBZ+~OgtkW&3x>!>MWd8`N5*#+N}tSp^VWM3Yenp?*qRvMG9Xn9d9Fe3S9S;=*?!jh>0Et4#GvBi&xNKfoxboTMsW;yZ!}>BqF~HWv07JP=fr(%9YfPyz zbG;>S`r4JrnM@{kBVXLL$CFQpQOA{vX9FZRm|XSh+O6xQ$+L6czVlH8>W(Y|rX|&K z%2ccAm2J(~Ct$RUee%rz2#R9c#0JF**=)YJ`{5%8i}#Kl$o1W`+s_6?l&e3(X)Ns}$$gVHJd^9mX$Xt*p7)r2*a|8%R30K8>mQdDB zO9In30F1Zd?P<(2CNW7VGhoDtf&s2z_yI)EoE~^RTbfIjS}h3-58Xfj8UYnl!6;+& z2N^$n0K%`Ecs;~;PB+y4uehaM%M7s7G?0000 + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml new file mode 100644 index 0000000000..9276383a2a --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml @@ -0,0 +1,28 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml new file mode 100644 index 0000000000..3d60449b26 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml @@ -0,0 +1,54 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml index 57ae0979a5..0e9b06e8b6 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml @@ -12,7 +12,7 @@ - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintRight_toLeftOf="@+id/bus_task_time_tv"/> + + - - - - - - - + - - + - - - - - + android:layout_marginTop="@dimen/dp_18" + android:layout_marginLeft="@dimen/dp_68" + app:layout_constraintRight_toRightOf="@+id/bus_task_time_tv" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/bus_panel_second_station"/> + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml index cc1babed1f..dc56f53ed7 100644 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -86,7 +86,7 @@ 92px 30px - 616px + 618px 754px @@ -138,4 +138,5 @@ 154px 130px 60px + 27px \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml index dee684f3e6..50b5675277 100644 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -86,7 +86,7 @@ 92px 30px - 616px + 618px 754px @@ -136,4 +136,5 @@ 154px 130px 60px + 27px \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values/colors.xml b/OCH/mogo-och-bus/src/main/res/values/colors.xml index 96338fac55..90e66e5a88 100644 --- a/OCH/mogo-och-bus/src/main/res/values/colors.xml +++ b/OCH/mogo-och-bus/src/main/res/values/colors.xml @@ -45,4 +45,8 @@ #FFFFE198 #FFFF9B00 #59FFFFFF + + #8E9DD4 + #2B6EFF + #00FFF8 \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml index ce34734e02..83e1b61a23 100644 --- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml @@ -152,4 +152,6 @@ 154px 130px 60px + + 27px \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values/strings.xml b/OCH/mogo-och-bus/src/main/res/values/strings.xml index 992ab6c19c..09ead5d3c0 100644 --- a/OCH/mogo-och-bus/src/main/res/values/strings.xml +++ b/OCH/mogo-och-bus/src/main/res/values/strings.xml @@ -26,4 +26,12 @@ 下一站： 自动驾驶状态为0不可用 进站 + 起 + 终 + 班次： + + 提示 + 您确认要结束路线吗？ + 确认 + 取消 diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt new file mode 100644 index 0000000000..1e0fde8d5f --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt @@ -0,0 +1,95 @@ +package com.mogo.och.common.module.wigets + +import android.content.Context +import android.widget.TextView +import androidx.lifecycle.LifecycleObserver +import com.mogo.module.common.dialog.BaseFloatDialog +import com.mogo.och.common.module.R + +/** + * 带有title, tip,confirm,cancel的dialog + */ +class OCHCommitDialog: BaseFloatDialog, LifecycleObserver { + + private var commonConfirm : TextView? = null + private var commonCancel : TextView? = null + private var commonTitle : TextView? = null + private var commonTips : TextView? = null + + private var clickListener: ClickListener? = null + + constructor(builder: Builder,context: Context) : super(context) { + commonTitle?.text = builder.titleStr + commonTips?.text = builder.tipsStr + commonCancel?.text = builder.cancelStr + commonConfirm?.text = builder.confirmStr + } + + init{ + setContentView(R.layout.dialog_bus_commit) + + setCanceledOnTouchOutside(true) + + commonConfirm = findViewById(R.id.common_confirm) + commonCancel = findViewById(R.id.common_cancel) + commonTitle = findViewById(R.id.common_title) + commonTips = findViewById(R.id.common_tips) + + commonConfirm?.setOnClickListener{ + clickListener?.confirm() + dismiss() + } + commonCancel?.setOnClickListener { + clickListener?.cancel() + dismiss() + } + } + + fun setClickListener(clickListener: ClickListener) { + this.clickListener = clickListener + } + + fun showUpgradeDialog(){ + if(isShowing){ + return + } + show() + } + + interface ClickListener{ + fun confirm() + fun cancel() + } + + class Builder{ + var titleStr:String = "" + var tipsStr:String = "" + var confirmStr:String = "" + var cancelStr:String = "" + + fun title(title: String) : Builder{ + this.titleStr = title + return this + } + + fun tips(tips: String) : Builder{ + this.tipsStr = tips + return this + } + + fun confirmStr(commit: String) : Builder{ + this.confirmStr = commit + return this + } + + fun cancelStr(cancel: String) : Builder{ + this.cancelStr = cancel + return this + } + + fun build(context: Context): OCHCommitDialog? { + return OCHCommitDialog(this,context) + } + } + +} \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java new file mode 100644 index 0000000000..5280174fd2 --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java @@ -0,0 +1,165 @@ +package com.mogo.och.common.module.wigets; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Path; +import android.graphics.RectF; +import android.util.AttributeSet; +import android.view.GestureDetector; +import android.view.MotionEvent; + +import androidx.constraintlayout.widget.ConstraintLayout; + +import com.mogo.och.common.module.R; + + +/** + * author : donghongyu + * e-mail : 1358506549@qq.com + * date : 2020/5/27 2:08 PM + * desc : + * version: 1.0 + */ +public class OCHRoundConstraintLayout extends ConstraintLayout implements GestureDetector.OnGestureListener { + + private float roundLayoutRadius = 14f; + private Path roundPath; + private RectF rectF; + + // 上次滑动的坐标 + private int mLastXIntercept; + private int mLastYIntercept; + + private IScrollListener mScrollListener; + + private GestureDetector mDetector; + + public OCHRoundConstraintLayout(Context context) { + this(context, null); + } + + public OCHRoundConstraintLayout(Context context, AttributeSet attrs) { + this(context, attrs, 0); + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundLayout); + roundLayoutRadius = typedArray.getDimensionPixelSize(R.styleable.RoundLayout_roundLayoutRadius, (int) roundLayoutRadius); + typedArray.recycle(); + + init(); + } + + public OCHRoundConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + + private void init() { + setWillNotDraw(false);//如果你继承的是ViewGroup,注意此行,否则draw方法是不会回调的; + roundPath = new Path(); + rectF = new RectF(); + mDetector = new GestureDetector(getContext(), this); + } + + private void setRoundPath() { + //添加一个圆角矩形到path中, 如果要实现任意形状的View, 只需要手动添加path就行 + roundPath.reset(); + roundPath.addRoundRect(rectF, roundLayoutRadius, roundLayoutRadius, Path.Direction.CW); + } + + + public void setRoundLayoutRadius(float roundLayoutRadius) { + this.roundLayoutRadius = roundLayoutRadius; + setRoundPath(); + postInvalidate(); + } + + public void setScrollListener(IScrollListener listener) { + mScrollListener = listener; + } + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + super.onLayout(changed, l, t, r, b); + rectF.set(0f, 0f, getMeasuredWidth(), getMeasuredHeight()); + setRoundPath(); + } + + @Override + public void draw(Canvas canvas) { + if (roundLayoutRadius > 0f) { + canvas.clipPath(roundPath); + } + super.draw(canvas); + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + boolean intercepted = false; + int x = (int) ev.getX(); + int y = (int) ev.getY(); + switch (ev.getAction()) { + case MotionEvent.ACTION_MOVE: + int deltaX = x - mLastXIntercept; + int deltaY = y - mLastYIntercept; + if (Math.abs(deltaX) > Math.abs(deltaY)) { + intercepted = true; + } + break; + default: + break; + } + mLastXIntercept = x; + mLastYIntercept = y; + return intercepted; + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (mDetector != null) { + return mDetector.onTouchEvent(event); + } else { + return super.onTouchEvent(event); + } + } + + @Override + public boolean onDown(MotionEvent e) { + return true; + } + + @Override + public void onShowPress(MotionEvent e) { + } + + @Override + public boolean onSingleTapUp(MotionEvent e) { + return true; + } + + @Override + public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { + return true; + } + + @Override + public void onLongPress(MotionEvent e) { + } + + @Override + public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { + if (e2 != null) { + float deltaX = e2.getX() - (e1 != null ? e1.getX() : 0f); + float deltaY = e2.getY() - (e1 != null ? e1.getY() : 0f); + if (Math.abs(deltaX) > Math.abs(deltaY)) { + if (mScrollListener != null) { + mScrollListener.onScroll(velocityX < 0); + } + } + } + return true; + } + + public interface IScrollListener { + void onScroll(boolean isNextPage); + } +} diff --git a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml new file mode 100644 index 0000000000..9f65ffcb79 --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/values/colors.xml b/OCH/mogo-och-common-module/src/main/res/values/colors.xml new file mode 100644 index 0000000000..3c1365f4de --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #3B4577 + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/values/styles.xml b/OCH/mogo-och-common-module/src/main/res/values/styles.xml new file mode 100644 index 0000000000..d983a865a0 --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/res/values/styles.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file