diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index a5565079e1..cf182867bc 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -48,6 +48,8 @@ import com.mogo.och.common.module.utils.SoundPoolHelper; import org.greenrobot.eventbus.EventBus; +import java.util.Objects; + import bag_manager.BagManagerOuterClass; import mogo.telematics.pad.MessagePad; import record_cache.RecordPanelOuterClass; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 533166c719..9050232f08 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -48,6 +48,7 @@ import com.mogo.och.common.module.utils.SoundPoolHelper; import org.greenrobot.eventbus.EventBus; +import java.util.Objects; import bag_manager.BagManagerOuterClass; import mogo.telematics.pad.MessagePad; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt index d564062e3d..92fc78aafb 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt @@ -10,8 +10,6 @@ import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon.Code import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask import com.zhjt.mogo.adas.data.sweeper.task.big.SweeperBigTaskStatus -import com.zhjt.mogo.adas.data.sweeper.task.cloud.s_r.SweeperTaskCloudSuspendResume.ActionType -import com.zhjt.mogo.adas.data.sweeper.task.cloud.s_r.SweeperTaskCloudSuspendResume.BigTaskActionPush import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop.StopTaskType /** @@ -52,13 +50,7 @@ interface ISweeperCloudTaskCallback { /** * 云端同步大任务状态 */ - fun onSweeperCloudBigTaskStatus(taskId:String, bigTaskStatus: SweeperCommon.TaskStatus, isPop:Boolean) - - /** - * 云端同步大任务暂停 / 恢复 指令 - */ - fun onSweeperCloudBigTaskSuspendResume(taskId:String, actionType: ActionType, isPop:Boolean) - + fun onSweeperCloudBigTaskStatus(taskId:String,subTaskStatus: SweeperBigTaskStatus.BigTaskStatus) /** * 设置轨迹坐标点集合 */ diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java index deef7f4757..d28a75a76f 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java @@ -42,10 +42,9 @@ import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils; import com.zhjt.mogo.adas.data.sweeper.SweeperCloudTask; import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable; import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask; +import com.zhjt.mogo.adas.data.sweeper.task.SweeperTaskSuspendResume; import com.zhjt.mogo.adas.data.sweeper.task.big.SweeperBigTaskStatus; -import com.zhjt.mogo.adas.data.sweeper.task.cloud.s_r.SweeperTaskCloudSuspendResume; import com.zhjt.mogo.adas.data.sweeper.task.confirm.SweeperTaskConfirm; -import com.zhjt.mogo.adas.data.sweeper.task.s_r.SweeperTaskSuspendResume; import com.zhjt.mogo.adas.data.sweeper.task.status.SweeperTaskStatus; import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop; @@ -184,6 +183,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM }); } + public void setControllerStatusCallback(ISweeperControllerStatusCallback callback) { this.mControllerStatusCallback = callback; } @@ -217,6 +217,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM } } } + }; public void setSubtask(String subTaskId, SweeperTask.TaskModel subTaskType, int currentLineId) { @@ -256,9 +257,8 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM return this.mAutopilotState; } - public static List coordinateConverterWgsToGcjList( - Context mContext, - List mogoLatLngList) { + public static List coordinateConverterWgsToGcjList(Context mContext, + List mogoLatLngList) { List points = new ArrayList<>(); for (MessagePad.Location m : mogoLatLngList) { LatLng mogoLatLng = CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(mContext, m); @@ -305,6 +305,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM } if (mSubTaskType == SweeperTask.TaskModel.MANUAL) {//收集人工驾驶子任务坐标点 addCoordinates(gnssInfo); + return; } } }; @@ -334,7 +335,8 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTask(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTask.TaskInfo taskInfo) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " onSweeperFutianCloudTask：" + (taskInfo == null ? "null" : printMessage(taskInfo)) + " mSweeperTaskCallback：" + mSweeperTaskCallback); if (mSweeperTaskCallback != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -406,18 +408,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM "onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush)); if (mSweeperTaskCallback != null && bigTaskStatusPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); - mSweeperTaskCallback.onSweeperCloudBigTaskStatus(bigTaskStatusPush.getTaskId(), bigTaskStatusPush.getTaskStatus(), bigTaskStatusPush.getIsPop()); - } - } - - @Override - public void onSweeperFutianCloudTaskCloudSuspendResume(@NonNull SweeperCloudTask.MessageType messageType, @Nullable String reqNo, long sysTime, - @Nullable SweeperTaskCloudSuspendResume.BigTaskActionPush bigTaskActionPush) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskCloudSuspendResume：" + printMessage(bigTaskActionPush)); - if (mSweeperTaskCallback != null && bigTaskActionPush != null) { - msgTypeAndReqNo.put(messageType.getNumber(), reqNo); - mSweeperTaskCallback.onSweeperCloudBigTaskSuspendResume(bigTaskActionPush.getTaskId(), bigTaskActionPush.getAction(), bigTaskActionPush.getIsPop()); + mSweeperTaskCallback.onSweeperCloudBigTaskStatus(bigTaskStatusPush.getTaskId(), bigTaskStatusPush.getTaskStatus()); } } @@ -439,25 +430,24 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianTaskIndexData(@NonNull RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex roboSweeperTaskIndex) { -// 20230728 因小地图不展示了，贴边数据先不处理了，浪费资源 -// if (roboSweeperTaskIndex == null) { -// return; -// } -// -// long current = System.currentTimeMillis(); -// if (current - mWeltDataCurrentTimeMillis <= WELT_DATA_INTERVAL_MILLIS) { -// return; -// } -// mWeltDataCurrentTimeMillis = current; -// -// //没有任务数据时，不处理贴边 -// if (!isHasTaskInfo) { -// return; -// } -// -// CallerLogger.INSTANCE.d(M_SWEEPER + TAG, -// "mSubTaskType：" + mSubTaskType + "+ onSweeperFutianTaskIndexData：" + printMessage(roboSweeperTaskIndex)); -// handleWeltData(roboSweeperTaskIndex); + if (roboSweeperTaskIndex == null) { + return; + } + + long current = System.currentTimeMillis(); + if (current - mWeltDataCurrentTimeMillis <= WELT_DATA_INTERVAL_MILLIS) { + return; + } + mWeltDataCurrentTimeMillis = current; + + //没有任务数据时，不处理贴边 + if (!isHasTaskInfo) { + return; + } + + CallerLogger.d(M_SWEEPER + TAG, + "mSubTaskType：" + mSubTaskType + "+ onSweeperFutianTaskIndexData：" + printMessage(roboSweeperTaskIndex)); + handleWeltData(roboSweeperTaskIndex); } /** @@ -504,7 +494,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM } } - private static String format(double value) { + public static String format(double value) { BigDecimal bd = new BigDecimal(value); bd = bd.setScale(2, RoundingMode.HALF_UP); return bd.toString(); @@ -594,24 +584,6 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM //SweeperCloudTaskUtils.mockSendCloudBootable(); } - /** - * 大任务暂停/恢复 接收到指令到 回复 - * @param taskId - * @param code - */ - public void sendSweeperSuspendResumeTaskResp(String taskId, SweeperTaskCloudSuspendResume.Code code) { - SweeperTaskCloudSuspendResume.BigTaskActionResp.Builder builder = SweeperTaskCloudSuspendResume.BigTaskActionResp.newBuilder(); - builder.setSn(getDriverSn()); - builder.setTaskId(taskId); - builder.setCode(code); - SweeperTaskCloudSuspendResume.BigTaskActionResp resp = builder.build(); - String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTaskSuspendResume.getNumber()); - - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, - "sendSweeperSuspendResumeTaskResp" + printMessage(resp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTaskSuspendResume); - getAutoPilotControlManager().sendSweeperCloudSuspendResumeTaskResp(reqNo, resp); - } - public CallerAutoPilotControlManager getAutoPilotControlManager() { return CallerAutoPilotControlManager.INSTANCE; } @@ -639,7 +611,6 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM default: break; } - } @Override @@ -660,7 +631,6 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotIpcConnectStatusChanged(int status, @Nullable String reason) { if (status == 0x00) {//判断工控机重连后，获取当前正在执行的子任务,延时10秒，防止工控机连接上时SN为空 - CallerAutoPilotControlManager.INSTANCE.setIsSubscribeBackCameraVideoVideo(0, false);//TODO 当前3.2.0版本产品未规划后摄像头展示功能 UiThreadHandler.postDelayed(() -> { getCurrentTask(); }, 10000); @@ -696,27 +666,11 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotStatusResponse(int state) { - //CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotStatusResponse state:" + state); - this.mAutopilotState = state; - if (mControllerStatusCallback != null) { - mControllerStatusCallback.onAutopilotState(state); - } - switch (state) { - case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE://不可自动驾驶 - break; - case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE://人工驾驶 - break; - case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING://自动驾驶中 - break; - case IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING://平行驾驶 - break; - default: - break; - } + // TODO: 2023/6/19 bingbing } @Override public void onAutopilotDockerInfo(@NonNull String dockerVersion) { - + // TODO: 2023/6/19 bingbing } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 300dab7da1..147d475ff4 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -46,6 +46,7 @@ import com.mogo.och.common.module.utils.AnimatorDrawableUtil; import com.mogo.och.taxi.R; import java.util.Arrays; +import java.util.Objects; import bag_manager.BagManagerOuterClass; import mogo.telematics.pad.MessagePad; diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 132dabc09a..80e11afaed 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -72,10 +72,8 @@ class TaxiPassengerBaseFragment() : overMapView.onCreateView(savedInstanceState) overMapView.hideResetView() - createProgressDialogAnim = - AnimationsContainer(R.array.xiaozhi_normal, 20, aciv_xiaozhi_normal) - createProgressDialogAnim?.setOnAnimStopListener(object : - AnimationsContainer.OnAnimationStoppedListener { + createProgressDialogAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 20,aciv_xiaozhi_normal) + createProgressDialogAnim?.setOnAnimStopListener(object :FrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { CallerLogger.d(M_TAXI_P + TAG, "动画暂停") } @@ -85,9 +83,9 @@ class TaxiPassengerBaseFragment() : private fun initListener() { ck_setting.isChecked = false ck_setting.setOnCheckedChangeListener { _, isChecked -> - clSettingView.visibility = if (isChecked) View.VISIBLE else View.GONE + clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE } - bottom.setOverMapApplyClick(object : BottomBar.ApplyClickLintener { + bottom.setOverMapApplyClick(object : BottomBar.ApplyClickLintener{ override fun onApplyClick(selectItem: BottomBar.SelectView) { when (selectItem) { BottomBar.SelectView.PRECISIONMAP -> { diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png new file mode 100644 index 0000000000..95f67cfb96 Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png new file mode 100644 index 0000000000..1cac7d83b0 Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java index 64d9d73963..58d8a05621 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui; +package com.mogo.och.taxi.ui.task; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; @@ -22,16 +22,17 @@ import android.widget.TextView; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import com.mogo.och.taxi.R; import com.mogo.och.taxi.constant.TaxiOrderCancelReasons; +import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import java.lang.ref.WeakReference; + /** * @author: wangmingjun * @date: 2021/8/18 */ -public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickListener,AdapterView.OnItemClickListener { +public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickListener, AdapterView.OnItemClickListener { private static final String TAG = "OCHTaxiOrderCancelDial"; protected WeakReference contextWeakReference; @@ -39,11 +40,10 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi private ContentAdapter mContentAdapter; private int mOrderStatus;//1：预约单，其他为即时单的状态， 主要是控制乘客上车 乘客下车这几个选项的显示 private String[] mContentArrays; - private CommitReasonListener mCommitListener = null; - public TaxiOrderCancelDialog(Context context, int orderStatus,CommitReasonListener commitListener) { - super(context,R.style.OrderCancelDialog); + public TaxiOrderCancelDialog(Context context, int orderStatus, CommitReasonListener commitListener) { + super(context, R.style.OrderCancelDialog); this.mOrderStatus = orderStatus; contextWeakReference = new WeakReference<>(context); this.mCommitListener = commitListener; @@ -67,14 +67,14 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi case ArriveAtStart: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), - TaxiOrderCancelReasons.PassengerNotArrive.getMsg(),TaxiOrderCancelReasons.UnContractPassenger.getMsg(), - TaxiOrderCancelReasons.PassengerCancel.getMsg(),TaxiOrderCancelReasons.Other.getMsg()}; + TaxiOrderCancelReasons.PassengerNotArrive.getMsg(), TaxiOrderCancelReasons.UnContractPassenger.getMsg(), + TaxiOrderCancelReasons.PassengerCancel.getMsg(), TaxiOrderCancelReasons.Other.getMsg()}; break; case OnTheWayToEnd: case ArriveAtEnd: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), - TaxiOrderCancelReasons.PassengerStopOver.getMsg(),TaxiOrderCancelReasons.Other.getMsg()}; + TaxiOrderCancelReasons.PassengerStopOver.getMsg(), TaxiOrderCancelReasons.Other.getMsg()}; break; default: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), @@ -82,7 +82,6 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi TaxiOrderCancelReasons.PassengerNotArrive.getMsg(), TaxiOrderCancelReasons.PassengerStopOver.getMsg(), TaxiOrderCancelReasons.Other.getMsg()}; break; - } } @@ -101,7 +100,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi private void initWindowView() { Window window = getWindow(); //dialog padding 去掉 - window.getDecorView().setPadding(0,0,0,0); + window.getDecorView().setPadding(0, 0, 0, 0); window.setDimAmount(0.5f); window.getDecorView().setBackgroundColor(Color.parseColor("#00FFFFFF"));//设置背景， 不然显示不全 @@ -129,16 +128,16 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi @Override public void onClick(View v) { if (v.getId() == R.id.order_cancel_commit_tv) {//bt commit - if (!TextUtils.isEmpty(mCurrentReason) && TaxiOrderCancelReasons.getType(mCurrentReason) != 0) { - //todo 取消正在执行的任务 - if (mCommitListener != null){ - mCommitListener.cancelCurOrder(TaxiOrderCancelReasons.getType(mCurrentReason)); - } - dismiss(); - }else { - ToastUtils.showShort("取消原因不能为空"); - } - }else if (v.getId() == R.id.order_dialog_cancel_tv){//close icon + if (!TextUtils.isEmpty(mCurrentReason) && TaxiOrderCancelReasons.getType(mCurrentReason) != 0) { + //todo 取消正在执行的任务 + if (mCommitListener != null) { + mCommitListener.cancelCurOrder(TaxiOrderCancelReasons.getType(mCurrentReason)); + } + dismiss(); + } else { + ToastUtils.showShort("取消原因不能为空"); + } + } else if (v.getId() == R.id.order_dialog_cancel_tv) {//close icon mCurrentReason = ""; dismiss(); } @@ -146,27 +145,27 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - CallerLogger.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); + CallerLogger.INSTANCE.d(M_TAXI + TAG, "mCurrentReason =" + mContentArrays[position]); mCurrentReason = mContentArrays[position]; mContentAdapter.notifyCurrentReasons(mCurrentReason); } - public interface CommitReasonListener{ + public interface CommitReasonListener { void cancelCurOrder(int type); } - class ContentAdapter extends BaseAdapter{ - + class ContentAdapter extends BaseAdapter { private Context context; private String[] datas; private LayoutInflater layoutInflater; private String currentReasons = ""; - public ContentAdapter(Context context, String[] array){ + public ContentAdapter(Context context, String[] array) { this.context = context; datas = array; layoutInflater = LayoutInflater.from(context); } + @Override public int getCount() { return datas.length; @@ -185,26 +184,28 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi @Override public View getView(int position, View convertView, ViewGroup parent) { ViewHolder viewHolder = null; - if (convertView == null){ - convertView = layoutInflater.inflate(R.layout.taxi_order_checkbox_item,null); + if (convertView == null) { + convertView = layoutInflater.inflate(R.layout.taxi_order_checkbox_item, null); viewHolder = new ViewHolder(); viewHolder.checkBoxTv = convertView.findViewById(R.id.item_checkbox); convertView.setTag(viewHolder); - }else { + } else { viewHolder = (ViewHolder) convertView.getTag(); } viewHolder.checkBoxTv.setText(datas[position]); - if(viewHolder.checkBoxTv.getText().toString().equals(currentReasons)){ - viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_selected_btn),null,null,null); - }else { - viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_unselected_btn),null,null,null); + if (viewHolder.checkBoxTv.getText().toString().equals(currentReasons)) { + viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_selected_btn), null, null, null); + } else { + viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_unselected_btn), null, null, null); } return convertView; } - public void notifyCurrentReasons(String reason){ + + public void notifyCurrentReasons(String reason) { currentReasons = reason; notifyDataSetChanged(); } + class ViewHolder { TextView checkBoxTv; } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt index b22ed61fe0..4b1f35b416 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt @@ -18,6 +18,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.constant.TaskStatusEnum import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment import kotlinx.android.synthetic.main.taxi_server_orders_panel.module_och_taxi_tab @@ -200,8 +201,7 @@ class TaxiTaskTabFragment : BaseFragment() { fun onTaskDataChanged(result: QueryCurrentTaskRespBean.Result?) { if (null == nextTaskFragment) return if (result != null && result.taskType == TaskTypeEnum.VirtualTask.code - && result.order != null - ) { + && result.order != null && result.currentStatus != TaskStatusEnum.CompleteTask.code) { VoiceNotice.showNotice("已为您提前接到下一订单，待完成当前任务后服务") wait_order_num.visibility = View.VISIBLE } else { diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index be30d17f04..5e7c714d10 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -136,6 +136,8 @@ object ConfigStartUp { // 1-使用本地地图数据，0-使用在线地图数据 // .setDataFileSource(1) .setIsRecordLogs(false) + .setLocationIcon3DRes(HdMapBuildConfig.currentCarVrIconRes) + .setIsWeatherEnable(false) .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) MapAutoApi.init(context, mapParams) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index a5ba68f037..2070e32afd 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt @@ -19,6 +19,7 @@ class TrafficLightNetWorkModel { } fun requestRoadID( + tileID: Long, lat: Double, lon: Double, bearing: Double, diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 148ce1a59e..965f0b8f29 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -734,19 +734,6 @@ class MoGoAdasListenerImpl : OnAdasListener { ) } - /** - * 10、云端下发任务暂停/恢复指令到pad（type: 100010）-> sweeper_task_cloud_suspend_resume.proto - * - * @param header 头 - * @param messageType 消息类型 - * @param reqNo 请求编号 - * @param sysTime 当前时间戳 - * @param bigTaskActionPush 数据 - */ - override fun onSweeperFutianCloudTaskCloudSuspendResume(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, bigTaskActionPush: SweeperTaskCloudSuspendResume.BigTaskActionPush?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskCloudSuspendResume(messageType, reqNo, sysTime, bigTaskActionPush) - } - /** * 清扫车云端任务未知类型 * diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt index 5f7b196fad..9f9eff339f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt @@ -86,6 +86,7 @@ class RomaTaxiView @JvmOverloads constructor( ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg) } ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg) + } else { romaMode = false if(normalRes!=0){ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCloudTaskListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCloudTaskListener.kt index 55dba62ef9..f40c2ed6bc 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCloudTaskListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCloudTaskListener.kt @@ -3,12 +3,12 @@ package com.mogo.eagle.core.function.api.autopilot import com.zhjt.mogo.adas.data.sweeper.SweeperCloudTask import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable.IsBootableResp import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask +import com.zhjt.mogo.adas.data.sweeper.task.SweeperTaskSuspendResume.SuspendResumeTaskResp import com.zhjt.mogo.adas.data.sweeper.task.big.SweeperBigTaskStatus.BigTaskStatusPush -import com.zhjt.mogo.adas.data.sweeper.task.cloud.s_r.SweeperTaskCloudSuspendResume.BigTaskActionPush import com.zhjt.mogo.adas.data.sweeper.task.confirm.SweeperTaskConfirm.TaskConfirm -import com.zhjt.mogo.adas.data.sweeper.task.s_r.SweeperTaskSuspendResume.SuspendResumeTaskResp import com.zhjt.mogo.adas.data.sweeper.task.status.SweeperTaskStatus.TaskStatusPush import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop.StopTaskReq +import mogo.telematics.pad.MessagePad /** * 清扫车（福田）云端任务接口 @@ -87,16 +87,6 @@ interface IMoGoSweeperFutianCloudTaskListener { */ fun onSweeperFutianCloudBigTaskStatus(messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, bigTaskStatusPush: BigTaskStatusPush?) - /** - * 10、云端下发任务暂停/恢复指令到pad（type: 100010）-> sweeper_task_cloud_suspend_resume.proto - * - * @param messageType 消息类型 - * @param reqNo 请求编号 - * @param sysTime 当前时间戳 - * @param bigTaskActionPush 数据 - */ - fun onSweeperFutianCloudTaskCloudSuspendResume(messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, bigTaskActionPush: BigTaskActionPush?) - /** * 清扫车云端任务未知类型 *