yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[sweeper-cloud]清扫车云控需求module包名修改

Browse Source
This commit is contained in:
bxb
2023-04-24 18:04:04 +08:00
parent 25fd2a9cac
commit 2e796c4b4d
68 changed files with 265 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/sweeper/sweeper-cloud/src/main/AndroidManifest.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.och.sweeper">
package="com.mogo.och.sweepercloud">
<application>
<!--这里是为了测试增加的广播-->
<receiver android:name=".receiver.TestSweeperBroadcastReceiver">
<receiver android:name="com.mogo.och.sweepercloud.receiver.TestSweeperBroadcastReceiver">
<intent-filter>
<action android:name="com.bus.test_control" />

58
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java
View File

@@ -1,58 +0,0 @@
package com.mogo.och.sweeper.event;
import com.amap.api.maps.model.LatLng;
import com.mogo.och.sweeper.database.bean.WeltDataBean;
import java.util.ArrayList;
public class WeltDataEvent{
private int type; //1.添加起点和终点 2.实时添加贴边数据 3.清除数据 4.任务进度 5:任务轨迹数据
private ArrayList<WeltDataBean> weltDataBeanList;
private ArrayList<LatLng> markers;
private String distance;//贴边数据
private String progress;//任务进度
public WeltDataEvent(int type) {
this.type = type;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public ArrayList<WeltDataBean> getWeltDataBeanList() {
return weltDataBeanList;
}
public void setWeltDataBeanList(ArrayList<WeltDataBean> weltDataBeanList) {
this.weltDataBeanList = weltDataBeanList;
}
public ArrayList<LatLng> getMarkers() {
return markers;
}
public void setMarkers(ArrayList<LatLng> markers) {
this.markers = markers;
}
public String getDistance() {
return distance;
}
public void setDistance(String distance) {
this.distance = distance;
}
public String getProgress() {
return progress;
}
public void setProgress(String progress) {
this.progress = progress;
}
}

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/IMogoOCH.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/IMogoOCH.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper;
package com.mogo.och.sweepercloud;
import androidx.annotation.IdRes;
import androidx.fragment.app.FragmentActivity;

6
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/SweeperProvider.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper;
package com.mogo.och.sweepercloud;
import android.content.Context;
@@ -9,8 +9,8 @@ import androidx.fragment.app.FragmentManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.sweeper.constant.SweeperConst;
import com.mogo.och.sweeper.fragment.SweeperFragment;
import com.mogo.och.sweepercloud.constant.SweeperConst;
import com.mogo.och.sweepercloud.fragment.SweeperFragment;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/BaseResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.bean;
package com.mogo.och.sweepercloud.bean;
import com.mogo.eagle.core.data.BaseData;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SubStartRequest.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.bean
package com.mogo.och.sweepercloud.bean
import com.mogo.cloud.passport.MoGoAiCloudClientConfig

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperMainTaskBean.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.bean
package com.mogo.och.sweepercloud.bean
/**
*

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperRoutePlanningUpdateReqBean.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.bean;
package com.mogo.och.sweepercloud.bean;
import java.io.Serializable;
import java.util.ArrayList;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskBean.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.bean
package com.mogo.och.sweepercloud.bean
/**
* 子任务信息

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskDetailBean.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.bean;
package com.mogo.och.sweepercloud.bean;
public class SweeperSubTaskDetailBean {
private int id; //子任务id

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ICleaningModeStateCallback.java
View File

@@ -1,6 +1,6 @@
package com.mogo.och.sweeper.callback;
package com.mogo.och.sweepercloud.callback;
import com.mogo.och.sweeper.constant.OperateStateEnum;
import com.mogo.och.sweepercloud.constant.OperateStateEnum;
import chassis.ChassisStatesOuterClass;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperADASStatusCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.callback;
package com.mogo.och.sweepercloud.callback;
/**
* Created on 2021/9/8

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperControllerStatusCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.callback;
package com.mogo.och.sweepercloud.callback;
import com.mogo.eagle.core.data.map.MogoLocation;

14
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskCallback.kt
View File

@@ -1,11 +1,11 @@
package com.mogo.och.sweeper.callback
package com.mogo.och.sweepercloud.callback
import com.mogo.och.sweeper.bean.SweeperMainTaskBean
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweeper.bean.SweeperSubTaskBean
import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean
import com.mogo.och.sweeper.constant.SubTaskTypeEnum
import com.mogo.och.sweeper.constant.TaskStatusEnum
import com.mogo.och.sweepercloud.bean.SweeperMainTaskBean
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweepercloud.bean.SweeperSubTaskBean
import com.mogo.och.sweepercloud.bean.SweeperSubTaskDetailBean
import com.mogo.och.sweepercloud.constant.SubTaskTypeEnum
import com.mogo.och.sweepercloud.constant.TaskStatusEnum
import java.util.ArrayList
/**

6
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskDataToFragmentCallback.kt
View File

@@ -1,8 +1,8 @@
package com.mogo.och.sweeper.callback
package com.mogo.och.sweepercloud.callback
import com.amap.api.maps.model.LatLng
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweeper.database.bean.WeltDataBean
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweepercloud.database.bean.WeltDataBean
import java.util.ArrayList
interface ISweeperTaskDataToFragmentCallback {

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskRouteCallback.kt
View File

@@ -1,6 +1,6 @@
package com.mogo.och.sweeper.callback
package com.mogo.och.sweepercloud.callback
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean
import java.util.ArrayList
interface ISweeperTaskRouteCallback {

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.callback
package com.mogo.och.sweepercloud.callback
interface IWeltMapSwitchToSmallCallback {
fun onWeltMapSwitchToSmall()

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/OperateStateEnum.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.constant
package com.mogo.och.sweepercloud.constant
/**
* 上装面板操作状态

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SubTaskTypeEnum.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.constant
package com.mogo.och.sweepercloud.constant
/**
* 任务类型

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.constant
package com.mogo.och.sweepercloud.constant
import com.mogo.commons.debug.DebugConfig

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/TaskStatusEnum.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.constant
package com.mogo.och.sweepercloud.constant
/**
* 当前任务操作菜单

8
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/MyDataBase.java
View File

@@ -1,8 +1,10 @@
package com.mogo.och.sweeper.database;
package com.mogo.och.sweepercloud.database;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.och.sweeper.database.bean.WeltDataBean;
import com.mogo.och.sweeper.database.dao.WeltDataDao;
import com.mogo.och.sweepercloud.database.bean.WeltDataBean;
import com.mogo.och.sweepercloud.database.dao.WeltDataDao;
import com.mogo.och.sweepercloud.database.bean.WeltDataBean;
import com.mogo.och.sweepercloud.database.dao.WeltDataDao;
import androidx.room.Database;
import androidx.room.Room;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/bean/WeltDataBean.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.database.bean;
package com.mogo.och.sweepercloud.database.bean;
import java.io.Serializable;

11
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/dao/WeltDataDao.java
View File

@@ -1,6 +1,7 @@
package com.mogo.och.sweeper.database.dao;
package com.mogo.och.sweepercloud.database.dao;
import com.mogo.och.sweeper.database.bean.WeltDataBean;
import com.mogo.och.sweepercloud.database.bean.WeltDataBean;
import com.mogo.och.sweepercloud.database.bean.WeltDataBean;
import java.util.List;
@@ -9,7 +10,7 @@ import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;
import static com.mogo.och.sweeper.database.bean.WeltDataBean.WeltDataTable;
import static com.mogo.och.sweepercloud.database.bean.WeltDataBean.WeltDataTable;
@Dao
public interface WeltDataDao {
@@ -18,10 +19,10 @@ public interface WeltDataDao {
void insert(WeltDataBean fileInfo);
//删除所有数据
@Query("DELETE FROM " + WeltDataTable)
@Query("DELETE FROM " + WeltDataBean.WeltDataTable)
int deleteAllWeltData();
//查询所有数据
@Query("SELECT * FROM " + WeltDataTable)
@Query("SELECT * FROM " + WeltDataBean.WeltDataTable)
List<WeltDataBean> loadAllWeltDataInfo();
}

16
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.fragment;
package com.mogo.och.sweepercloud.fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -31,13 +31,13 @@ import com.mogo.map.marker.IMogoMarkerManager;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
import com.mogo.och.sweeper.R;
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean;
import com.mogo.och.sweeper.callback.ISweeperTaskDataToFragmentCallback;
import com.mogo.och.sweeper.callback.IWeltMapSwitchToSmallCallback;
import com.mogo.och.sweeper.database.bean.WeltDataBean;
import com.mogo.och.sweeper.view.SweeperTrafficDataView;
import com.mogo.och.sweeper.view.WeltSmallMapView;
import com.mogo.och.sweepercloud.R;
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean;
import com.mogo.och.sweepercloud.callback.ISweeperTaskDataToFragmentCallback;
import com.mogo.och.sweepercloud.callback.IWeltMapSwitchToSmallCallback;
import com.mogo.och.sweepercloud.database.bean.WeltDataBean;
import com.mogo.och.sweepercloud.view.SweeperTrafficDataView;
import com.mogo.och.sweepercloud.view.WeltSmallMapView;
import java.math.BigDecimal;
import java.math.RoundingMode;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperUIFragment.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.fragment;
package com.mogo.och.sweepercloud.fragment;
import android.os.Bundle;
import android.view.LayoutInflater;

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.fragment;
package com.mogo.och.sweepercloud.fragment;
import android.os.Bundle;
import android.view.View;
@@ -8,7 +8,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
import com.mogo.och.common.module.map.CommonAmapNaviVIew;
import com.mogo.och.common.module.map.ICommonNaviChangedCallback;
import com.mogo.och.sweeper.R;
import com.mogo.och.sweepercloud.R;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;

24
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.fragment
package com.mogo.och.sweepercloud.fragment
import android.graphics.Color
import android.os.Bundle
@@ -16,16 +16,16 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.ClickUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.bean.*
import com.mogo.och.sweeper.constant.SubTaskTypeEnum
import com.mogo.och.sweeper.constant.TaskStatusEnum
import com.mogo.och.sweeper.database.MyDataBase
import com.mogo.och.sweeper.presenter.SweeperPresenter
import com.mogo.och.sweeper.ui.adapter.TaskListAdapter
import com.mogo.och.sweeper.ui.dialog.SweeperManualDrivingDialog
import com.mogo.och.sweeper.ui.dialog.SweeperNoTitleCommonDialog
import com.mogo.och.sweeper.ui.popwindow.MenuPopWindow
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.bean.*
import com.mogo.och.sweepercloud.constant.SubTaskTypeEnum
import com.mogo.och.sweepercloud.constant.TaskStatusEnum
import com.mogo.och.sweepercloud.database.MyDataBase
import com.mogo.och.sweepercloud.presenter.SweeperPresenter
import com.mogo.och.sweepercloud.ui.adapter.TaskListAdapter
import com.mogo.och.sweepercloud.ui.dialog.SweeperManualDrivingDialog
import com.mogo.och.sweepercloud.ui.dialog.SweeperNoTitleCommonDialog
import com.mogo.och.sweepercloud.ui.popwindow.MenuPopWindow
import kotlinx.android.synthetic.main.fragment_och_sweeper.*
import kotlinx.android.synthetic.main.sweeper_current_task_info.view.*
import kotlinx.android.synthetic.main.sweeper_no_data_common_view.*
@@ -36,7 +36,7 @@ import kotlin.math.roundToInt
/**
* 清扫车主界面
*/
class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresenter?>(), MenuPopWindow.OnMenuItemOnClickListener {
class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?,SweeperPresenter?>(), MenuPopWindow.OnMenuItemOnClickListener {
companion object {
const val TAG = "SweeperFragment"

14
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/WeltMapOverViewFragment.kt
View File

@@ -1,20 +1,20 @@
package com.mogo.och.sweeper.fragment
package com.mogo.och.sweepercloud.fragment
import android.os.Bundle
import com.amap.api.maps.model.LatLng
import com.mogo.commons.mvp.BaseFragment
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweeper.callback.ISweeperTaskDataToFragmentCallback
import com.mogo.och.sweeper.callback.IWeltMapSwitchToSmallCallback
import com.mogo.och.sweeper.database.bean.WeltDataBean
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweepercloud.callback.ISweeperTaskDataToFragmentCallback
import com.mogo.och.sweepercloud.callback.IWeltMapSwitchToSmallCallback
import com.mogo.och.sweepercloud.database.bean.WeltDataBean
import kotlinx.android.synthetic.main.fragment_welt_map_overview.*
import kotlinx.android.synthetic.main.sweeper_welt_map_overview.*
/**
* 作业任务全览图
*/
class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCallback {
class WeltMapOverViewFragment : BaseFragment(), ISweeperTaskDataToFragmentCallback {
private var mIWeltMapSwitchToSmallCallBack: IWeltMapSwitchToSmallCallback? = null
private var mFragment: SweeperFragment? = null
override fun getLayoutId(): Int = R.layout.fragment_welt_map_overview

38
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.model;
package com.mogo.och.sweepercloud.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER;
@@ -39,22 +39,26 @@ import com.mogo.och.common.module.utils.NumberFormatUtil;
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.sweeper.R;
import com.mogo.och.sweeper.bean.BaseResponse;
import com.mogo.och.sweeper.bean.SubInfo;
import com.mogo.och.sweeper.bean.SweeperMainTaskBean;
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean;
import com.mogo.och.sweeper.bean.SweeperSubTaskBean;
import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean;
import com.mogo.och.sweeper.callback.ISweeperADASStatusCallback;
import com.mogo.och.sweeper.callback.ISweeperControllerStatusCallback;
import com.mogo.och.sweeper.callback.ISweeperTaskCallback;
import com.mogo.och.sweeper.constant.SubTaskTypeEnum;
import com.mogo.och.sweeper.constant.SweeperConst;
import com.mogo.och.sweeper.constant.TaskStatusEnum;
import com.mogo.och.sweeper.net.SweeperServiceManager;
import com.mogo.och.sweeper.util.SweeperAnalyticsManager;
import com.mogo.och.sweeper.util.SweeperTrajectoryManager;
import com.mogo.och.sweepercloud.R;
import com.mogo.och.sweepercloud.bean.BaseResponse;
import com.mogo.och.sweepercloud.bean.SubInfo;
import com.mogo.och.sweepercloud.bean.SweeperMainTaskBean;
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskBean;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskDetailBean;
import com.mogo.och.sweepercloud.callback.ISweeperADASStatusCallback;
import com.mogo.och.sweepercloud.callback.ISweeperControllerStatusCallback;
import com.mogo.och.sweepercloud.callback.ISweeperTaskCallback;
import com.mogo.och.sweepercloud.constant.SubTaskTypeEnum;
import com.mogo.och.sweepercloud.constant.SweeperConst;
import com.mogo.och.sweepercloud.constant.TaskStatusEnum;
import com.mogo.och.sweepercloud.net.SweeperServiceManager;
import com.mogo.och.sweepercloud.util.SweeperAnalyticsManager;
import com.mogo.och.sweepercloud.util.SweeperTrajectoryManager;
import com.mogo.och.sweepercloud.bean.SubInfo;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskBean;
import com.mogo.och.sweepercloud.util.SweeperAnalyticsManager;
import com.mogo.och.sweepercloud.util.SweeperTrajectoryManager;
import org.jetbrains.annotations.NotNull;

14
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/ISweeperApiService.java
View File

@@ -1,10 +1,10 @@
package com.mogo.och.sweeper.net;
import com.mogo.och.sweeper.bean.BaseResponse;
import com.mogo.och.sweeper.bean.SubInfo;
import com.mogo.och.sweeper.bean.SubStartRequest;
import com.mogo.och.sweeper.bean.SweeperSubTaskBean;
import com.mogo.och.sweeper.bean.SweeperMainTaskBean;
import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean;
package com.mogo.och.sweepercloud.net;
import com.mogo.och.sweepercloud.bean.BaseResponse;
import com.mogo.och.sweepercloud.bean.SubInfo;
import com.mogo.och.sweepercloud.bean.SubStartRequest;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskBean;
import com.mogo.och.sweepercloud.bean.SweeperMainTaskBean;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskDetailBean;
import java.util.List;
import java.util.Map;

6
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/SweeperServiceManager.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.net
package com.mogo.och.sweepercloud.net
import android.content.Context
import com.elegant.network.utils.GsonUtil
@@ -10,8 +10,8 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst
import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
import com.mogo.och.common.module.biz.network.interceptor.transformTry
import com.mogo.och.sweeper.bean.*
import com.mogo.och.sweeper.model.SweeperTaskModel
import com.mogo.och.sweepercloud.bean.*
import com.mogo.och.sweepercloud.model.SweeperTaskModel
object SweeperServiceManager {
private val TAG = SweeperTaskModel::class.java.simpleName

38
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.presenter;
package com.mogo.och.sweepercloud.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER;
@@ -23,23 +23,23 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.sweeper.bean.SweeperMainTaskBean;
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean;
import com.mogo.och.sweeper.bean.SweeperSubTaskBean;
import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean;
import com.mogo.och.sweeper.callback.ISweeperADASStatusCallback;
import com.mogo.och.sweeper.callback.ISweeperControllerStatusCallback;
import com.mogo.och.sweeper.callback.ISweeperTaskCallback;
import com.mogo.och.sweeper.callback.ISweeperTaskRouteCallback;
import com.mogo.och.sweeper.constant.SubTaskTypeEnum;
import com.mogo.och.sweeper.constant.SweeperConst;
import com.mogo.och.sweeper.constant.TaskStatusEnum;
import com.mogo.och.sweeper.database.MyDataBase;
import com.mogo.och.sweeper.database.bean.WeltDataBean;
import com.mogo.och.sweeper.fragment.SweeperFragment;
import com.mogo.och.sweeper.model.SweeperTaskModel;
import com.mogo.och.sweeper.util.SweeperFutianCmdUtil;
import com.mogo.och.sweeper.util.SweeperTrajectoryManager;
import com.mogo.och.sweepercloud.bean.SweeperMainTaskBean;
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskBean;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskDetailBean;
import com.mogo.och.sweepercloud.callback.ISweeperADASStatusCallback;
import com.mogo.och.sweepercloud.callback.ISweeperControllerStatusCallback;
import com.mogo.och.sweepercloud.callback.ISweeperTaskCallback;
import com.mogo.och.sweepercloud.callback.ISweeperTaskRouteCallback;
import com.mogo.och.sweepercloud.constant.SubTaskTypeEnum;
import com.mogo.och.sweepercloud.constant.SweeperConst;
import com.mogo.och.sweepercloud.constant.TaskStatusEnum;
import com.mogo.och.sweepercloud.database.MyDataBase;
import com.mogo.och.sweepercloud.database.bean.WeltDataBean;
import com.mogo.och.sweepercloud.fragment.SweeperFragment;
import com.mogo.och.sweepercloud.model.SweeperTaskModel;
import com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil;
import com.mogo.och.sweepercloud.util.SweeperTrajectoryManager;
import org.jetbrains.annotations.NotNull;
@@ -431,7 +431,7 @@ public class SweeperPresenter extends Presenter<SweeperFragment>
}
@Override
public void setMainTaskList(List<SweeperMainTaskBean> mainTaskBeanList,boolean refresh) {
public void setMainTaskList(List<SweeperMainTaskBean> mainTaskBeanList, boolean refresh) {
mView.setMainTaskList(mainTaskBeanList,refresh);
}

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.receiver;
package com.mogo.och.sweepercloud.receiver;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
@@ -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.sweeper.constant.SweeperConst;
import com.mogo.och.sweepercloud.constant.SweeperConst;
/**
* 测试小巴车的场景

85
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java
View File

@@ -1,14 +1,14 @@
package com.mogo.och.sweeper.ui;
package com.mogo.och.sweepercloud.ui;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP;
import android.animation.ObjectAnimator;
import android.content.Context;
@@ -31,11 +31,14 @@ import androidx.annotation.Nullable;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.sweeper.R;
import com.mogo.och.sweeper.callback.ICleaningModeStateCallback;
import com.mogo.och.sweeper.constant.OperateStateEnum;
import com.mogo.och.sweeper.util.SweeperFutianCmdUtil;
import com.mogo.och.sweeper.view.NoTouchConstraintLayout;
import com.mogo.och.sweepercloud.R;
import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback;
import com.mogo.och.sweepercloud.constant.OperateStateEnum;
import com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil;
import com.mogo.och.sweepercloud.view.NoTouchConstraintLayout;
import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback;
import com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil;
import com.mogo.och.sweepercloud.view.NoTouchConstraintLayout;
import java.util.Arrays;
import java.util.HashMap;
@@ -44,10 +47,10 @@ import java.util.List;
import chassis.ChassisStatesOuterClass;
import chassis.SpecialVehicleTaskCmdOuterClass;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_CLOSE;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_CLOSE;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_WORK_CLOSE;
import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_WORK_OPEN;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_CLOSE;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_CLOSE;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_WORK_CLOSE;
import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_WORK_OPEN;
/**
* 清扫车操作面板View
@@ -84,10 +87,10 @@ public class SweeperOperatePanelView extends LinearLayout {
// 作业模式相关操作按钮，对应命令参数值
HashMap<Integer, Integer> cleanModeBtnAndCmdValueMap = new HashMap<Integer, Integer>() {
{
put(R.id.btn_clean_mode_pure_sweep, CLEAN_MODE_PURE_SWEEP);
put(R.id.btn_clean_mode_pure_wash, CLEAN_MODE_PURE_WASH);
put(R.id.btn_clean_mode_sweep_wash, CLEAN_MODE_WASH_SWEEP);
put(R.id.btn_clean_mode_pure_absorption, CLEAN_MODE_PURE_DRAW);
put(R.id.btn_clean_mode_pure_sweep, SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP);
put(R.id.btn_clean_mode_pure_wash, SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH);
put(R.id.btn_clean_mode_sweep_wash, SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP);
put(R.id.btn_clean_mode_pure_absorption, SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW);
}
};
@@ -100,9 +103,9 @@ public class SweeperOperatePanelView extends LinearLayout {
// 清扫方向相关按钮操作，对应命令参数值
HashMap<Integer, Integer> cleanDirectionBtnAndCmdValueMap = new HashMap<Integer, Integer>() {
{
put(R.id.btn_clean_direction_left_side, CLEAN_DIRECTION_LEFT_SIDE);
put(R.id.btn_clean_direction_right_side, CLEAN_DIRECTION_RIGHT_SIDE);
put(R.id.btn_clean_direction_both_side, CLEAN_DIRECTION_BOTH_SIDE);
put(R.id.btn_clean_direction_left_side, SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE);
put(R.id.btn_clean_direction_right_side, SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE);
put(R.id.btn_clean_direction_both_side, SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE);
}
};
@@ -114,8 +117,8 @@ public class SweeperOperatePanelView extends LinearLayout {
// 作业强度相关按钮操作，对应命令参数值
HashMap<Integer, Integer> cleanIntensityBtnAndCmdValueMap = new HashMap<Integer, Integer>() {
{
put(R.id.btn_clean_intensity_standard, CLEAN_INTENSITY_STRAND);
put(R.id.btn_clean_intensity_strong, CLEAN_INTENSITY_STRONG);
put(R.id.btn_clean_intensity_standard, SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND);
put(R.id.btn_clean_intensity_strong, SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG);
}
};
private boolean isSelectPureSweepMode = false;//用于标注是否选中纯扫
@@ -979,7 +982,7 @@ public class SweeperOperatePanelView extends LinearLayout {
private void mockCleanModeSuccess(SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd fuTianTaskCmd) {
ChassisStatesOuterClass.SweeperFuTianTaskSystemStates.Builder builder = ChassisStatesOuterClass.SweeperFuTianTaskSystemStates.newBuilder();
chassis.SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd fuTianCleanCmd = fuTianTaskCmd.getRoboSweeperFutianCleanCmd();
if (fuTianCleanCmd.getCleanOpenRequirement() == CLEAN_WORK_OPEN) {//打开
if (fuTianCleanCmd.getCleanOpenRequirement() == SweeperFutianCmdUtil.CLEAN_WORK_OPEN) {//打开
builder.setSecuMotWorkSts(true);
builder.setSecuModWashSweepSts(false);
builder.setSecuModWashSts(false);
@@ -992,7 +995,7 @@ public class SweeperOperatePanelView extends LinearLayout {
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanOpenRequirement() == CLEAN_WORK_CLOSE) {//关闭
} else if (fuTianCleanCmd.getCleanOpenRequirement() == SweeperFutianCmdUtil.CLEAN_WORK_CLOSE) {//关闭
builder.setSecuModWashSweepSts(false);
builder.setSecuModWashSts(false);
builder.setSecuWorkTonSts(false);
@@ -1006,24 +1009,24 @@ public class SweeperOperatePanelView extends LinearLayout {
mockSendCmdSuccess();
return;
}
if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_PURE_SWEEP) {//纯扫
if (fuTianCleanCmd.getCleanModeRequirement() == SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP) {//纯扫
builder.setSecuModWashSweepSts(false);
builder.setSecuModWashSts(false);
builder.setSecuWorkTonSts(false);
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_WASH_SWEEP) {//洗扫
} else if (fuTianCleanCmd.getCleanModeRequirement() == SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP) {//洗扫
builder.setSecuModWashSweepSts(!mCurrentCleanSystemState.getSecuModWashSweepSts());
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_PURE_WASH) {//纯洗
} else if (fuTianCleanCmd.getCleanModeRequirement() == SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH) {//纯洗
builder.setSecuModWashSts(!mCurrentCleanSystemState.getSecuModWashSts());
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_PURE_DRAW) {//纯吸
} else if (fuTianCleanCmd.getCleanModeRequirement() == SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW) {//纯吸
builder.setSecuWorkTonSts(!mCurrentCleanSystemState.getSecuWorkTonSts());
builder.setSecuWorkStandSts(true);
builder.setSecuWorkOnBothsidesSts(false);
@@ -1032,7 +1035,7 @@ public class SweeperOperatePanelView extends LinearLayout {
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_CLOSE) {
} else if (fuTianCleanCmd.getCleanModeRequirement() == SweeperFutianCmdUtil.CLEAN_MODE_CLOSE) {
builder.setSecuModWashSweepSts(false);
builder.setSecuModWashSts(false);
builder.setSecuWorkTonSts(false);
@@ -1045,28 +1048,28 @@ public class SweeperOperatePanelView extends LinearLayout {
mockSendCmdSuccess();
return;
}
if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_BOTH_SIDE) {//两侧
if (fuTianCleanCmd.getCleanDirectionRequirement() == SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE) {//两侧
builder.setSecuWorkOnBothsidesSts(!mCurrentCleanSystemState.getSecuWorkOnBothsidesSts());
builder.setSecuWorkStandSts(true);
builder.setSecuWorkStrongSts(false);
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_LEFT_SIDE) {//左侧
} else if (fuTianCleanCmd.getCleanDirectionRequirement() == SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE) {//左侧
builder.setSecuWorkLeftSts(!mCurrentCleanSystemState.getSecuWorkLeftSts());
builder.setSecuWorkStandSts(true);
builder.setSecuWorkStrongSts(false);
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_RIGHT_SIDE) {//右侧
} else if (fuTianCleanCmd.getCleanDirectionRequirement() == SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE) {//右侧
builder.setSecuWorkRightSts(!mCurrentCleanSystemState.getSecuWorkRightSts());
builder.setSecuWorkStandSts(true);
builder.setSecuWorkStrongSts(false);
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_CLOSE) {
} else if (fuTianCleanCmd.getCleanDirectionRequirement() == SweeperFutianCmdUtil.CLEAN_DIRECTION_CLOSE) {
builder.setSecuWorkLeftSts(false);
builder.setSecuWorkRightSts(false);
builder.setSecuWorkOnBothsidesSts(false);
@@ -1076,13 +1079,13 @@ public class SweeperOperatePanelView extends LinearLayout {
mockSendCmdSuccess();
return;
}
if (fuTianCleanCmd.getCleanIntensityRequirement() == CLEAN_INTENSITY_STRAND) {
if (fuTianCleanCmd.getCleanIntensityRequirement() == SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND) {
builder.setSecuWorkStrongSts(true);
builder.setSecuWorkStandSts(false);
mCurrentCleanSystemState = builder.build();
mockSendCmdSuccess();
return;
} else if (fuTianCleanCmd.getCleanIntensityRequirement() == CLEAN_INTENSITY_STRONG) {
} else if (fuTianCleanCmd.getCleanIntensityRequirement() == SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG) {
builder.setSecuWorkStandSts(true);
builder.setSecuWorkStrongSts(false);
mCurrentCleanSystemState = builder.build();

6
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/adapter/TaskListAdapter.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.ui.adapter
package com.mogo.och.sweepercloud.ui.adapter
import android.graphics.Color
import android.view.LayoutInflater
@@ -8,8 +8,8 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.bean.SweeperMainTaskBean
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.bean.SweeperMainTaskBean
class TaskListAdapter() : RecyclerView.Adapter<TaskListAdapter.TaskViewHolder>() {
private var mItemClickListener: TaskItemClickListener? = null

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt
View File

@@ -1,10 +1,10 @@
package com.mogo.och.sweeper.ui.dialog
package com.mogo.och.sweepercloud.ui.dialog
import android.content.Context
import android.widget.TextView
import androidx.lifecycle.LifecycleObserver
import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
import com.mogo.och.sweeper.R
import com.mogo.och.sweepercloud.R
/**
* 不带带有title, tip,confirm,cancel的dialog

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt
View File

@@ -1,10 +1,10 @@
package com.mogo.och.sweeper.ui.dialog
package com.mogo.och.sweepercloud.ui.dialog
import android.content.Context
import android.widget.TextView
import androidx.lifecycle.LifecycleObserver
import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
import com.mogo.och.sweeper.R
import com.mogo.och.sweepercloud.R
/**
* 不带带有title, tip,confirm,cancel的dialog

6
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/MenuPopWindow.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.ui.popwindow
package com.mogo.och.sweepercloud.ui.popwindow
import android.content.Context
import android.graphics.Color
@@ -8,8 +8,8 @@ import android.view.View
import android.view.ViewGroup.LayoutParams
import android.widget.PopupWindow
import android.widget.TextView
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.constant.TaskStatusEnum
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.constant.TaskStatusEnum
/**
* 当前任务操作菜单栏

10
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.ui.popwindow
package com.mogo.och.sweepercloud.ui.popwindow
import android.content.Context
import android.graphics.Color
@@ -7,10 +7,10 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import android.widget.PopupWindow
import chassis.ChassisStatesOuterClass
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.callback.ICleaningModeStateCallback
import com.mogo.och.sweeper.constant.OperateStateEnum
import com.mogo.och.sweeper.ui.SweeperOperatePanelView
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback
import com.mogo.och.sweepercloud.constant.OperateStateEnum
import com.mogo.och.sweepercloud.ui.SweeperOperatePanelView
/**
* 清扫车面板浮窗

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.util;
package com.mogo.och.sweepercloud.util;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER;
@@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.sweeper.constant.SweeperConst;
import com.mogo.och.sweepercloud.constant.SweeperConst;
import java.util.HashMap;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.util;
package com.mogo.och.sweepercloud.util;
import chassis.ChassisStatesOuterClass;
import chassis.SpecialVehicleTaskCmdOuterClass;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperMapAssetStyleUtil.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.util;
package com.mogo.och.sweepercloud.util;
import android.content.Context;

6
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperTrajectoryManager.java
View File

@@ -1,11 +1,11 @@
package com.mogo.och.sweeper.util;
package com.mogo.och.sweepercloud.util;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.GsonUtils;
import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean;
import com.mogo.och.sweeper.constant.SweeperConst;
import com.mogo.och.sweepercloud.bean.SweeperSubTaskDetailBean;
import com.mogo.och.sweepercloud.constant.SweeperConst;
import java.util.concurrent.TimeUnit;

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/BusArcView.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/BusArcView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view;
package com.mogo.och.sweepercloud.view;
import android.animation.ValueAnimator;
import android.content.Context;
@@ -15,7 +15,7 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.mogo.och.sweeper.R;
import com.mogo.och.sweepercloud.R;
/**
* created by wujifei on 2021/3/24 16:20

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/LegendItemView.kt
View File

@@ -1,10 +1,10 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import com.mogo.och.sweeper.R
import com.mogo.och.sweepercloud.R
import kotlinx.android.synthetic.main.sweeper_item_legend.view.*
/**

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchConstraintLayout.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view;
package com.mogo.och.sweepercloud.view;
import android.content.Context;
import android.util.AttributeSet;

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchFrameLayout.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view;
package com.mogo.och.sweepercloud.view;
import android.content.Context;
import android.util.AttributeSet;

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SlidePanelView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view;
package com.mogo.och.sweepercloud.view;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
@@ -21,7 +21,7 @@ import android.view.animation.DecelerateInterpolator;
import androidx.annotation.Nullable;
import com.mogo.och.sweeper.R;
import com.mogo.och.sweepercloud.R;
/**
* 滑块滑动面板

6
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SubTaskView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.graphics.Color
@@ -7,8 +7,8 @@ import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.bean.SubInfo
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.bean.SubInfo
import kotlinx.android.synthetic.main.sweeper_subtask_view.view.*
/**

14
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.graphics.Color
@@ -10,12 +10,12 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.utilcode.util.ClickUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.bean.SubInfo
import com.mogo.och.sweeper.bean.SweeperSubTaskBean
import com.mogo.och.sweeper.constant.SubTaskTypeEnum
import com.mogo.och.sweeper.presenter.SweeperPresenter
import com.mogo.och.sweeper.ui.popwindow.MenuPopWindow
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.bean.SubInfo
import com.mogo.och.sweepercloud.bean.SweeperSubTaskBean
import com.mogo.och.sweepercloud.constant.SubTaskTypeEnum
import com.mogo.och.sweepercloud.presenter.SweeperPresenter
import com.mogo.och.sweepercloud.ui.popwindow.MenuPopWindow
import kotlinx.android.synthetic.main.sweeper_current_task_info.view.*
/**

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperLimitingVelocityView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.util.AttributeSet
@@ -12,7 +12,7 @@ import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListen
import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.sweeper.R
import com.mogo.och.sweepercloud.R
import kotlinx.android.synthetic.main.sweeper_limiting_speed.view.*
class SweeperLimitingVelocityView(

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.annotation.SuppressLint
import android.content.Context
@@ -21,7 +21,7 @@ import com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.sweeper.R
import com.mogo.och.sweepercloud.R
import planning.RoboSweeperTaskIndexOuterClass
import kotlin.math.roundToInt

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.util.AttributeSet
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.enums.TrafficLightEnum
import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener
import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.sweeper.R
import com.mogo.och.sweepercloud.R
import kotlinx.android.synthetic.main.sweeper_traffic_light_view.view.*
/**

17
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.util.AttributeSet
@@ -9,19 +9,18 @@ import chassis.ChassisStatesOuterClass.SweeperFuTianTaskSystemStates
import com.elegant.utils.UiThreadHandler
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.callback.ICleaningModeStateCallback
import com.mogo.och.sweeper.constant.OperateStateEnum
import com.mogo.och.sweeper.constant.SubTaskTypeEnum
import com.mogo.och.sweeper.ui.popwindow.SweeperOperatePanelPopWindow
import com.mogo.och.sweeper.util.SweeperFutianCmdUtil
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback
import com.mogo.och.sweepercloud.constant.OperateStateEnum
import com.mogo.och.sweepercloud.constant.SubTaskTypeEnum
import com.mogo.och.sweepercloud.ui.popwindow.SweeperOperatePanelPopWindow
import com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil
import kotlinx.android.synthetic.main.sweeper_work_mode.view.*
/**
* 清扫车模式信息展示
*/
class SweeperWorkModeView : ConstraintLayout,
ICleaningModeStateCallback {
class SweeperWorkModeView : ConstraintLayout,ICleaningModeStateCallback {
private var isSelectPureSweepMode: Boolean = false
private val TAG = "SweeperWorkModeView"

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/TurnSignalView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
@@ -9,7 +9,7 @@ import android.view.View
import android.widget.ImageView
import android.widget.LinearLayout
import chassis.Chassis
import com.mogo.och.sweeper.R
import com.mogo.och.sweepercloud.R
import kotlinx.android.synthetic.main.sweeper_turn_signal.view.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope

2
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/VerticalDashLineView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view;
package com.mogo.och.sweepercloud.view;
import android.content.Context;
import android.graphics.Canvas;

14
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltMapOverView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.graphics.Color
@@ -19,11 +19,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.CoordinateUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweeper.constant.SweeperConst
import com.mogo.och.sweeper.database.bean.WeltDataBean
import com.mogo.och.sweeper.util.SweeperMapAssetStyleUtil
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweepercloud.constant.SweeperConst
import com.mogo.och.sweepercloud.database.bean.WeltDataBean
import com.mogo.och.sweepercloud.util.SweeperMapAssetStyleUtil
import kotlinx.android.synthetic.main.sweeper_welt_map_overview.view.*
/**
@@ -110,7 +110,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
*/
private fun getRouteColorList(weltData: MutableList<WeltDataBean>):MutableList<Int> {
val colorList= mutableListOf<Int>()
var nextWeltDataBean: WeltDataBean?=null
var nextWeltDataBean:WeltDataBean?=null
for (i in weltData.indices) {
val weltDataBean = weltData[i]
if(i+1<weltData.size){

14
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt → OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltSmallMapView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.sweeper.view
package com.mogo.och.sweepercloud.view
import android.content.Context
import android.graphics.Color
@@ -19,11 +19,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.CoordinateUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.sweeper.R
import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweeper.constant.SweeperConst
import com.mogo.och.sweeper.database.bean.WeltDataBean
import com.mogo.och.sweeper.util.SweeperMapAssetStyleUtil
import com.mogo.och.sweepercloud.R
import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean
import com.mogo.och.sweepercloud.constant.SweeperConst
import com.mogo.och.sweepercloud.database.bean.WeltDataBean
import com.mogo.och.sweepercloud.util.SweeperMapAssetStyleUtil
import kotlinx.android.synthetic.main.sweeper_welt_small_map_view.view.*
@@ -168,7 +168,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
*/
private fun getRouteColorList(weltData: MutableList<WeltDataBean>): MutableList<Int> {
val colorList = mutableListOf<Int>()
var nextWeltDataBean: WeltDataBean?=null
var nextWeltDataBean:WeltDataBean?=null
for (i in weltData.indices) {
val weltDataBean = weltData[i]
if(i+1<weltData.size){

4
OCH/sweeper/sweeper-cloud/src/main/res/layout/fragment_och_sweeper.xml
View File

@@ -9,7 +9,7 @@
app:layout_constraintBottom_toBottomOf="parent"
android:orientation="vertical">
<!--清扫模式面板-->
<com.mogo.och.sweeper.view.SweeperWorkModeView
<com.mogo.och.sweepercloud.view.SweeperWorkModeView
android:id="@+id/sweeper_cl_work_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
app:layout_constraintTop_toBottomOf="@+id/sweeper_arc"
android:visibility="gone" />
<!--清扫任务当前面板-->
<com.mogo.och.sweeper.view.SweeperCurrentTaskInfoView
<com.mogo.och.sweepercloud.view.SweeperCurrentTaskInfoView
android:id="@+id/sweeper_current_task_view"
app:layout_constraintTop_toBottomOf="@+id/sweeper_cl_work_mode"
android:layout_width="wrap_content"

2
OCH/sweeper/sweeper-cloud/src/main/res/layout/fragment_welt_map_overview.xml
View File

@@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.mogo.och.sweeper.view.WeltMapOverView
<com.mogo.och.sweepercloud.view.WeltMapOverView
android:id="@+id/weltMapOverView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

4
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml
View File

@@ -14,7 +14,7 @@
android:layout_height="match_parent" />
<!--车辆基本交通信息-->
<com.mogo.och.sweeper.view.SweeperTrafficDataView
<com.mogo.och.sweepercloud.view.SweeperTrafficDataView
android:id="@+id/sweeper_arc"
android:layout_width="@dimen/dp_616"
android:layout_height="@dimen/dp_320"
@@ -98,7 +98,7 @@
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_27">
<com.mogo.och.sweeper.view.WeltSmallMapView
<com.mogo.och.sweepercloud.view.WeltSmallMapView
android:id="@+id/sweeper_task_welt_small_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

6
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_current_task_info.xml
View File

@@ -92,7 +92,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/viewTaskInfoLine" />
<com.mogo.och.sweeper.view.SubTaskView
<com.mogo.och.sweepercloud.view.SubTaskView
android:id="@+id/preSubTask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/viewTaskInfoLine" />
<com.mogo.och.sweeper.view.SubTaskView
<com.mogo.och.sweepercloud.view.SubTaskView
android:id="@+id/currentSubTask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/preSubTask" />
<com.mogo.och.sweeper.view.SubTaskView
<com.mogo.och.sweepercloud.view.SubTaskView
android:id="@+id/lastSubTask"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_operate_panel_view.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.och.sweeper.view.NoTouchConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.mogo.och.sweepercloud.view.NoTouchConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_957"
android:layout_height="@dimen/dp_758"
@@ -295,4 +295,4 @@
android:layout_gravity="center"
android:src="@drawable/sweeper_loading_nor" />
</FrameLayout>
</com.mogo.och.sweeper.view.NoTouchConstraintLayout>
</com.mogo.och.sweepercloud.view.NoTouchConstraintLayout>

4
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.och.sweeper.ui.SweeperOperatePanelView
<com.mogo.och.sweepercloud.ui.SweeperOperatePanelView
android:id="@+id/SweeperOperatePanelView"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</com.mogo.och.sweeper.ui.SweeperOperatePanelView>
</com.mogo.och.sweepercloud.ui.SweeperOperatePanelView>

6
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_traffic_data.xml
View File

@@ -59,7 +59,7 @@
app:layout_constraintBottom_toBottomOf="@+id/sweeperTrafficPosition"
android:layout_marginStart="@dimen/dp_12"
android:background="#414869"/>
<com.mogo.och.sweeper.view.SweeperLimitingVelocityView
<com.mogo.och.sweepercloud.view.SweeperLimitingVelocityView
android:id="@+id/sweeperLimitingVelocity"
android:layout_width="@dimen/dp_52"
android:layout_height="@dimen/dp_52"
@@ -68,7 +68,7 @@
app:layout_constraintBottom_toBottomOf="@+id/sweeperTrafficPosition"
android:layout_marginStart="@dimen/dp_34"
/>
<com.mogo.och.sweeper.view.TurnSignalView
<com.mogo.och.sweepercloud.view.TurnSignalView
android:id="@+id/sweeperTurnSignal"
android:layout_width="@dimen/dp_200"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
app:layout_constraintBottom_toBottomOf="@+id/sweeperTurnSignal"
android:layout_marginStart="@dimen/dp_12"
android:background="#414869"/>
<com.mogo.och.sweeper.view.SweeperTrafficLightView
<com.mogo.och.sweepercloud.view.SweeperTrafficLightView
android:id="@+id/sweeperTrafficLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

12
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_welt_map_overview.xml
View File

@@ -65,7 +65,7 @@
android:gravity="center"
app:layout_constraintWidth_percent="0.5"
android:visibility="gone"/>
<com.mogo.och.sweeper.view.LegendItemView
<com.mogo.och.sweepercloud.view.LegendItemView
android:id="@+id/sweeperLegend1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -74,35 +74,35 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
/>
<com.mogo.och.sweeper.view.LegendItemView
<com.mogo.och.sweepercloud.view.LegendItemView
android:id="@+id/sweeperLegend2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/sweeperLegend1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.mogo.och.sweeper.view.LegendItemView
<com.mogo.och.sweepercloud.view.LegendItemView
android:id="@+id/sweeperLegend3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/sweeperLegend2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.mogo.och.sweeper.view.LegendItemView
<com.mogo.och.sweepercloud.view.LegendItemView
android:id="@+id/sweeperLegend4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/sweeperLegend3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.mogo.och.sweeper.view.LegendItemView
<com.mogo.och.sweepercloud.view.LegendItemView
android:id="@+id/sweeperLegend5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/sweeperLegend4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.mogo.och.sweeper.view.LegendItemView
<com.mogo.och.sweepercloud.view.LegendItemView
android:id="@+id/sweeperLegend6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
gradle.properties
View File

@@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7
applicationId=com.mogo.launcer
applicationName=IntelligentPilot
# RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0
versionCode=2010000
versionName=2.1.0
versionCode=3010000
versionName=3.1.0
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10