From 0e3d171e8573e751a10e8f7e259570331aee2398 Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 2 Apr 2022 16:58:06 +0800 Subject: [PATCH] [Bus/Taxi d 2.6.5]Bus code opt --- OCH/README.md | 11 +- OCH/mogo-och-bus/src/main/AndroidManifest.xml | 2 +- .../{OchBusProvider.java => BusProvider.java} | 14 +- .../och/bus/adapter/OchBusStationAdapter.java | 127 --------------- ...st.java => BusOperationStatusRequest.java} | 4 +- ...e.java => BusOperationStatusResponse.java} | 2 +- .../{OchBusOrder.java => BusOrderBean.java} | 4 +- ...rsResponse.java => BusOrdersResponse.java} | 6 +- ....java => BusQueryLineStationsRequest.java} | 8 +- ...t.java => BusResetDrivingLineRequest.java} | 4 +- ...esResponse.java => BusRoutesResponse.java} | 10 +- ...RoutesResult.java => BusRoutesResult.java} | 10 +- ...OchBusStation.java => BusStationBean.java} | 4 +- ...t.java => BusUpdateSiteStatusRequest.java} | 4 +- .../och/bus/bean/CarHeartbeatReqBean.java | 4 +- .../QueryOchBusOperationStatusRequest.java | 21 --- ...java => IBusControllerStatusCallback.java} | 2 +- ...esCallback.java => IBusLinesCallback.java} | 2 +- ....java => ICarOperationStatusCallback.java} | 2 +- .../callback/IRefreshBusStationsCallback.java | 13 ++ ...ack.java => ISlidePannelHideCallback.java} | 2 +- .../callback/RefreshBusStationsCallback.java | 13 -- .../constant/{OchBusConst.kt => BusConst.kt} | 2 +- ...bFragment.java => BaseBusTabFragment.java} | 2 +- .../{OchBusFragment.java => BusFragment.java} | 44 +++--- ...iceManager.java => BusServiceManager.java} | 80 +++++----- ...BusApiService.java => IBusApiService.java} | 32 ++-- ...Callback.java => IBusServiceCallback.java} | 2 +- ...OchBusLineModel.java => BusLineModel.java} | 30 ++-- ...nePresenter.java => BusLinePresenter.java} | 21 ++- ...pManager.java => BusModelLoopManager.java} | 16 +- ...hBusOrderModel.java => BusOrderModel.java} | 144 +++++++++--------- ...OchBusPresenter.java => BusPresenter.java} | 80 +++++----- ...ver.java => TestBusBroadcastReceiver.java} | 8 +- .../och/bus/ui/BusSwitchLineActivity.java | 8 +- ...alyticsUtil.java => BusAnalyticsUtil.java} | 28 ++-- 36 files changed, 308 insertions(+), 458 deletions(-) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/{OchBusProvider.java => BusProvider.java} (91%) delete mode 100644 OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusOperationStatusRequest.java => BusOperationStatusRequest.java} (87%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusOperationStatusResponse.java => BusOperationStatusResponse.java} (82%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusOrder.java => BusOrderBean.java} (97%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusOrdersResponse.java => BusOrdersResponse.java} (70%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusQueryLineStationsRequest.java => BusQueryLineStationsRequest.java} (83%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusResetDrivingLineRequest.java => BusResetDrivingLineRequest.java} (77%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusRoutesResponse.java => BusRoutesResponse.java} (58%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusRoutesResult.java => BusRoutesResult.java} (79%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusStation.java => BusStationBean.java} (98%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/{OchBusUpdateSiteStatusRequest.java => BusUpdateSiteStatusRequest.java} (79%) delete mode 100644 OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryOchBusOperationStatusRequest.java rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/{IOCHBusControllerStatusCallback.java => IBusControllerStatusCallback.java} (89%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/{BusLinesCallback.java => IBusLinesCallback.java} (86%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/{CarOperationStatusCallback.java => ICarOperationStatusCallback.java} (75%) create mode 100644 OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/{SlidePannelHideCallback.java => ISlidePannelHideCallback.java} (72%) delete mode 100644 OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/RefreshBusStationsCallback.java rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/{OchBusConst.kt => BusConst.kt} (99%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/{BaseOchBusTabFragment.java => BaseBusTabFragment.java} (99%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/{OchBusFragment.java => BusFragment.java} (87%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/{OCHBusServiceManager.java => BusServiceManager.java} (72%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/{IOchBusApiService.java => IBusApiService.java} (78%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/{OCHServiceCallback.java => IBusServiceCallback.java} (80%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/{OchBusLineModel.java => BusLineModel.java} (62%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/{OchBusLinePresenter.java => BusLinePresenter.java} (59%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/{OchBusModelLoopManager.java => BusModelLoopManager.java} (70%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/{OchBusOrderModel.java => BusOrderModel.java} (86%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/{OchBusPresenter.java => BusPresenter.java} (74%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/{TestOchBusBroadcastReceiver.java => TestBusBroadcastReceiver.java} (73%) rename OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/{OchBusAnalyticsUtil.java => BusAnalyticsUtil.java} (64%) diff --git a/OCH/README.md b/OCH/README.md index 56d1764db2..1c22eb2ceb 100644 --- a/OCH/README.md +++ b/OCH/README.md @@ -1,7 +1,6 @@ # 网约车(Online Car Hailing) - -## 小巴 - -## 出租车 - -## 无实现 \ No newline at end of file +1. mogo-och-bus：Bus司机端（Bus） +2. mogo-och-bus-passenger：Bus乘客端（BusPassenger） +3. mogo-och-taxi：Taxi司机端（Taxi） +4. mogo-och-taxi-passenger：Taxi乘客端（TaxiPassenger） +5. mogo-och-noop：空实现，用于独立鹰眼打包 \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/AndroidManifest.xml b/OCH/mogo-och-bus/src/main/AndroidManifest.xml index b0136c57cc..0e09e1a997 100644 --- a/OCH/mogo-och-bus/src/main/AndroidManifest.xml +++ b/OCH/mogo-och-bus/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ - + diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java similarity index 91% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java index 3491e3fbac..43e18b13f0 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java @@ -12,8 +12,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.MogoMapUIController; import com.mogo.module.common.MogoApisHandler; -import com.mogo.och.bus.constant.OchBusConst; -import com.mogo.och.bus.fragment.OchBusFragment; +import com.mogo.och.bus.constant.BusConst; +import com.mogo.och.bus.fragment.BusFragment; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -25,12 +25,12 @@ import org.jetbrains.annotations.Nullable; * * @author tongchenfei */ -@Route(path = OchBusConst.PATH) -public class OchBusProvider implements IMogoOCH { +@Route(path = BusConst.PATH) +public class BusProvider implements IMogoOCH { - private static final String TAG = "OchBusProvider"; + private static final String TAG = "BusProvider"; - private OchBusFragment busFragment; + private BusFragment busFragment; private int containerId; private FragmentActivity activity; @@ -52,7 +52,7 @@ public class OchBusProvider implements IMogoOCH { private void showFragment() { if (busFragment == null) { CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); - busFragment = new OchBusFragment(); + busFragment = new BusFragment(); activity.getSupportFragmentManager().beginTransaction().add(containerId, busFragment).commitAllowingStateLoss(); return; } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java deleted file mode 100644 index 8322cd8a35..0000000000 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.mogo.och.bus.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.mogo.och.bus.R; -import com.mogo.och.bus.bean.OchBusStation; -import com.mogo.och.bus.constant.OchBusConst; -import com.mogo.och.bus.view.VerticalDashLineView; - -import java.util.ArrayList; -import java.util.List; - -/** - * Station Panel 中的车站列表adapter - * - * @author tongchenfei - */ -public class OchBusStationAdapter extends RecyclerView.Adapter { - private final Context context; - private final List stationList = new ArrayList<>(); - private int currentStation; - - public OchBusStationAdapter(Context context) { - this.context = context; - } - - public void refreshStationList(List stationList) { - this.stationList.clear(); - this.stationList.addAll(stationList); - for (int i = 0; i < stationList.size(); i++) { - OchBusStation station = stationList.get(i); - if (station.getDrivingStatus() == OchBusConst.STATION_STATUS_ARRIVING || station.getDrivingStatus() == OchBusConst.STATION_STATUS_STOPPED ) { - currentStation = i; - break; - } - } - notifyDataSetChanged(); - } - - @NonNull - @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_och_bus_station, parent, false)); - } - - @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { -// CallerLogger.INSTANCE.d(M_BUS + "OchBusStationAdapter", "position: " + position + " currPos: " + currentStation + " station: " + stationList.get(position)); - holder.tvStationName.setText(stationList.get(position).getName()); - if (position == currentStation) { - if (currentStation == 0) { - // 在起始点 - holder.tvStationName.setTextColor(context.getResources().getColor(R.color.bus_arrived_station_name_text_color)); - holder.ivIcon.setImageResource(R.drawable.bus_icon_arrived_station); - holder.vDashBottom.setColor(context.getResources().getColor(R.color.bus_not_arrive_dash_color)); - } else { - holder.tvStationName.setTextColor(context.getResources().getColor(R.color.bus_current_station_name_text_color)); - holder.ivIcon.setImageResource(R.drawable.bus_icon_arriving_station); - holder.vDashTop.setGradient(context.getResources().getColor(R.color.bus_arriving_start_dash_color), context.getResources().getColor(R.color.bus_arriving_end_dash_color)); - holder.vDashBottom.setColor(context.getResources().getColor(R.color.bus_not_arrive_dash_color)); - } - } else if (position < currentStation) { - // 驶过 - holder.tvStationName.setTextColor(context.getResources().getColor(R.color.bus_arrived_station_name_text_color)); - holder.ivIcon.setImageResource(R.drawable.bus_icon_arrived_station); - if (position == currentStation - 1) { - holder.vDashBottom.setGradient(context.getResources().getColor(R.color.bus_leaving_start_dash_color), context.getResources().getColor(R.color.bus_leaving_end_dash_color)); - holder.vDashTop.setColor(context.getResources().getColor(R.color.bus_arrived_dash_color)); - } else { - holder.vDashTop.setColor(context.getResources().getColor(R.color.bus_arrived_dash_color)); - holder.vDashBottom.setColor(context.getResources().getColor(R.color.bus_arrived_dash_color)); - } - } else { - holder.tvStationName.setTextColor(context.getResources().getColor(R.color.bus_not_arrive_station_name_text_color)); - holder.ivIcon.setImageResource(R.drawable.bus_icon_not_arrive_station); - holder.vDashTop.setColor(context.getResources().getColor(R.color.bus_not_arrive_dash_color)); - holder.vDashBottom.setColor(context.getResources().getColor(R.color.bus_not_arrive_dash_color)); - } - - if (position == 0) { - holder.tvStationNotice.setText("起点"); - holder.tvStationNotice.setVisibility(View.VISIBLE); - holder.vDashTop.setVisibility(View.GONE); - holder.vDashBottom.setVisibility(View.VISIBLE); - } else if (position == getItemCount() - 1) { - holder.tvStationNotice.setText("终点"); - holder.tvStationNotice.setVisibility(View.VISIBLE); - holder.vDashTop.setVisibility(View.VISIBLE); - holder.vDashBottom.setVisibility(View.GONE); - } else { - holder.tvStationNotice.setVisibility(View.GONE); - holder.vDashTop.setVisibility(View.VISIBLE); - holder.vDashBottom.setVisibility(View.VISIBLE); - - } - - } - - @Override - public int getItemCount() { - return stationList.size(); - } - - static class ViewHolder extends RecyclerView.ViewHolder { - ImageView ivIcon; - TextView tvStationName; - TextView tvStationNotice; - VerticalDashLineView vDashBottom, vDashTop; - - public ViewHolder(@NonNull View itemView) { - super(itemView); - ivIcon = itemView.findViewById(R.id.module_mogo_och_bus_station_icon); - tvStationName = itemView.findViewById(R.id.module_mogo_och_bus_station_name); - tvStationNotice = itemView.findViewById(R.id.module_mogo_och_bus_station_notice); - vDashTop = itemView.findViewById(R.id.module_mogo_och_bus_station_top_dash); - vDashBottom = itemView.findViewById(R.id.module_mogo_och_bus_station_bottom_dash); - } - } -} diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java similarity index 87% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusRequest.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java index fcc762be44..0ab375e2d4 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusRequest.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java @@ -10,12 +10,12 @@ public * * 小巴车运营状态请求参数 */ -class OchBusOperationStatusRequest { +class BusOperationStatusRequest { private String sn; private double lat; private double lon; - public OchBusOperationStatusRequest(double lon, double lat) { + public BusOperationStatusRequest(double lon, double lat) { this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.lat = lat; this.lon = lon; diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusResponse.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusResponse.java similarity index 82% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusResponse.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusResponse.java index fd60cc3b4d..744fbac9c5 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusResponse.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusResponse.java @@ -8,7 +8,7 @@ import com.mogo.eagle.core.data.BaseData; * * 小巴车运营状态返回参数 */ -public class OchBusOperationStatusResponse extends BaseData { +public class BusOperationStatusResponse extends BaseData { public Result data; diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOrder.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java similarity index 97% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOrder.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java index b1a1208681..85c3a1da58 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOrder.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java @@ -6,7 +6,7 @@ package com.mogo.och.bus.bean; *

* 小巴订单 */ -public class OchBusOrder { +public class BusOrderBean { /** * orderNo number @@ -74,7 +74,7 @@ public class OchBusOrder { @Override public String toString() { - return "OchBusOrder{" + + return "BusOrderBean{" + "orderNo=" + orderNo + ", passengerPhone='" + passengerPhone + '\'' + ", startStationId=" + startStationId + diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOrdersResponse.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java similarity index 70% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOrdersResponse.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java index 252858472b..2215a298a5 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOrdersResponse.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java @@ -8,15 +8,15 @@ import java.util.List; * @author: wangmingjun * @date: 2021/10/19 */ -public class OchBusOrdersResponse extends BaseData { +public class BusOrdersResponse extends BaseData { public Result data; public static class Result{ - public List orders; + public List orders; } @Override public String toString() { - return "OchBusOrdersResponse{" + + return "BusOrdersResponse{" + "data=" + data + '}'; } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusQueryLineStationsRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java similarity index 83% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusQueryLineStationsRequest.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java index fdd0d7461e..6485027084 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusQueryLineStationsRequest.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java @@ -9,7 +9,7 @@ public * * 根据车机行驶线路站点信息 */ -class OchBusQueryLineStationsRequest { +class BusQueryLineStationsRequest { private String sn; private double lat; @@ -17,7 +17,7 @@ class OchBusQueryLineStationsRequest { private boolean markDrivingStatus; // 默认false；true:是否需要返回站点的行驶状态，对应返回的drivingStatus // 0 - 关闭、1 - 启动 // public String status; - public OchBusQueryLineStationsRequest(double lon, double lat,boolean markDrivingStatus) { + public BusQueryLineStationsRequest(double lon, double lat, boolean markDrivingStatus) { this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.lat = lat; this.lon = lon; @@ -51,12 +51,12 @@ class OchBusQueryLineStationsRequest { public double getLon() { return lon; } - // public OchBusOperationStatusRequest shutdown() { + // public BusOperationStatusRequest shutdown() { // status = "0"; // return this; // } // -// public OchBusOperationStatusRequest launch() { +// public BusOperationStatusRequest launch() { // status = "1"; // return this; // } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusResetDrivingLineRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java similarity index 77% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusResetDrivingLineRequest.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java index 4faf1980a8..c27264694f 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusResetDrivingLineRequest.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java @@ -7,11 +7,11 @@ import com.mogo.commons.network.Utils; * @author: wangmingjun * @date: 2021/10/18 */ -public class OchBusResetDrivingLineRequest { +public class BusResetDrivingLineRequest { public String sn; public int lineId; //切换到的线路id - public OchBusResetDrivingLineRequest(int lineId) { + public BusResetDrivingLineRequest(int lineId) { sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.lineId = lineId; } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResponse.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java similarity index 58% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResponse.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java index 0b7c31b096..2c9bad3e3c 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResponse.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java @@ -7,20 +7,20 @@ import com.mogo.eagle.core.data.BaseData; * * @author tongchenfei */ -public class OchBusRoutesResponse extends BaseData { - private OchBusRoutesResult data; +public class BusRoutesResponse extends BaseData { + private BusRoutesResult data; - public OchBusRoutesResult getResult() { + public BusRoutesResult getResult() { return data; } - public void setResult(OchBusRoutesResult data) { + public void setResult(BusRoutesResult data) { this.data = data; } @Override public String toString() { - return "OchBusRoutesResponse{" + + return "BusRoutesResponse{" + "data=" + data + '}'; } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResult.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java similarity index 79% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResult.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java index c55f12b3db..3a99d5d57e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResult.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java @@ -7,8 +7,8 @@ import java.util.List; * * @author tongchenfei */ -public class OchBusRoutesResult { - private List sites; +public class BusRoutesResult { + private List sites; private int lineId; private String name; private int lineType; //线路类型，0:环形 @@ -23,17 +23,17 @@ public class OchBusRoutesResult { return name; } - public List getSites() { + public List getSites() { return sites; } - public void setSite(List site) { + public void setSite(List site) { this.sites = sites; } @Override public String toString() { - return "OchBusRoutesResult{" + + return "BusRoutesResult{" + "sites=" + sites + ", lineId=" + lineId + ", name='" + name + '\'' + diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusStation.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusStationBean.java similarity index 98% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusStation.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusStationBean.java index e70d321a40..4e8b00eb18 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusStation.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusStationBean.java @@ -5,7 +5,7 @@ package com.mogo.och.bus.bean; * * @author tongchenfei */ -public class OchBusStation { +public class BusStationBean { // private int lineId; // private int siteId; // private String siteName; @@ -134,7 +134,7 @@ public class OchBusStation { @Override public String toString() { - return "OchBusStation{" + + return "BusStationBean{" + "name='" + name + '\'' + ", description='" + description + '\'' + ", cityCode='" + cityCode + '\'' + diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusUpdateSiteStatusRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java similarity index 79% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusUpdateSiteStatusRequest.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java index ed5923c905..a9552157ff 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusUpdateSiteStatusRequest.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java @@ -9,7 +9,7 @@ import com.mogo.commons.network.Utils; * * 小巴车运营状态请求参数 */ -public class OchBusUpdateSiteStatusRequest { +public class BusUpdateSiteStatusRequest { public String sn; public int seq;//站点序号 @@ -17,7 +17,7 @@ public class OchBusUpdateSiteStatusRequest { public double lon; public double lat; - public OchBusUpdateSiteStatusRequest(int seq, int siteId, double lon, double lat) { + public BusUpdateSiteStatusRequest(int seq, int siteId, double lon, double lat) { this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.seq = seq; this.siteId = siteId; diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java index c85a2d0b82..dcacb5e380 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.och.bus.constant.OchBusConst; +import com.mogo.och.bus.constant.BusConst; import java.util.UUID; @@ -21,6 +21,6 @@ public class CarHeartbeatReqBean { this.lon = lon; this.lat = lat; this.msgId = UUID.randomUUID().toString(); - this.interval = (int) (OchBusConst.LOOP_PERIOD_60S / 1000); + this.interval = (int) (BusConst.LOOP_PERIOD_60S / 1000); } } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryOchBusOperationStatusRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryOchBusOperationStatusRequest.java deleted file mode 100644 index ceaf72c7f8..0000000000 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryOchBusOperationStatusRequest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.mogo.och.bus.bean; - -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.network.Utils; - -public -/** - * @author congtaowang - * @since 2021/3/22 - * - * 小巴车运营状态请求参数 - */ -class QueryOchBusOperationStatusRequest { - - public String sn; - - - public QueryOchBusOperationStatusRequest() { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); - } -} diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IOCHBusControllerStatusCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java similarity index 89% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IOCHBusControllerStatusCallback.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java index 1e7bd30279..e03e963942 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IOCHBusControllerStatusCallback.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java @@ -7,7 +7,7 @@ import android.location.Location; * * Model->Presenter回调：状态控制器监听（accOn、adas ui show、voice ui show、push ui show、v2x ui show等等） */ -public interface IOCHBusControllerStatusCallback { +public interface IBusControllerStatusCallback { // 是否vr map模式 void onVRModeChanged(boolean isVRMode); // 自车定位 diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/BusLinesCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java similarity index 86% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/BusLinesCallback.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java index 9f35270323..b181736278 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/BusLinesCallback.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java @@ -6,7 +6,7 @@ import com.mogo.och.bus.bean.BusQueryLinesResponse; * @author: wangmingjun * @date: 2022/2/9 */ -public interface BusLinesCallback { +public interface IBusLinesCallback { void onBusLinesChange(BusQueryLinesResponse lines); void onChangeLineIdSuccess(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/CarOperationStatusCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ICarOperationStatusCallback.java similarity index 75% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/CarOperationStatusCallback.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ICarOperationStatusCallback.java index 0e9cd198da..d414f71e2c 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/CarOperationStatusCallback.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ICarOperationStatusCallback.java @@ -4,6 +4,6 @@ package com.mogo.och.bus.callback; * @author: wangmingjun * @date: 2021/10/22 */ -public interface CarOperationStatusCallback { +public interface ICarOperationStatusCallback { void changeOperationStatus(boolean changeStatus); } 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 new file mode 100644 index 0000000000..854a2699d5 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java @@ -0,0 +1,13 @@ +package com.mogo.och.bus.callback; + +import com.mogo.och.bus.bean.BusStationBean; + +import java.util.List; + +/** + * @author: wangmingjun + * @date: 2021/10/22 + */ +public interface IRefreshBusStationsCallback { + void refreshBusStations(List stationList, int currentStation, int nextStation, boolean isArrived); +} diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/SlidePannelHideCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java similarity index 72% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/SlidePannelHideCallback.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java index 11dd2f0d36..16e6893135 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/SlidePannelHideCallback.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java @@ -4,6 +4,6 @@ package com.mogo.och.bus.callback; * @author: wangmingjun * @date: 2021/10/22 */ -public interface SlidePannelHideCallback { +public interface ISlidePannelHideCallback { void hideSlidePanel(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/RefreshBusStationsCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/RefreshBusStationsCallback.java deleted file mode 100644 index bc59a7ba79..0000000000 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/RefreshBusStationsCallback.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.och.bus.callback; - -import com.mogo.och.bus.bean.OchBusStation; - -import java.util.List; - -/** - * @author: wangmingjun - * @date: 2021/10/22 - */ -public interface RefreshBusStationsCallback { - void refreshBusStations(List stationList, int currentStation, int nextStation,boolean isArrived); -} diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt similarity index 99% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt index 5f07d5d097..563b0825a5 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt @@ -5,7 +5,7 @@ import com.mogo.commons.debug.DebugConfig /** * Created on 2021/12/6 */ -class OchBusConst { +class BusConst { companion object { private const val BASE_URL_OCH_DEV = "http://tech-dev.zhidaohulian.com" diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java similarity index 99% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index c62af56dd5..eaeca9f788 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -53,7 +53,7 @@ import record_cache.RecordPanelOuterClass; * * @author tongchenfei */ -public abstract class BaseOchBusTabFragment> extends MvpFragment implements IMogoMapListener, IMoGoAutopilotIdentifyListener { +public abstract class BaseBusTabFragment> extends MvpFragment implements IMogoMapListener, IMoGoAutopilotIdentifyListener { private static final String TAG = "BaseOchFragment"; 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/BusFragment.java similarity index 87% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index c44cba062b..8f91c9407a 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/BusFragment.java @@ -20,9 +20,9 @@ import com.mogo.map.MogoMarkerManager; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.och.bus.R; -import com.mogo.och.bus.bean.OchBusStation; -import com.mogo.och.bus.constant.OchBusConst; -import com.mogo.och.bus.presenter.OchBusPresenter; +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.BusSwitchLineActivity; import com.mogo.och.bus.view.SlidePanelView; @@ -36,9 +36,9 @@ import mogo.telematics.pad.MessagePad; * * @author tongchenfei */ -public class OchBusFragment extends BaseOchBusTabFragment +public class BusFragment extends BaseBusTabFragment implements SlidePanelView.OnSlidePanelMoveToEndListener, View.OnClickListener { - private static final String TAG = "OchBusFragment"; + private static final String TAG = "BusFragment"; private TextView mCurrentStationName; private TextView mStartStationFlag; @@ -50,12 +50,12 @@ public class OchBusFragment extends BaseOchBusTabFragment stationList, int currentStation, int nextStation, boolean isArrived) { + public void refreshBusStations(List stationList, int currentStation, int nextStation, boolean isArrived) { mCurrentStation = currentStation; if (getActivity() == null) { return; @@ -149,7 +149,7 @@ public class OchBusFragment extends BaseOchBusTabFragment stationList, int currentStation + private void renderCurrentStationStatus(List stationList, int currentStation , int nextStation, boolean isArrived) { CallerLogger.INSTANCE.d(M_BUS + "MapMaker ", "currentStation=" + currentStation + ",nextStation=" + nextStation + "isArrived=" + isArrived); String currentStationName = null; @@ -173,16 +173,16 @@ public class OchBusFragment extends BaseOchBusTabFragment 0 && currentStation < stationList.size() - 1) {// 是否到达站点 isArriveAtStation = true; - setOrRemoveMapMaker(false, OchBusConst.BUS_START_MAP_MAKER, startStation.getLat() + setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() , startStation.getLon()); - setOrRemoveMapMaker(true, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat() + setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat() , endStation.getLon()); } else if (currentStation == stationList.size() - 1) {// 是否到达终点 isArriveEndStation = true; @@ -191,14 +191,14 @@ public class OchBusFragment extends BaseOchBusTabFragment callback){ + public void resetStationStatus(Context context, int lineId, IBusServiceCallback callback){ mService.resetStationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() - ,MoGoAiCloudClientConfig.getInstance().getToken(),new OchBusResetDrivingLineRequest(lineId)) + ,MoGoAiCloudClientConfig.getInstance().getToken(),new BusResetDrivingLineRequest(lineId)) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) .subscribe(getSubscribeImpl(context,callback,"debugResetStationStatus")); } @@ -85,11 +85,11 @@ public class OCHBusServiceManager { * @param siteId * @param callback */ - public void leaveStation(Context context,int seq,int siteId,OCHServiceCallback callback){ + public void leaveStation(Context context, int seq, int siteId, IBusServiceCallback callback){ mService.leaveStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new OchBusUpdateSiteStatusRequest(seq,siteId,OchBusOrderModel.getInstance().mLongitude - ,OchBusOrderModel.getInstance().mLatitude)) + ,new BusUpdateSiteStatusRequest(seq,siteId, BusOrderModel.getInstance().mLongitude + , BusOrderModel.getInstance().mLatitude)) .subscribeOn( Schedulers.io() ) .observeOn( AndroidSchedulers.mainThread() ) .subscribe(getSubscribeImpl(context,callback,"leaveStation")); @@ -102,11 +102,11 @@ public class OCHBusServiceManager { * @param siteId * @param callback */ - public void arriveSiteStation(Context context,int seq,int siteId,OCHServiceCallback callback){ + public void arriveSiteStation(Context context, int seq, int siteId, IBusServiceCallback callback){ mService.arriveSiteStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new OchBusUpdateSiteStatusRequest(seq,siteId - ,OchBusOrderModel.getInstance().mLongitude,OchBusOrderModel.getInstance().mLatitude)) + ,new BusUpdateSiteStatusRequest(seq,siteId + , BusOrderModel.getInstance().mLongitude, BusOrderModel.getInstance().mLatitude)) .subscribeOn( Schedulers.io() ) .observeOn( AndroidSchedulers.mainThread() ) .subscribe(getSubscribeImpl(context,callback,"leaveStation")); @@ -119,8 +119,8 @@ public class OCHBusServiceManager { * @param siteId * @param callback */ - public void queryStationLeaveAwayPassengers(Context context,int seq,int siteId - ,OCHServiceCallback callback){ + public void queryStationLeaveAwayPassengers(Context context, int seq, int siteId + , IBusServiceCallback callback){ mService.queryStationLeaveAwayPassengers( MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new QueryLeaveAwayPassengersRequest(seq,siteId)) .subscribeOn( Schedulers.io() ) @@ -133,11 +133,11 @@ public class OCHBusServiceManager { * @param context * @param callback */ - public void stopTakeOrder(Context context,OCHServiceCallback callback){ + public void stopTakeOrder(Context context, IBusServiceCallback callback){ mService.stopTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new OchBusOperationStatusRequest(OchBusOrderModel.getInstance().mLongitude - ,OchBusOrderModel.getInstance().mLatitude)) + ,new BusOperationStatusRequest(BusOrderModel.getInstance().mLongitude + , BusOrderModel.getInstance().mLatitude)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(getSubscribeImpl(context,callback,"stopTakeOrder")); @@ -148,11 +148,11 @@ public class OCHBusServiceManager { * @param context * @param callback */ - public void startTakeOrder(Context context,OCHServiceCallback callback){ + public void startTakeOrder(Context context, IBusServiceCallback callback){ mService.startTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new OchBusOperationStatusRequest(OchBusOrderModel.getInstance().mLongitude - ,OchBusOrderModel.getInstance().mLatitude)) + ,new BusOperationStatusRequest(BusOrderModel.getInstance().mLongitude + , BusOrderModel.getInstance().mLatitude)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(getSubscribeImpl(context,callback,"startTakeOrder")); @@ -163,7 +163,7 @@ public class OCHBusServiceManager { * @param context * @param callback */ - public void queryOperationStatus(Context context,OCHServiceCallback callback){ + public void queryOperationStatus(Context context, IBusServiceCallback callback){ mService.queryOperationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn( Schedulers.io() ) @@ -176,7 +176,7 @@ public class OCHBusServiceManager { * @param context * @param callback */ - public void queryBusOrders(Context context, OCHServiceCallback callback){ + public void queryBusOrders(Context context, IBusServiceCallback callback){ mService.queryBusOrders(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) @@ -184,7 +184,7 @@ public class OCHBusServiceManager { .subscribe(getSubscribeImpl(context,callback,"queryBusOrders")); } - public void queryBusLines(Context context, OCHServiceCallback callback){ + public void queryBusLines(Context context, IBusServiceCallback callback){ mService.queryBusLines(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) @@ -200,7 +200,7 @@ public class OCHBusServiceManager { * @param callback */ public void runCarHeartbeat(Context context, double lon, double lat, - OCHServiceCallback callback) { + IBusServiceCallback callback) { mService.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new CarHeartbeatReqBean( MoGoAiCloudClientConfig.getInstance().getSn(), lon, lat)) @@ -209,7 +209,7 @@ public class OCHBusServiceManager { .subscribe(getSubscribeImpl(context, callback, "runCarHeartbeat")); } - private SubscribeImpl getSubscribeImpl(Context context, OCHServiceCallback callback, String apiName){ + private SubscribeImpl getSubscribeImpl(Context context, IBusServiceCallback callback, String apiName){ return new SubscribeImpl(RequestOptions.create(context)){ @Override public void onSuccess(T o) { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusApiService.java similarity index 78% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusApiService.java index 3ba0aa2c76..31a4af6df5 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusApiService.java @@ -1,16 +1,16 @@ package com.mogo.och.bus.net; import com.mogo.eagle.core.data.BaseData; +import com.mogo.och.bus.bean.BusOperationStatusRequest; +import com.mogo.och.bus.bean.BusOrdersResponse; import com.mogo.och.bus.bean.BusQueryLinesResponse; +import com.mogo.och.bus.bean.BusRoutesResponse; import com.mogo.och.bus.bean.CarHeartbeatReqBean; -import com.mogo.och.bus.bean.OchBusOperationStatusRequest; -import com.mogo.och.bus.bean.OchBusQueryLineStationsRequest; -import com.mogo.och.bus.bean.OchBusOperationStatusResponse; -import com.mogo.och.bus.bean.OchBusOrdersResponse; -import com.mogo.och.bus.bean.OchBusRoutesResponse; +import com.mogo.och.bus.bean.BusQueryLineStationsRequest; +import com.mogo.och.bus.bean.BusOperationStatusResponse; import com.mogo.och.bus.bean.QueryLeaveAwayPassengersRequest; import com.mogo.och.bus.bean.QueryLeaveAwayPassengersResponse; -import com.mogo.och.bus.bean.OchBusResetDrivingLineRequest; -import com.mogo.och.bus.bean.OchBusUpdateSiteStatusRequest; +import com.mogo.och.bus.bean.BusResetDrivingLineRequest; +import com.mogo.och.bus.bean.BusUpdateSiteStatusRequest; import io.reactivex.Observable; import retrofit2.http.Body; @@ -27,7 +27,7 @@ import retrofit2.http.Query; *

* wiki: http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48970072 */ -public interface IOchBusApiService { +public interface IBusApiService { /** * 根据车机坐标获取所在区域全部站点信息 * @@ -38,7 +38,7 @@ public interface IOchBusApiService { // @POST( "/autopilot-car-hailing/line/v2/lineDataWithDriver/query" ) @POST( "/autopilot-car-hailing/line/v2/driver/bus/lineDataWithDriver/query" ) // @POST( "/mock/268/autopilot-car-hailing/bus/api/lineDataWithDriver/query" ) - Observable< OchBusRoutesResponse > querySiteByCoordinate(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusQueryLineStationsRequest request); + Observable querySiteByCoordinate(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusQueryLineStationsRequest request); /** * 重置巴士路线： 点击小巴车tab 或者出车后会使用 @@ -50,7 +50,7 @@ public interface IOchBusApiService { // @POST( "/autopilot-car-hailing/car/v2/bus/drivingLine/reset" ) @POST( "/autopilot-car-hailing/car/v2/driver/bus/drivingLine/reset" ) // @POST( "/mock/268/autopilot-car-hailing/bus/api/drivingLine/reset" ) - Observable< OchBusRoutesResponse > resetStationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Body OchBusResetDrivingLineRequest request); + Observable resetStationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusResetDrivingLineRequest request); /** * 离站，通知服务器 @@ -61,7 +61,7 @@ public interface IOchBusApiService { // @POST("/autopilot-car-hailing/car/v2/bus/driving/away") @POST("/autopilot-car-hailing/car/v2/driver/bus/driving/away") // @POST("/mock/268/autopilot-car-hailing/bus/api/driving/away") - Observable< OchBusRoutesResponse > leaveStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusUpdateSiteStatusRequest request); + Observable leaveStation(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusUpdateSiteStatusRequest request); /** * 到站 更新到站信息 @@ -72,7 +72,7 @@ public interface IOchBusApiService { // @POST("/autopilot-car-hailing/order/v2/bus/driving/attachSite") @POST("/autopilot-car-hailing/order/v2/driver/bus/driving/attachSite") // @POST("/mock/268/autopilot-car-hailing/bus/api/driving/attachSite") - Observable< BaseData > arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusUpdateSiteStatusRequest request); + Observable< BaseData > arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body BusUpdateSiteStatusRequest request); /** @@ -95,7 +95,7 @@ public interface IOchBusApiService { // @POST("/autopilot-car-hailing/car/v2/bus/startTakeOrder") @POST("/autopilot-car-hailing/car/v2/driver/bus/startTakeOrder") // @POST("/mock/268/autopilot-car-hailing/bus/api/startTakeOrder") - Observable startTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusOperationStatusRequest request); + Observable startTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body BusOperationStatusRequest request); /** * 收车 @@ -106,7 +106,7 @@ public interface IOchBusApiService { // @POST("/autopilot-car-hailing/car/v2/bus/stopTakeOrder") @POST("/autopilot-car-hailing/car/v2/driver/bus/stopTakeOrder") // @POST("/mock/268/autopilot-car-hailing/bus/api/stopTakeOrder") - Observable stopTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusOperationStatusRequest request); + Observable stopTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body BusOperationStatusRequest request); /** * 查询小巴出车/收车状态 @@ -117,13 +117,13 @@ public interface IOchBusApiService { // @GET("/autopilot-car-hailing/car/v2/bus/takeOrderStatus/query") @GET("/autopilot-car-hailing/car/v2/driver/bus/takeOrderStatus/query") // @GET("/mock/268/autopilot-car-hailing/bus/api/takeOrderStatus/query") - Observable queryOperationStatus(@Header ("appId") String appId,@Header("ticket") String ticket,@Query("sn") String sn); + Observable queryOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); @Headers({"Content-type:application/json;charset=UTF-8"}) // @GET("/autopilot-car-hailing/order/v2/bus/servicingOrders/query") @GET("/autopilot-car-hailing/order/v2/driver/bus/servicingOrders/query") // @GET("/mock/268/autopilot-car-hailing/bus/api/servicingOrders/query") - Observable queryBusOrders(@Header ("appId") String appId,@Header("ticket") String ticket,@Query("sn") String sn); + Observable queryBusOrders(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); /** * 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度 diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/OCHServiceCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusServiceCallback.java similarity index 80% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/OCHServiceCallback.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusServiceCallback.java index a243248570..966a86d980 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/OCHServiceCallback.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusServiceCallback.java @@ -4,7 +4,7 @@ package com.mogo.och.bus.net; * @author: wangmingjun * @date: 2021/10/20 */ -public interface OCHServiceCallback< T >{ +public interface IBusServiceCallback< T >{ void onSuccess(T o); void onFail(String failMsg); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusLineModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLineModel.java similarity index 62% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusLineModel.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLineModel.java index 7764957647..84f715c78e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusLineModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLineModel.java @@ -5,40 +5,40 @@ import android.content.Context; import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.och.bus.bean.BusQueryLinesResponse; -import com.mogo.och.bus.bean.OchBusRoutesResponse; -import com.mogo.och.bus.callback.BusLinesCallback; -import com.mogo.och.bus.net.OCHBusServiceManager; -import com.mogo.och.bus.net.OCHServiceCallback; +import com.mogo.och.bus.bean.BusRoutesResponse; +import com.mogo.och.bus.callback.IBusLinesCallback; +import com.mogo.och.bus.net.BusServiceManager; +import com.mogo.och.bus.net.IBusServiceCallback; /** * @author: wangmingjun * @date: 2022/2/9 */ -public class OchBusLineModel { - private static volatile OchBusLineModel sInstance; +public class BusLineModel { + private static volatile BusLineModel sInstance; private Context mContext; - private BusLinesCallback mBusLinesCallback; - public static OchBusLineModel getInstance() { + private IBusLinesCallback mBusLinesCallback; + public static BusLineModel getInstance() { if ( sInstance == null ) { - synchronized ( OchBusLineModel.class ) { + synchronized ( BusLineModel.class ) { if ( sInstance == null ) { - sInstance = new OchBusLineModel(); + sInstance = new BusLineModel(); } } } return sInstance; } - private OchBusLineModel() { + private BusLineModel() { } public void init() { mContext = AbsMogoApplication.getApp(); } - public void setBusLinesCallback(BusLinesCallback callback){ + public void setBusLinesCallback(IBusLinesCallback callback){ mBusLinesCallback = callback; } public void queryBusLines(){ - OCHBusServiceManager.getInstance().queryBusLines(mContext, new OCHServiceCallback() { + BusServiceManager.getInstance().queryBusLines(mContext, new IBusServiceCallback() { @Override public void onSuccess(BusQueryLinesResponse data) { if (null == data && mBusLinesCallback != null) { @@ -59,9 +59,9 @@ public class OchBusLineModel { } public void commitSwitchLineId(int lineId){ - OCHBusServiceManager.getInstance().resetStationStatus(mContext,lineId, new OCHServiceCallback() { + BusServiceManager.getInstance().resetStationStatus(mContext,lineId, new IBusServiceCallback() { @Override - public void onSuccess(OchBusRoutesResponse o) { + public void onSuccess(BusRoutesResponse o) { if (mBusLinesCallback != null){ mBusLinesCallback.onChangeLineIdSuccess(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusLinePresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java similarity index 59% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusLinePresenter.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java index de2289284a..b4c4446589 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusLinePresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java @@ -5,20 +5,19 @@ import androidx.lifecycle.LifecycleOwner; import com.mogo.commons.mvp.Presenter; import com.mogo.och.bus.bean.BusQueryLinesResponse; -import com.mogo.och.bus.callback.BusLinesCallback; -import com.mogo.och.bus.ui.BusSwitchLineActivity; +import com.mogo.och.bus.callback.IBusLinesCallback; import com.mogo.och.bus.ui.BusSwitchLineView; /** * @author: wangmingjun * @date: 2022/2/9 */ -public class OchBusLinePresenter extends Presenter implements BusLinesCallback { +public class BusLinePresenter extends Presenter implements IBusLinesCallback { - public OchBusLinePresenter(BusSwitchLineView view) { + public BusLinePresenter(BusSwitchLineView view) { super(view); - OchBusLineModel.getInstance().init(); - OchBusOrderModel.getInstance().init(); + BusLineModel.getInstance().init(); + BusOrderModel.getInstance().init(); } @Override @@ -28,7 +27,7 @@ public class OchBusLinePresenter extends Presenter implements } private void initListener() { - OchBusLineModel.getInstance().setBusLinesCallback(this); + BusLineModel.getInstance().setBusLinesCallback(this); } @Override @@ -42,20 +41,20 @@ public class OchBusLinePresenter extends Presenter implements } public void queryBusLines(){ - OchBusLineModel.getInstance().queryBusLines(); + BusLineModel.getInstance().queryBusLines(); } public void commitSwitchLineId(int lineId){ - OchBusLineModel.getInstance().commitSwitchLineId(lineId); + BusLineModel.getInstance().commitSwitchLineId(lineId); } public void queryBusRoutes(){ - OchBusOrderModel.getInstance().queryBusRoutes(); + BusOrderModel.getInstance().queryBusRoutes(); } @Override public void onDestroy(@NonNull LifecycleOwner owner) { super.onDestroy(owner); - OchBusLineModel.getInstance().setBusLinesCallback(null); + BusLineModel.getInstance().setBusLinesCallback(null); } } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusModelLoopManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java similarity index 70% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusModelLoopManager.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java index 14a1defb3e..73127227d9 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusModelLoopManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java @@ -3,7 +3,7 @@ package com.mogo.och.bus.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.bus.constant.OchBusConst; +import com.mogo.och.bus.constant.BusConst; import java.util.concurrent.TimeUnit; @@ -17,15 +17,15 @@ import io.reactivex.schedulers.Schedulers; * * 管理轮询逻辑（订单轮询、新单轮询、新单抢单结果轮询等等） */ -public class OchBusModelLoopManager { +public class BusModelLoopManager { - private static final String TAG = OchBusModelLoopManager.class.getSimpleName(); + private static final String TAG = BusModelLoopManager.class.getSimpleName(); private static final class SingletonHolder { - private static final OchBusModelLoopManager INSTANCE = new OchBusModelLoopManager(); + private static final BusModelLoopManager INSTANCE = new BusModelLoopManager(); } - public static OchBusModelLoopManager getInstance() { + public static BusModelLoopManager getInstance() { return SingletonHolder.INSTANCE; } @@ -36,12 +36,12 @@ public class OchBusModelLoopManager { return; } CallerLogger.INSTANCE.i(M_BUS + TAG, "startHeartbeatLoop()"); - mHeartbeatDisposable = Observable.interval(OchBusConst.LOOP_DELAY, - OchBusConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) + mHeartbeatDisposable = Observable.interval(BusConst.LOOP_DELAY, + BusConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> OchBusOrderModel.getInstance().runCarHeartbeat()); + .subscribe(aLong -> BusOrderModel.getInstance().runCarHeartbeat()); } public void stopHeartbeatLoop() { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusOrderModel.java similarity index 86% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusOrderModel.java index b191a1e1eb..a12c6fbe6a 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusOrderModel.java @@ -1,7 +1,7 @@ package com.mogo.och.bus.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; -import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_STOPPED; +import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_STOPPED; import android.content.Context; import android.location.Location; @@ -24,21 +24,21 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; -import com.mogo.och.bus.bean.OchBusOperationStatusResponse; -import com.mogo.och.bus.bean.OchBusOrder; -import com.mogo.och.bus.bean.OchBusOrdersResponse; -import com.mogo.och.bus.bean.OchBusRoutesResponse; -import com.mogo.och.bus.bean.OchBusRoutesResult; -import com.mogo.och.bus.bean.OchBusStation; +import com.mogo.och.bus.bean.BusOperationStatusResponse; +import com.mogo.och.bus.bean.BusOrderBean; +import com.mogo.och.bus.bean.BusOrdersResponse; +import com.mogo.och.bus.bean.BusRoutesResponse; +import com.mogo.och.bus.bean.BusRoutesResult; +import com.mogo.och.bus.bean.BusStationBean; import com.mogo.och.bus.bean.QueryLeaveAwayPassengersResponse; -import com.mogo.och.bus.callback.CarOperationStatusCallback; -import com.mogo.och.bus.callback.IOCHBusControllerStatusCallback; -import com.mogo.och.bus.callback.RefreshBusStationsCallback; -import com.mogo.och.bus.callback.SlidePannelHideCallback; -import com.mogo.och.bus.constant.OchBusConst; -import com.mogo.och.bus.net.OCHBusServiceManager; -import com.mogo.och.bus.net.OCHServiceCallback; -import com.mogo.och.bus.util.OchBusAnalyticsUtil; +import com.mogo.och.bus.callback.ICarOperationStatusCallback; +import com.mogo.och.bus.callback.IBusControllerStatusCallback; +import com.mogo.och.bus.callback.IRefreshBusStationsCallback; +import com.mogo.och.bus.callback.ISlidePannelHideCallback; +import com.mogo.och.bus.constant.BusConst; +import com.mogo.och.bus.net.BusServiceManager; +import com.mogo.och.bus.net.IBusServiceCallback; +import com.mogo.och.bus.util.BusAnalyticsUtil; import com.mogo.och.bus.util.PinYinUtil; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -63,8 +63,8 @@ import mogo.telematics.pad.MessagePad; * * 小巴订单管理 */ -public class OchBusOrderModel { - private final String TAG = OchBusOrderModel.class.getSimpleName(); +public class BusOrderModel { + private final String TAG = BusOrderModel.class.getSimpleName(); private int currentLineId = -1; private int currentStationIndex = 0; //因为服务端和前台对于当前站不一致，所以设置两个current index， 一个用于前台展示， 一个用于服务端接口请求 private int backgroundCurrentStationIndex = 0;//A->B 此处值是A站点索引 @@ -72,14 +72,14 @@ public class OchBusOrderModel { * 运营状态、后端更具运营状态来判断车辆是否派单 */ private boolean mIsWorking = false; - private static volatile OchBusOrderModel sInstance; + private static volatile BusOrderModel sInstance; public double mLongitude = 0; public double mLatitude = 0; private Context mContext; private Disposable mBusOrdersDisposable; //定时轮询小巴车订单 private List prevBusOrderNos = new ArrayList<>(); - private final List< OchBusStation > stationList = new ArrayList<>(); - private OchBusRoutesResult ochBusRoutesResult = null; + private final List stationList = new ArrayList<>(); + private BusRoutesResult busRoutesResult = null; /** * 用来表示是否正在开往下一站 */ @@ -89,10 +89,10 @@ public class OchBusOrderModel { private static final int MSG_QUERY_BUS_STATION = 1001; private static final long QUERY_BUS_STATION_DELAY = 5000; - private CarOperationStatusCallback carOperationStatusCallback; - private RefreshBusStationsCallback refreshBusStationsCallback; - private SlidePannelHideCallback slidePannelHideCallback; - private IOCHBusControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等 + private ICarOperationStatusCallback carOperationStatusCallback; + private IRefreshBusStationsCallback refreshBusStationsCallback; + private ISlidePannelHideCallback slidePannelHideCallback; + private IBusControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等 private boolean hadQueryLeaveAwayPassager = false; @@ -100,25 +100,25 @@ public class OchBusOrderModel { @Override public boolean handleMessage(Message msg) { if ( msg.what == MSG_QUERY_BUS_STATION ) { - OchBusOrderModel.getInstance().queryBusRoutes(); + BusOrderModel.getInstance().queryBusRoutes(); return true; } return false; } }); - public static OchBusOrderModel getInstance() { + public static BusOrderModel getInstance() { if ( sInstance == null ) { - synchronized ( OchBusOrderModel.class ) { + synchronized ( BusOrderModel.class ) { if ( sInstance == null ) { - sInstance = new OchBusOrderModel(); + sInstance = new BusOrderModel(); } } } return sInstance; } - private OchBusOrderModel() { + private BusOrderModel() { } @@ -178,19 +178,19 @@ public class OchBusOrderModel { startLoopBusOrders(); } - public void setCarOperationStatusCallback(CarOperationStatusCallback callback){ + public void setCarOperationStatusCallback(ICarOperationStatusCallback callback){ this.carOperationStatusCallback = callback; } - public void setRefreshBusStationsCallback(RefreshBusStationsCallback callback){ + public void setRefreshBusStationsCallback(IRefreshBusStationsCallback callback){ this.refreshBusStationsCallback = callback; } - public void setSlidePannelHideCallback(SlidePannelHideCallback callback){ + public void setSlidePannelHideCallback(ISlidePannelHideCallback callback){ this.slidePannelHideCallback = callback; } - public void setControllerStatusCallback(IOCHBusControllerStatusCallback callback) { + public void setControllerStatusCallback(IBusControllerStatusCallback callback) { this.mControllerStatusCallback = callback; } @@ -201,8 +201,8 @@ public class OchBusOrderModel { if (mBusOrdersDisposable != null && !mBusOrdersDisposable.isDisposed()) { return; } - mBusOrdersDisposable = Observable.interval(OchBusConst.LOOP_DELAY, - OchBusConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) + mBusOrdersDisposable = Observable.interval(BusConst.LOOP_DELAY, + BusConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -210,14 +210,14 @@ public class OchBusOrderModel { } private void queryBusOrders() { - OCHBusServiceManager.getInstance().queryBusOrders(mContext, new OCHServiceCallback() { + BusServiceManager.getInstance().queryBusOrders(mContext, new IBusServiceCallback() { @Override - public void onSuccess(OchBusOrdersResponse o) { + public void onSuccess(BusOrdersResponse o) { if (o.data != null && o.data.orders != null && o.data.orders.size() > 0) { CallerLogger.INSTANCE.d( M_BUS + TAG, "获取到bus订单数据: " + o.data.orders.toString() ); - List busOrders = o.data.orders; + List busOrders = o.data.orders; for (int i = 0; i < busOrders.size(); i++) { - OchBusOrder order = busOrders.get(i); + BusOrderBean order = busOrders.get(i); if (order == null) return; if (TextUtils.isEmpty(order.getPassengerPhone())) return; if (prevBusOrderNos.contains(order.getOrderNo())) continue; @@ -300,9 +300,9 @@ public class OchBusOrderModel { */ public void queryBusRoutes() { CallerLogger.INSTANCE.d(M_BUS + TAG, "查询小巴路线"); - OCHBusServiceManager.getInstance().queryBusRoutes(mContext, new OCHServiceCallback() { + BusServiceManager.getInstance().queryBusRoutes(mContext, new IBusServiceCallback() { @Override - public void onSuccess(OchBusRoutesResponse data) { + public void onSuccess(BusRoutesResponse data) { if ( data == null || data.getResult() == null || data.getResult().getSites() == null @@ -326,10 +326,10 @@ public class OchBusOrderModel { */ public void debugResetStationStatus() { CallerLogger.INSTANCE.d( M_BUS + TAG, "测试、重置站点状态"); - OCHBusServiceManager.getInstance().resetStationStatus(mContext, currentLineId - , new OCHServiceCallback() { + BusServiceManager.getInstance().resetStationStatus(mContext, currentLineId + , new IBusServiceCallback() { @Override - public void onSuccess(OchBusRoutesResponse o) { + public void onSuccess(BusRoutesResponse o) { CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + o); isGoingToNextStation = false; if (o.getResult() == null || o.getResult().getSites() == null || o.getResult().getSites().isEmpty()) { @@ -352,10 +352,10 @@ public class OchBusOrderModel { */ public void leaveStation(boolean isOneWayOver,boolean isRestart){ CallerLogger.INSTANCE.d(M_BUS + TAG,"leaveStation-backgroundCurrentStationIndex = "+backgroundCurrentStationIndex); - OCHBusServiceManager.getInstance().leaveStation(mContext, stationList.get(backgroundCurrentStationIndex).getSeq() - , stationList.get(backgroundCurrentStationIndex).getSiteId(), new OCHServiceCallback() { + BusServiceManager.getInstance().leaveStation(mContext, stationList.get(backgroundCurrentStationIndex).getSeq() + , stationList.get(backgroundCurrentStationIndex).getSiteId(), new IBusServiceCallback() { @Override - public void onSuccess(OchBusRoutesResponse o) { + public void onSuccess(BusRoutesResponse o) { if ( o.getResult() == null || o.getResult().getSites() == null || o.getResult().getSites().isEmpty() ) { return; } @@ -386,7 +386,7 @@ public class OchBusOrderModel { * 服务端返回的OchBusRoutesResult逻辑， 离开站为当前站， 到达下一站后才会将下一站置为当前站， * 车机端展示是离开当前站，下一站设置为当前站， 所以服务端数据回来要做处理，不能直接渲染 */ - private void RenderLeaveStationSuccess(OchBusRoutesResult result,boolean isRestart) { + private void RenderLeaveStationSuccess(BusRoutesResult result, boolean isRestart) { renderBusStationsStatus(result); if (slidePannelHideCallback != null) { slidePannelHideCallback.hideSlidePanel(); @@ -406,8 +406,8 @@ public class OchBusOrderModel { * @param isRestart */ private void startAutopilot(boolean isRestart) { - OchBusStation currentStation = stationList.get( currentStationIndex -1); - OchBusStation nextStation = stationList.get( currentStationIndex); + BusStationBean currentStation = stationList.get( currentStationIndex -1); + BusStationBean nextStation = stationList.get( currentStationIndex); // if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE // == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { @@ -438,9 +438,9 @@ public class OchBusOrderModel { */ private void arriveSiteStation(boolean isRestart) { CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation-currentStationIndex = "+currentStationIndex); - OCHBusServiceManager.getInstance().arriveSiteStation(mContext + BusServiceManager.getInstance().arriveSiteStation(mContext , stationList.get(currentStationIndex).getSeq(), stationList.get(currentStationIndex).getSiteId() - , new OCHServiceCallback() { + , new IBusServiceCallback() { @Override public void onSuccess(BaseData o) { CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation success"); @@ -459,7 +459,7 @@ public class OchBusOrderModel { } private void renderArriveBusStation() { - List< OchBusStation > site = ochBusRoutesResult.getSites(); + List site = busRoutesResult.getSites(); if (site != null && site.size() > 0){ backgroundCurrentStationIndex = currentStationIndex; if (refreshBusStationsCallback != null){ @@ -475,9 +475,9 @@ public class OchBusOrderModel { private void queryStationLeaveAwayPassengers() { CallerLogger.INSTANCE.d( M_BUS + TAG, "查询到站下车乘客"); - OCHBusServiceManager.getInstance().queryStationLeaveAwayPassengers(mContext + BusServiceManager.getInstance().queryStationLeaveAwayPassengers(mContext , stationList.get(currentStationIndex).getSeq(), stationList.get(currentStationIndex).getSiteId() - , new OCHServiceCallback() { + , new IBusServiceCallback() { @Override public void onSuccess(QueryLeaveAwayPassengersResponse o) { hadQueryLeaveAwayPassager = true; @@ -498,7 +498,7 @@ public class OchBusOrderModel { * 收车 */ public void stopTakeOrder(){ - OCHBusServiceManager.getInstance().stopTakeOrder(mContext, new OCHServiceCallback() { + BusServiceManager.getInstance().stopTakeOrder(mContext, new IBusServiceCallback() { @Override public void onSuccess(BaseData o) { mIsWorking = !mIsWorking; @@ -520,7 +520,7 @@ public class OchBusOrderModel { * 出车 */ public void startTakeOrder(){ - OCHBusServiceManager.getInstance().startTakeOrder(mContext, new OCHServiceCallback() { + BusServiceManager.getInstance().startTakeOrder(mContext, new IBusServiceCallback() { @Override public void onSuccess(BaseData o) { mIsWorking = !mIsWorking; @@ -548,10 +548,10 @@ public class OchBusOrderModel { */ public void queryOperationStatus() { CallerLogger.INSTANCE.d( M_BUS + TAG, "查询运营状态"); - OCHBusServiceManager.getInstance().queryOperationStatus(mContext - , new OCHServiceCallback() { + BusServiceManager.getInstance().queryOperationStatus(mContext + , new IBusServiceCallback() { @Override - public void onSuccess(OchBusOperationStatusResponse o) { + public void onSuccess(BusOperationStatusResponse o) { if ( o.data != null ) { mIsWorking = o.data.serviceStatus == 1; CallerLogger.INSTANCE.d( M_BUS + TAG, "查询运营状态 result.status: " + o.data.serviceStatus); @@ -586,15 +586,15 @@ public class OchBusOrderModel { * 车机端展示是离开当前站，下一站设置为当前站， 所以服务端数据回来要做处理current index，不能直接渲染 * @param result */ - private void renderBusStationsStatus(OchBusRoutesResult result) { + private void renderBusStationsStatus(BusRoutesResult result) { if (result == null) return; - ochBusRoutesResult = result; - List< OchBusStation > site = result.getSites(); + busRoutesResult = result; + List site = result.getSites(); currentLineId = result.getLineId(); stationList.clear(); stationList.addAll( site ); for ( int i = 0; i < stationList.size(); i++ ) { - OchBusStation s = stationList.get( i ); + BusStationBean s = stationList.get( i ); // 是否正在开往下一站 if ( s.isLeaving()) { isGoingToNextStation = true; @@ -606,7 +606,7 @@ public class OchBusOrderModel { } } backgroundCurrentStationIndex = currentStationIndex; - OchBusStation currentStation = stationList.get(currentStationIndex); + BusStationBean currentStation = stationList.get(currentStationIndex); CallerLogger.INSTANCE.d( M_BUS + TAG, "渲染站点信息服务端currentStationIndex="+currentStationIndex +" isLeaving()="+currentStation.isLeaving()); //当前站点是始发站，告诉服务端到达始发站。 如果没有这个节点， 服务器不知道始发站到达状态 @@ -802,8 +802,8 @@ public class OchBusOrderModel { // 车机端上传心跳数据（只在出车状态时上传） public void runCarHeartbeat() { - OCHBusServiceManager.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude, - new OCHServiceCallback() { + BusServiceManager.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude, + new IBusServiceCallback() { @Override public void onSuccess(BaseData data) { @@ -819,9 +819,9 @@ public class OchBusOrderModel { private void startOrStopOrderLoop(boolean start) { CallerLogger.INSTANCE.d(M_BUS + TAG, "startOrStopOrderLoop() " + start); if (start) { - OchBusModelLoopManager.getInstance().startHeartbeatLoop(); + BusModelLoopManager.getInstance().startHeartbeatLoop(); } else { - OchBusModelLoopManager.getInstance().stopHeartbeatLoop(); + BusModelLoopManager.getInstance().stopHeartbeatLoop(); } } @@ -829,9 +829,9 @@ public class OchBusOrderModel { if (stationList == null || currentStationIndex >= stationList.size()) { return; } - OchBusStation currentStation = stationList.get( currentStationIndex -1); - OchBusStation nextStation = stationList.get( currentStationIndex); - OchBusAnalyticsUtil.triggerStartServiceEvent(send, + BusStationBean currentStation = stationList.get( currentStationIndex -1); + BusStationBean nextStation = stationList.get( currentStationIndex); + BusAnalyticsUtil.triggerStartServiceEvent(send, currentStation.getName(), nextStation.getName(), currentLineId); } } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java similarity index 74% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index 3a01e43818..550af083d5 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -15,12 +15,12 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.bus.bean.OchBusStation; -import com.mogo.och.bus.callback.CarOperationStatusCallback; -import com.mogo.och.bus.callback.IOCHBusControllerStatusCallback; -import com.mogo.och.bus.callback.RefreshBusStationsCallback; -import com.mogo.och.bus.callback.SlidePannelHideCallback; -import com.mogo.och.bus.fragment.OchBusFragment; +import com.mogo.och.bus.bean.BusStationBean; +import com.mogo.och.bus.callback.ICarOperationStatusCallback; +import com.mogo.och.bus.callback.IBusControllerStatusCallback; +import com.mogo.och.bus.callback.IRefreshBusStationsCallback; +import com.mogo.och.bus.callback.ISlidePannelHideCallback; +import com.mogo.och.bus.fragment.BusFragment; import org.jetbrains.annotations.NotNull; @@ -35,73 +35,73 @@ import mogo_msg.MogoReportMsg; * * @author tongchenfei */ -public class OchBusPresenter extends Presenter - implements CarOperationStatusCallback, RefreshBusStationsCallback, SlidePannelHideCallback - , IMoGoAutopilotStatusListener, IOCHBusControllerStatusCallback { +public class BusPresenter extends Presenter + implements ICarOperationStatusCallback, IRefreshBusStationsCallback, ISlidePannelHideCallback + , IMoGoAutopilotStatusListener, IBusControllerStatusCallback { - private static final String TAG = "OchBusPresenter"; + private static final String TAG = "BusPresenter"; private int currentAutopilotStatus = -1; private boolean isAnimateRunning = false; - private List mStationList = new ArrayList<>(); + private List mStationList = new ArrayList<>(); private int mCurrentStation = 0; - public OchBusPresenter(OchBusFragment view) { + public BusPresenter(BusFragment view) { super(view); //2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口 CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this); - OchBusOrderModel.getInstance().init(); + BusOrderModel.getInstance().init(); } @Override public void onCreate(@NonNull LifecycleOwner owner) { super.onCreate(owner); - OchBusOrderModel.getInstance().queryOperationStatus(); - OchBusOrderModel.getInstance().queryBusRoutes(); + BusOrderModel.getInstance().queryOperationStatus(); + BusOrderModel.getInstance().queryBusRoutes(); initModelListener(); } @Override public void onDestroy(@NonNull LifecycleOwner owner) { super.onDestroy(owner); - OchBusOrderModel.getInstance().release(); + BusOrderModel.getInstance().release(); releaseListener(); } public void initModelListener() { - OchBusOrderModel.getInstance().setCarOperationStatusCallback(this); - OchBusOrderModel.getInstance().setRefreshBusStationsCallback(this); - OchBusOrderModel.getInstance().setSlidePannelHideCallback(this); - OchBusOrderModel.getInstance().setControllerStatusCallback(this); + BusOrderModel.getInstance().setCarOperationStatusCallback(this); + BusOrderModel.getInstance().setRefreshBusStationsCallback(this); + BusOrderModel.getInstance().setSlidePannelHideCallback(this); + BusOrderModel.getInstance().setControllerStatusCallback(this); } public void releaseListener() { - OchBusOrderModel.getInstance().setCarOperationStatusCallback(null); - OchBusOrderModel.getInstance().setRefreshBusStationsCallback(null); - OchBusOrderModel.getInstance().setSlidePannelHideCallback(null); - OchBusOrderModel.getInstance().setControllerStatusCallback(null); + BusOrderModel.getInstance().setCarOperationStatusCallback(null); + BusOrderModel.getInstance().setRefreshBusStationsCallback(null); + BusOrderModel.getInstance().setSlidePannelHideCallback(null); + BusOrderModel.getInstance().setControllerStatusCallback(null); } public void queryBusRoutes() { - OchBusOrderModel.getInstance().queryBusRoutes(); + BusOrderModel.getInstance().queryBusRoutes(); } public void debugResetStationStatus() { - OchBusOrderModel.getInstance().debugResetStationStatus(); + BusOrderModel.getInstance().debugResetStationStatus(); } public void autoDriveToNextStation(boolean isRestart) { currentAutopilotStatus = -1; - OchBusOrderModel.getInstance().autoDriveToNextStation(isRestart); + BusOrderModel.getInstance().autoDriveToNextStation(isRestart); } public void restartAutopilot() { currentAutopilotStatus = -1; - OchBusOrderModel.getInstance().restartAutopilot(); + BusOrderModel.getInstance().restartAutopilot(); } public void onChangeOperationStatus() { - OchBusOrderModel.getInstance().onChangeOperationStatus(); + BusOrderModel.getInstance().onChangeOperationStatus(); } @Override @@ -112,25 +112,25 @@ public class OchBusPresenter extends Presenter } @Override - public void refreshBusStations(List stationList, int currentStation, int nextStation, boolean isArrived) { + public void refreshBusStations(List stationList, int currentStation, int nextStation, boolean isArrived) { mStationList.clear(); mStationList.addAll(stationList); mCurrentStation = currentStation; functionDemoModeChange(); - CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel =", " mCurrentStation =" + mCurrentStation); + CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); if (mView != null) { mView.refreshBusStations(stationList, currentStation, nextStation, isArrived); } } private void functionDemoModeChange() { -// CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel ="," functionDemoModeChange ="+mCurrentStation); +// CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel ="," functionDemoModeChange ="+mCurrentStation); if (FunctionBuildConfig.isDemoMode && ( (mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1) || ( (mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1) - && OchBusOrderModel.getInstance().isGoingToNextStation() + && BusOrderModel.getInstance().isGoingToNextStation() ) ) ) { @@ -147,7 +147,7 @@ public class OchBusPresenter extends Presenter @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) { - OchBusOrderModel.getInstance().onArriveAt(arrivalNotification); + BusOrderModel.getInstance().onArriveAt(arrivalNotification); } @Override @@ -169,7 +169,7 @@ public class OchBusPresenter extends Presenter currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE; // 设置UI【自动驾驶】按钮是否展示 mView.onAutopilotEnableChange(true); - if (OchBusOrderModel.getInstance().isGoingToNextStation()) { + if (BusOrderModel.getInstance().isGoingToNextStation()) { mView.hideSlidePanel(); } if (FunctionBuildConfig.isDemoMode @@ -177,11 +177,11 @@ public class OchBusPresenter extends Presenter (mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1) || ( (mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1) - && OchBusOrderModel.getInstance().isGoingToNextStation() + && BusOrderModel.getInstance().isGoingToNextStation() ) ) ) { - CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel=", "有美化功能"); + CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); return; } // 改变UI自动驾驶状态 @@ -194,7 +194,7 @@ public class OchBusPresenter extends Presenter currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING; // 改变UI自动驾驶状态 mView.onAutopilotStatusChanged(currentAutopilotStatus, isAnimateRunning); - OchBusOrderModel.getInstance().triggerStartServiceEvent(true); + BusOrderModel.getInstance().triggerStartServiceEvent(true); } isAnimateRunning = false; break; @@ -209,11 +209,11 @@ public class OchBusPresenter extends Presenter (mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1) || ( (mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1) - && OchBusOrderModel.getInstance().isGoingToNextStation() + && BusOrderModel.getInstance().isGoingToNextStation() ) ) ) { - CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel=", "有美化功能"); + CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); return; } mView.onAutopilotEnableChange(false); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestOchBusBroadcastReceiver.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java similarity index 73% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestOchBusBroadcastReceiver.java rename to OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java index 92cf8694ad..b9ffc6d492 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestOchBusBroadcastReceiver.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java @@ -7,7 +7,7 @@ import android.content.Context; import android.content.Intent; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.bus.constant.OchBusConst; +import com.mogo.och.bus.constant.BusConst; /** * 测试小巴车的场景 @@ -15,8 +15,8 @@ import com.mogo.och.bus.constant.OchBusConst; * @author donghongyu * @date 4/26/21 12:08 PM */ -public class TestOchBusBroadcastReceiver extends BroadcastReceiver { - private static final String TAG = "TestOchBusBroadcastReceiver"; +public class TestBusBroadcastReceiver extends BroadcastReceiver { + private static final String TAG = "TestBusBroadcastReceiver"; private Context mContext; @@ -24,7 +24,7 @@ public class TestOchBusBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { try { this.mContext = context; - int sceneType = intent.getIntExtra(OchBusConst.BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY, 0); + int sceneType = intent.getIntExtra(BusConst.BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY, 0); CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java index 6dc465f911..1c772f89d2 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java @@ -23,7 +23,7 @@ import com.mogo.commons.mvp.MvpActivity; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.och.bus.R; import com.mogo.och.bus.bean.BusQueryLinesResponse; -import com.mogo.och.bus.presenter.OchBusLinePresenter; +import com.mogo.och.bus.presenter.BusLinePresenter; import java.util.ArrayList; import java.util.List; @@ -32,7 +32,7 @@ import java.util.List; * @author: wangmingjun * @date: 2022/2/8 */ -public class BusSwitchLineActivity extends MvpActivity +public class BusSwitchLineActivity extends MvpActivity implements View.OnClickListener, BusSwitchLineView { private ImageView mClose; @@ -50,8 +50,8 @@ public class BusSwitchLineActivity extends MvpActivity params = new HashMap<>(); - params.put(OchBusConst.EVENT_PARAM_SN, sn); - params.put(OchBusConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); - params.put(OchBusConst.EVENT_PARAM_ENV_ONLINE, + params.put(BusConst.EVENT_PARAM_SN, sn); + params.put(BusConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); + params.put(BusConst.EVENT_PARAM_ENV_ONLINE, DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE ? true : false); - params.put(OchBusConst.EVENT_PARAM_TIME, dateTime); - params.put(OchBusConst.EVENT_PARAM_START_NAME, startName); - params.put(OchBusConst.EVENT_PARAM_END_NAME, endName); - params.put(OchBusConst.EVENT_PARAM_LINE_ID, lineId); + params.put(BusConst.EVENT_PARAM_TIME, dateTime); + params.put(BusConst.EVENT_PARAM_START_NAME, startName); + params.put(BusConst.EVENT_PARAM_END_NAME, endName); + params.put(BusConst.EVENT_PARAM_LINE_ID, lineId); Runnable runnable = () -> { // 15s内未开启，上报失败埋点 - params.put(OchBusConst.EVENT_PARAM_START_RESULT, false); - AnalyticsManager.INSTANCE.track(OchBusConst.EVENT_KEY_START_SERVICE, params); + params.put(BusConst.EVENT_PARAM_START_RESULT, false); + AnalyticsManager.INSTANCE.track(BusConst.EVENT_KEY_START_SERVICE, params); }; if (send) { @@ -54,10 +54,10 @@ public class OchBusAnalyticsUtil { if (runnable != null && UiThreadHandler.getsUiHandler().hasCallbacks(runnable)) { UiThreadHandler.removeCallbacks(runnable); } - params.put(OchBusConst.EVENT_PARAM_START_RESULT, true); - AnalyticsManager.INSTANCE.track(OchBusConst.EVENT_KEY_START_SERVICE, params); + params.put(BusConst.EVENT_PARAM_START_RESULT, true); + AnalyticsManager.INSTANCE.track(BusConst.EVENT_KEY_START_SERVICE, params); } else { - UiThreadHandler.postDelayed(runnable, OchBusConst.LOOP_PERIOD_15S); + UiThreadHandler.postDelayed(runnable, BusConst.LOOP_PERIOD_15S); } } }