[2.10.0]bus司机端增加"结束路线"按钮，接口待定

2022-08-17 17:14:00 +08:00
parent db38a839c3
commit 3faa99998a
8 changed files with 64 additions and 48 deletions
--- 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
@@ -50,7 +50,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
    private TextView mLineName;
    private int mCurrentStation = 0;

-    private View mBus;
+//    private View mBus;

    private BusStationBean startStation = null;
    private BusStationBean endStation = null;
@@ -63,19 +63,20 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
    @Override
    protected void initViews() {
        super.initViews();
-        mBus = findViewById(R.id.module_och_bus_tag);
+//        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);
        mSwitchLine = findViewById(R.id.switch_line_btn);
+        mSwitchLine.setTag(0);
        mLineName = findViewById(R.id.module_och_bus_line_name);

 //        if (DebugConfig.isDebug()) { //任意模式下都打开调试面板
-            mBus.setOnClickListener(view -> {
-                ToastUtils.showShort("重置了车站状态");
-                mPresenter.queryBusRoutes();
-            });
+//            mBus.setOnClickListener(view -> {
+//                ToastUtils.showShort("重置了车站状态");
+//                mPresenter.queryBusRoutes();
+//            });

            //debug下调用测试面板
            mCurrentStationName.setOnLongClickListener(v -> {
@@ -235,10 +236,14 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
    }

    private void showOrHideSwitchLineBtn(boolean isShow) {
-        if (isShow){
-            mSwitchLine.setVisibility(View.VISIBLE);
-        }else {
-            mSwitchLine.setVisibility(View.GONE);
+        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));
        }
    }

@@ -392,12 +397,12 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
                ToastUtils.showLong(getResources().getString(R.string.bus_switch_line_btn_warning1));
                return;
            }
