diff --git a/OCH/sweeper/sweeper-cloud/src/main/AndroidManifest.xml b/OCH/sweeper/sweeper-cloud/src/main/AndroidManifest.xml index c2a6c2cfeb..62a365f431 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/AndroidManifest.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/AndroidManifest.xml @@ -1,10 +1,10 @@ + package="com.mogo.och.sweepercloud"> - + diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java deleted file mode 100644 index f294bae32a..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java +++ /dev/null @@ -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 weltDataBeanList; - private ArrayList 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 getWeltDataBeanList() { - return weltDataBeanList; - } - - public void setWeltDataBeanList(ArrayList weltDataBeanList) { - this.weltDataBeanList = weltDataBeanList; - } - - public ArrayList getMarkers() { - return markers; - } - - public void setMarkers(ArrayList 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; - } -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/IMogoOCH.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/IMogoOCH.java similarity index 93% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/IMogoOCH.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/IMogoOCH.java index 0f584c6b1d..028cb07e56 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/IMogoOCH.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/IMogoOCH.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper; +package com.mogo.och.sweepercloud; import androidx.annotation.IdRes; import androidx.fragment.app.FragmentActivity; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/SweeperProvider.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java index 4691f4f95b..476d872e83 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/BaseResponse.java similarity index 92% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/BaseResponse.java index d13c872662..9e02972ef3 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean; +package com.mogo.och.sweepercloud.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SubStartRequest.kt similarity index 86% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SubStartRequest.kt index f0793a69a5..8487c1babe 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SubStartRequest.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean +package com.mogo.och.sweepercloud.bean import com.mogo.cloud.passport.MoGoAiCloudClientConfig diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperMainTaskBean.kt similarity index 85% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperMainTaskBean.kt index ccb548653a..edc6a83a83 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperMainTaskBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean +package com.mogo.och.sweepercloud.bean /** * diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperRoutePlanningUpdateReqBean.java similarity index 95% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperRoutePlanningUpdateReqBean.java index 32fcf73e48..e2b10f7824 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperRoutePlanningUpdateReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean; +package com.mogo.och.sweepercloud.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskBean.kt similarity index 95% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskBean.kt index 63ce688454..5340bd1dfa 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean +package com.mogo.och.sweepercloud.bean /** * 子任务信息 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskDetailBean.java similarity index 99% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskDetailBean.java index c21229a738..1240ea1eb0 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperSubTaskDetailBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean; +package com.mogo.och.sweepercloud.bean; public class SweeperSubTaskDetailBean { private int id; //子任务id diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ICleaningModeStateCallback.java similarity index 73% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ICleaningModeStateCallback.java index df0ed8bc1d..300a7300ad 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ICleaningModeStateCallback.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperADASStatusCallback.java similarity index 83% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperADASStatusCallback.java index 995e1723af..f8ce45d1a5 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperADASStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.callback; +package com.mogo.och.sweepercloud.callback; /** * Created on 2021/9/8 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperControllerStatusCallback.java similarity index 91% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperControllerStatusCallback.java index 7a831a7c0e..1b247f036e 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.callback; +package com.mogo.och.sweepercloud.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskCallback.kt similarity index 68% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskCallback.kt index 377eb91145..63f668fa28 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskCallback.kt @@ -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 /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskDataToFragmentCallback.kt similarity index 73% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskDataToFragmentCallback.kt index 2677042385..4e5badf48d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskDataToFragmentCallback.kt @@ -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 { diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskRouteCallback.kt similarity index 56% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskRouteCallback.kt index 5711c8e6ab..81f37c8a64 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskRouteCallback.kt @@ -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 { diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt similarity index 64% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt index 1b3e66bfe7..20748b003b 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.callback +package com.mogo.och.sweepercloud.callback interface IWeltMapSwitchToSmallCallback { fun onWeltMapSwitchToSmall() diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/OperateStateEnum.kt similarity index 86% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/OperateStateEnum.kt index fcb68755ba..d757fee453 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/OperateStateEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.constant +package com.mogo.och.sweepercloud.constant /** * 上装面板操作状态 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SubTaskTypeEnum.kt similarity index 79% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SubTaskTypeEnum.kt index 9946b8b2ef..fce396e38c 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SubTaskTypeEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.constant +package com.mogo.och.sweepercloud.constant /** * 任务类型 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt index 66b5ee3f23..aa96c7f40d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.constant +package com.mogo.och.sweepercloud.constant import com.mogo.commons.debug.DebugConfig diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/TaskStatusEnum.kt similarity index 86% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/TaskStatusEnum.kt index 5d9fd9839a..9b9db6583a 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/TaskStatusEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.constant +package com.mogo.och.sweepercloud.constant /** * 当前任务操作菜单 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/MyDataBase.java similarity index 76% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/MyDataBase.java index 69b363a9b8..7d2cdb3e22 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/MyDataBase.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/bean/WeltDataBean.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/bean/WeltDataBean.java index cee66c7e53..42fad0c8f9 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/bean/WeltDataBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.database.bean; +package com.mogo.och.sweepercloud.database.bean; import java.io.Serializable; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/dao/WeltDataDao.java similarity index 53% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/dao/WeltDataDao.java index 097be3af3e..4217b93d85 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/dao/WeltDataDao.java @@ -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 loadAllWeltDataInfo(); } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java index 5832c58081..c5b3a0fa0c 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperUIFragment.java similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperUIFragment.java index 3ee40b9134..e220d1a777 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperUIFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.fragment; +package com.mogo.och.sweepercloud.fragment; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java index a1460e31c7..e05d396e95 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt index de0eae391b..613364bd36 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt @@ -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(), MenuPopWindow.OnMenuItemOnClickListener { +class SweeperFragment : BaseSweeperTabFragment(), MenuPopWindow.OnMenuItemOnClickListener { companion object { const val TAG = "SweeperFragment" diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/WeltMapOverViewFragment.kt similarity index 91% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/WeltMapOverViewFragment.kt index a34f658856..de471c94b8 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/WeltMapOverViewFragment.kt @@ -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 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java index 3022c92a28..44f5afacd1 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/ISweeperApiService.java similarity index 89% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/ISweeperApiService.java index 5522f00dae..658c87340b 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/ISweeperApiService.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/SweeperServiceManager.kt similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/SweeperServiceManager.kt index 118807dbb7..d415652a3e 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/net/SweeperServiceManager.kt @@ -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 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java index acf46f64f6..0dc8165598 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java @@ -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 } @Override - public void setMainTaskList(List mainTaskBeanList,boolean refresh) { + public void setMainTaskList(List mainTaskBeanList, boolean refresh) { mView.setMainTaskList(mainTaskBeanList,refresh); } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java similarity index 91% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java index b2ef6bcadd..29a82c69ab 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java @@ -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; /** * 测试小巴车的场景 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java similarity index 92% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java index 934cc029de..741b9a9e6e 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java @@ -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 cleanModeBtnAndCmdValueMap = new HashMap() { { - 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 cleanDirectionBtnAndCmdValueMap = new HashMap() { { - 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 cleanIntensityBtnAndCmdValueMap = new HashMap() { { - 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(); diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/adapter/TaskListAdapter.kt similarity index 95% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/adapter/TaskListAdapter.kt index ef9aaa9a61..e562aeaf32 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/adapter/TaskListAdapter.kt @@ -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() { private var mItemClickListener: TaskItemClickListener? = null diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt similarity index 95% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt index 788f2965e6..52e21df88c 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt @@ -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 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt index 57618ccb5f..a2b41f4592 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt @@ -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 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/MenuPopWindow.kt similarity index 95% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/MenuPopWindow.kt index 1f2c5ad8f0..d713528736 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/MenuPopWindow.kt @@ -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 /** * 当前任务操作菜单栏 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt similarity index 86% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt index 1004555886..4db379e1ac 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt @@ -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 /** * 清扫车面板浮窗 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java index bf01bbf0b5..91b5820710 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java similarity index 99% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java index 79932ae4d2..35e2a0963b 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.util; +package com.mogo.och.sweepercloud.util; import chassis.ChassisStatesOuterClass; import chassis.SpecialVehicleTaskCmdOuterClass; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperMapAssetStyleUtil.java similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperMapAssetStyleUtil.java index 5f9f1db28e..57d39a354b 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperMapAssetStyleUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.util; +package com.mogo.och.sweepercloud.util; import android.content.Context; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperTrajectoryManager.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperTrajectoryManager.java index 878cb08b78..d4ac359602 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperTrajectoryManager.java @@ -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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/BusArcView.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/BusArcView.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/BusArcView.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/BusArcView.java index d559214b15..84e9e814ab 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/BusArcView.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/BusArcView.java @@ -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 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/LegendItemView.kt similarity index 93% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/LegendItemView.kt index 9a6e360b14..b5598dce04 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/LegendItemView.kt @@ -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.* /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchConstraintLayout.java similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchConstraintLayout.java index 2bdbd938e0..0e5714b7cf 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchConstraintLayout.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view; +package com.mogo.och.sweepercloud.view; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchFrameLayout.java similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchFrameLayout.java index 48b45b27af..10ff08d760 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchFrameLayout.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view; +package com.mogo.och.sweepercloud.view; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SlidePanelView.java similarity index 99% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SlidePanelView.java index f7171bce89..7479fd3d94 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SlidePanelView.java @@ -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; /** * 滑块滑动面板 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SubTaskView.kt similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SubTaskView.kt index a3d6374066..2138ce3e83 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SubTaskView.kt @@ -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.* /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt index 39fc24fd81..00d79fdf04 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt @@ -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.* /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperLimitingVelocityView.kt similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperLimitingVelocityView.kt index 17e414c40d..f7c2dff777 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperLimitingVelocityView.kt @@ -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( diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt index e50f631b9a..5a2b5a3525 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt @@ -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 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt index 18ae4794f1..1e97488bad 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt @@ -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.* /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt index fae8cfd18f..0f9dc6c4de 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt @@ -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" diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/TurnSignalView.kt similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/TurnSignalView.kt index 57394c2ce8..59bbe0788d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/TurnSignalView.kt @@ -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 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/VerticalDashLineView.java similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/VerticalDashLineView.java index 875722ea11..bc6aae4605 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/VerticalDashLineView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view; +package com.mogo.och.sweepercloud.view; import android.content.Context; import android.graphics.Canvas; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltMapOverView.kt similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt rename to OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltMapOverView.kt index 438b14b0e9..59324c2ef3 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltMapOverView.kt @@ -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):MutableList { val colorList= mutableListOf() - var nextWeltDataBean: WeltDataBean?=null + var nextWeltDataBean:WeltDataBean?=null for (i in weltData.indices) { val weltDataBean = weltData[i] if(i+1): MutableList { val colorList = mutableListOf() - var nextWeltDataBean: WeltDataBean?=null + var nextWeltDataBean:WeltDataBean?=null for (i in weltData.indices) { val weltDataBean = weltData[i] if(i+1 - - - diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml index 1039ecdcc6..eb7f101fc1 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" /> - - diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_current_task_info.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_current_task_info.xml index 1b0482afa6..5a5b5fa4b1 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_current_task_info.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_current_task_info.xml @@ -92,7 +92,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/viewTaskInfoLine" /> - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml index 2c4a7c470e..037aee6855 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml @@ -1,8 +1,8 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_traffic_data.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_traffic_data.xml index 7c71a6b184..b6ae34a471 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_traffic_data.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_traffic_data.xml @@ -59,7 +59,7 @@ app:layout_constraintBottom_toBottomOf="@+id/sweeperTrafficPosition" android:layout_marginStart="@dimen/dp_12" android:background="#414869"/> - - - - - - - - -