[taxi -d 280, taxi -p 130] 1、taxi 司机端增加跳过乘客验证逻辑

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java

@@ -1304,7 +1304,7 @@ public class TaxiModel {
     /**
      * 调试使用，没有乘客屏时可使用此按钮跳过乘客验证
      */
-    public void debugPassengerCheckDone() {
+    public void jumpPassengerCheckDone() {
         if (mCurrentOCHOrder == null
                 || mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.ArriveAtStart.getCode()
                 || mCurrentOCHOrder.passengerPhone == null || mCurrentOCHOrder.passengerPhone.length() < 5) {

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java

@@ -95,6 +95,13 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         TaxiModel.getInstance().startAutoPilot(isRestart);
     }
 
+    /**
+     * 跳过乘客验证环节
+     */
+    public void jumpPassengerCheckDone(){
+        TaxiModel.getInstance().jumpPassengerCheckDone();
+    }
+
     // 更新出车/收车状态
     public void updateCarStatus() {
         TaxiModel.getInstance().updateCarStatus();

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java

@@ -237,10 +237,10 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
                 mPassengerPhone.setText(order.passengerPhone);
                 mOrderStatus.setText(R.string.module_och_taxi_waiting);
                 mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start_wait_check);
-                mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF"));
+                mOrderServerStatus.setTextColor(Color.parseColor("#FFFFFF"));
                 GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
                 background.setColor(Color.parseColor("#4D1D5EF3"));
-                mOrderServerStatus.setClickable(false);
+                mOrderServerStatus.setClickable(true);
             }else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus ){
                 CallerLogger.INSTANCE.d(M_TAXI + TAG, "乘客已上车验证成功");
 
@@ -388,6 +388,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
         } else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == mCurrentOrder.orderStatus) {//点击服务，开启自动驾驶
             mTaxiFragment.startAutoPilot();
             showNotice(getResources().getString(R.string.module_och_taxi_order_server_start_auto_tip));
+            return;
+        }else if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == mCurrentOrder.orderStatus){ //到达乘客上车点，司机可跳过乘客屏认证
+            mTaxiFragment.jumpPassengerCheckDone();
         }
     }
 
@@ -492,13 +495,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.module_och_taxi_order_server_status_tv) {
-            switch (mOrderServerStatus.getText().toString().trim()) {
+            CallerLogger.INSTANCE.d(M_TAXI + TAG, mOrderServerStatus.getText().toString());
-                case "开始服务":
+            startOrEndService();
-                case "服务完成":
-                    CallerLogger.INSTANCE.d(M_TAXI + TAG, mOrderServerStatus.getText().toString());
-                    startOrEndService();
-                    break;
-            }
         } else if (v.getId() == R.id.module_och_taxi_order_cancel_iv) {
             new TaxiOrderCancelDialog(mTaxiFragment, mActivity, mOrderNo, saveOrderState).show();
         } else if (v.getId() == R.id.module_och_taxi_navi_iv) {

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java

@@ -225,6 +225,10 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         }
     }
 
+    public void jumpPassengerCheckDone(){
+        mPresenter.jumpPassengerCheckDone();
+    }
+
     public void completeOrderService(TaxiOrderStatusEnum status) {
         mPresenter.updateCurOrderStatus(status);
     }
@@ -355,9 +359,6 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             }
             TaxiModel.getInstance().setOnTheWayToEndStation();
         });
-        findViewById(R.id.test_passenger_check_done).setOnClickListener(v -> {
-            TaxiModel.getInstance().debugPassengerCheckDone();
-        });
     }
 
     private void testRouteInfoUpload() {

OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml

@@ -62,13 +62,6 @@
             android:onClick="testToEnd"
             android:text="到达目的地"
             android:textSize="12sp" />
-        <Button
-            android:id="@+id/test_passenger_check_done"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="testToEnd"
-            android:text="跳过乘客验证"
-            android:textSize="12sp" />
 
     </LinearLayout>
 </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>