-            if (mCurrentStation > 0) {
-                ToastUtils.showLong(getResources().getString(R.string.bus_switch_line_btn_warning2));
-                return;
+            if ((int)mSwitchLine.getTag() == 0){//切换路线
+                Intent intent = new Intent(getContext(), BusSwitchLineActivity.class);
+                startActivity(intent);
+            }else {//结束路线
+                mPresenter.resetCurrentLineStatus();
            }
-            Intent intent = new Intent(getContext(), BusSwitchLineActivity.class);
-            startActivity(intent);
        }
    }
 }
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java
@@ -64,7 +64,7 @@ public class BusLineModel {
    }

    public void commitSwitchLineId(int lineId){
-        BusServiceManager.getInstance().resetStationStatus(mContext,lineId, new IBusServiceCallback<BusRoutesResponse>() {
+        BusServiceManager.getInstance().switchLine(mContext,lineId, new IBusServiceCallback<BusRoutesResponse>() {
            @Override
            public void onSuccess(BusRoutesResponse o) {
                if (mBusLinesCallback != null){
--- 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
@@ -11,7 +11,6 @@ import android.location.Location;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
-import android.util.Log;

 import androidx.annotation.NonNull;

@@ -444,11 +443,11 @@ public class BusOrderModel {
    }

    /**
-     * 测试、重置站点状态
+     * 重置路线站点状态--结束路线，当前路线恢复到始发站
     */
-    public void debugResetStationStatus() {
-        CallerLogger.INSTANCE.d( M_BUS + TAG, "测试、重置站点状态");
-        BusServiceManager.getInstance().resetStationStatus(mContext, currentLineId
+    public void resetCurrentLineStatus() {
+        CallerLogger.INSTANCE.d( M_BUS + TAG, "结束当前路线");
+        BusServiceManager.getInstance().resetCurrentLineStatus(mContext, currentLineId
                , new IBusServiceCallback<BusRoutesResponse>() {
            @Override
            public void onSuccess(BusRoutesResponse o) {
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/BusServiceManager.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/BusServiceManager.java
@@ -74,13 +74,27 @@ public class BusServiceManager {
     * @param lineId
     * @param callback
     */
-    public void resetStationStatus(Context context, int lineId, IBusServiceCallback<BusRoutesResponse> callback){
-        mService.resetStationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
+    public void switchLine(Context context, int lineId, IBusServiceCallback<BusRoutesResponse> callback){
+        mService.switchLine(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
                ,MoGoAiCloudClientConfig.getInstance().getToken(),new BusResetDrivingLineRequest(lineId))
                .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
                .subscribe(getSubscribeImpl(context,callback,"debugResetStationStatus"));
    }

+    /**
+     * 结束当前路线，当前路线状态重置到始发站
+     * @param context
+     * @param lineId
+     * @param callback
+     */
+    public void resetCurrentLineStatus(Context context, int lineId, IBusServiceCallback<BusRoutesResponse> callback){
+//        mService.switchLine(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
+//                ,MoGoAiCloudClientConfig.getInstance().getToken(),new BusResetDrivingLineRequest(lineId))
+//                .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(getSubscribeImpl(context,callback,"debugResetStationStatus"));
+        // TODO 需要重置接口
+    }
+
    /**
     * 离站上报
     * @param context
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusApiService.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusApiService.java
@@ -42,8 +42,6 @@ public interface IBusApiService {
    Observable<BusRoutesResponse> querySiteByCoordinate(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusQueryLineStationsRequest request);

    /**
-     * 重置巴士路线： 点击小巴车tab 或者出车后会使用
-     *
     * @param request 请求参数{"destLine":1,"sn":"F803EB2046PZD00229"} 这个接口是重置bus线路的， 不是重置线路中站点的
     * @return 返回值是重置后的车站列表
     */
@@ -51,7 +49,7 @@ public interface IBusApiService {
 //    @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<BusRoutesResponse> resetStationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusResetDrivingLineRequest request);
+    Observable<BusRoutesResponse> switchLine(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusResetDrivingLineRequest request);

    /**
     * 离站，通知服务器
--- 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
@@ -90,8 +90,8 @@ public class BusPresenter extends Presenter<BusFragment>
        BusOrderModel.getInstance().queryBusRoutes();
    }

-    public void debugResetStationStatus() {
-        BusOrderModel.getInstance().debugResetStationStatus();
+    public void resetCurrentLineStatus() {
+        BusOrderModel.getInstance().resetCurrentLineStatus();
    }

    public void autoDriveToNextStation(boolean isRestart) {
--- 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 @@

    <TextView
        android:id="@+id/module_och_bus_line_name"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginLeft="@dimen/dp_68"
        android:layout_marginRight="@dimen/dp_20"
@@ -23,26 +23,25 @@
        android:textColor="#FFF"
        android:textSize="38px"
        android:textStyle="bold"
-        app:layout_constraintRight_toLeftOf="@+id/module_och_bus_tag"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

-    <TextView
-        android:id="@+id/module_och_bus_tag"
-        android:layout_width="@dimen/dp_109"
-        android:layout_height="@dimen/dp_42"
-        android:layout_gravity="right"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginRight="@dimen/dp_60"
-        android:background="@drawable/bus_panel_anchor_bkg"
-        android:gravity="center"
-        android:text="小巴车"
-        android:textColor="#FFF"
-        android:textSize="@dimen/module_mogo_och_autopilot_order_tag_height"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_line_name"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@id/module_och_bus_line_name" />
+<!--    <TextView-->
+<!--        android:id="@+id/module_och_bus_tag"-->
+<!--        android:layout_width="@dimen/dp_109"-->
+<!--        android:layout_height="@dimen/dp_42"-->
+<!--        android:layout_gravity="right"-->
+<!--        android:layout_marginTop="@dimen/dp_10"-->
+<!--        android:layout_marginRight="@dimen/dp_60"-->
+<!--        android:background="@drawable/bus_panel_anchor_bkg"-->
+<!--        android:gravity="center"-->
+<!--        android:text="小巴车"-->
+<!--        android:textColor="#FFF"-->
+<!--        android:textSize="@dimen/module_mogo_och_autopilot_order_tag_height"-->
+<!--        android:textStyle="bold"-->
+<!--        app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_line_name"-->
+<!--        app:layout_constraintRight_toRightOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="@id/module_och_bus_line_name" />-->

    <View
        android:id="@+id/line1"
@@ -53,7 +52,7 @@
        android:layout_marginRight="@dimen/dp_30"
        android:background="@drawable/bus_line_dividing_line1_selector"
        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_tag" />
+        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_line_name" />

    <View
        android:id="@+id/line2"
--- a/OCH/mogo-och-bus/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-bus/src/main/res/values/strings.xml
@@ -11,7 +11,8 @@
    <string name="bus_switch_line_end">终点:</string>
    <string name="bus_switch_line_btn_txt">确认</string>
    <string name="bus_switch_line_btn">切换路线</string>
-    <string name="bus_switch_line_btn_warning1">自动驾驶中，不可切换路线</string>
+    <string name="bus_close_line_btn">结束路线</string>
+    <string name="bus_switch_line_btn_warning1">自动驾驶状态中，不可切换或结束路线</string>
    <string name="bus_switch_line_btn_warning2">当前行程未完成，不可切换路线</string>
    <string name="bus_no_line_tip">当前车辆无路线\n请联系运营人员绑定</string>
    <string name="bus_line_start">起点: </string>