[buffix]

[tts 位置更改]

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

@@ -57,6 +57,7 @@ import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;
 import com.mogo.och.common.module.utils.ToastUtilsOch;
+import com.mogo.och.common.module.voice.VoiceNotice;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.bean.DriverServiceDataRespBean;
 import com.mogo.och.taxi.bean.OrderGrabRespBean;
@@ -297,11 +298,19 @@ public class TaxiModel {
             loginService.queryLoginStatusByNet();
             return;
         }
-        TaxiServiceManager.changeOrderServing(mContext, TaxtServingStatusManager.isOpeningOrderStatus(),
+        boolean currentOrderStatus = TaxtServingStatusManager.isOpeningOrderStatus();
+        TaxiServiceManager.changeOrderServing(mContext, currentOrderStatus,
                 new OchCommonServiceCallback<BaseData>() {
                     @Override
                     public void onSuccess(BaseData data) {
                         if (null != data && 0 == data.code) {
+                            if(currentOrderStatus){
+                                // 上个状态是接单 暂停成功
+                                VoiceNotice.showNotice("暂停接单啦！");
+                            }else {
+                                // 上个状态是暂停接单 暂停成功
+                                VoiceNotice.showNotice("开始接单啦！");
+                            }
                             loginService.queryLoginStatusByNet();
                         }
                     }

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

@@ -192,11 +192,9 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             }
             tvOperationStatus.setText("暂停接单");
             tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_back), null, null, null);
-            VoiceNotice.showNotice("暂停接单啦！");
             showPanel();
         } else {
             mDriverRole.setVisibility(View.GONE);
-            VoiceNotice.showNotice("开始接单啦！");
             tvOperationStatus.setText("接单");
             tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_out), null, null, null);
             hidPanel();