diff --git a/OCH/sweeper/sweeper/.gitignore b/OCH/sweeper/driver/.gitignore similarity index 100% rename from OCH/sweeper/sweeper/.gitignore rename to OCH/sweeper/driver/.gitignore diff --git a/OCH/sweeper/sweeper/AutopilotModeConfig.json b/OCH/sweeper/driver/AutopilotModeConfig.json similarity index 100% rename from OCH/sweeper/sweeper/AutopilotModeConfig.json rename to OCH/sweeper/driver/AutopilotModeConfig.json diff --git a/OCH/sweeper/sweeper/build.gradle b/OCH/sweeper/driver/build.gradle similarity index 100% rename from OCH/sweeper/sweeper/build.gradle rename to OCH/sweeper/driver/build.gradle diff --git a/OCH/sweeper/sweeper/gradle.properties b/OCH/sweeper/driver/gradle.properties similarity index 100% rename from OCH/sweeper/sweeper/gradle.properties rename to OCH/sweeper/driver/gradle.properties diff --git a/OCH/sweeper/sweeper/proguard-rules.pro b/OCH/sweeper/driver/proguard-rules.pro similarity index 100% rename from OCH/sweeper/sweeper/proguard-rules.pro rename to OCH/sweeper/driver/proguard-rules.pro diff --git a/OCH/sweeper/sweeper/schemas/com.mogo.och.sweeper.common.database.MyDataBase/1.json b/OCH/sweeper/driver/schemas/com.mogo.och.sweeper.common.database.MyDataBase/1.json similarity index 100% rename from OCH/sweeper/sweeper/schemas/com.mogo.och.sweeper.common.database.MyDataBase/1.json rename to OCH/sweeper/driver/schemas/com.mogo.och.sweeper.common.database.MyDataBase/1.json diff --git a/OCH/sweeper/sweeper/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json b/OCH/sweeper/driver/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json similarity index 100% rename from OCH/sweeper/sweeper/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json rename to OCH/sweeper/driver/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json diff --git a/OCH/sweeper/sweeper/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json b/OCH/sweeper/driver/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json similarity index 100% rename from OCH/sweeper/sweeper/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json rename to OCH/sweeper/driver/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json diff --git a/OCH/sweeper/sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt b/OCH/sweeper/driver/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt similarity index 100% rename from OCH/sweeper/sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt rename to OCH/sweeper/driver/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt diff --git a/OCH/sweeper/sweeper/src/main/AndroidManifest.xml b/OCH/sweeper/driver/src/main/AndroidManifest.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/AndroidManifest.xml rename to OCH/sweeper/driver/src/main/AndroidManifest.xml diff --git a/OCH/sweeper/sweeper/src/main/assets/map_style.data b/OCH/sweeper/driver/src/main/assets/map_style.data similarity index 100% rename from OCH/sweeper/sweeper/src/main/assets/map_style.data rename to OCH/sweeper/driver/src/main/assets/map_style.data diff --git a/OCH/sweeper/sweeper/src/main/assets/map_style_extra.data b/OCH/sweeper/driver/src/main/assets/map_style_extra.data similarity index 100% rename from OCH/sweeper/sweeper/src/main/assets/map_style_extra.data rename to OCH/sweeper/driver/src/main/assets/map_style_extra.data diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/IMogoOCH.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/IMogoOCH.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperCloudTaskCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperCloudTaskCallback.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperCloudTaskCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperCloudTaskCallback.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperControllerStatusCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperControllerStatusCallback.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperControllerStatusCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperControllerStatusCallback.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/callback/SweeperCloudDialogClickListener.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/SweeperCloudDialogClickListener.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/callback/SweeperCloudDialogClickListener.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/SweeperCloudDialogClickListener.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperTabFragment.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperTabFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperTabFragment.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperUIFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperUIFragment.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperUIFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperUIFragment.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperAmapNaviFragment.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperAmapNaviFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperAmapNaviFragment.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperFragment.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperFragment.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperFragment.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperFragment.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/WeltMapOverViewFragment.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/WeltMapOverViewFragment.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/WeltMapOverViewFragment.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/WeltMapOverViewFragment.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperTaskModel.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperTaskModel.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperTaskModel.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperPresenter.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperPresenter.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperPresenter.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperPresenter.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/SweeperOperatePanelView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/SweeperOperatePanelView.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/SweeperOperatePanelView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/SweeperOperatePanelView.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudDialog.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudDialog.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudLoadingDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudLoadingDialog.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudLoadingDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudLoadingDialog.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperManualDrivingDialog.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperManualDrivingDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperManualDrivingDialog.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperNoTitleCommonDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperNoTitleCommonDialog.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperNoTitleCommonDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperNoTitleCommonDialog.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/popwindow/SweeperOperatePanelPopWindow.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/popwindow/SweeperOperatePanelPopWindow.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/popwindow/SweeperOperatePanelPopWindow.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/AutopilotModeConfigManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/AutopilotModeConfigManager.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/AutopilotModeConfigManager.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/AutopilotModeConfigManager.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperAnalyticsManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperAnalyticsManager.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperAnalyticsManager.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperAnalyticsManager.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/CountDownView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/CountDownView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/CountDownView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/CountDownView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/FontAdaptionTextView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/FontAdaptionTextView.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/FontAdaptionTextView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/FontAdaptionTextView.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SubTaskView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SubTaskView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SubTaskView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SubTaskView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCurrentTaskInfoView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCurrentTaskInfoView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCurrentTaskInfoView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficDataView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficDataView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficDataView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficDataView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficLightView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficLightView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficLightView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficLightView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperWorkModeView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperWorkModeView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperWorkModeView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperWorkModeView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/bean/SweeperRoutePlanningUpdateReqBean.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/bean/SweeperRoutePlanningUpdateReqBean.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/bean/SweeperRoutePlanningUpdateReqBean.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/bean/SweeperRoutePlanningUpdateReqBean.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ICleaningModeStateCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ICleaningModeStateCallback.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ICleaningModeStateCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ICleaningModeStateCallback.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperADASStatusCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperADASStatusCallback.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperADASStatusCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperADASStatusCallback.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskDataToFragmentCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskDataToFragmentCallback.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskDataToFragmentCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskDataToFragmentCallback.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskRouteCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskRouteCallback.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskRouteCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskRouteCallback.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/constant/OperateStateEnum.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/OperateStateEnum.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/constant/OperateStateEnum.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/OperateStateEnum.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/database/MyDataBase.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/MyDataBase.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/database/MyDataBase.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/MyDataBase.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/database/bean/WeltDataBean.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/bean/WeltDataBean.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/database/bean/WeltDataBean.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/bean/WeltDataBean.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/database/dao/WeltDataDao.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/dao/WeltDataDao.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/database/dao/WeltDataDao.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/dao/WeltDataDao.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/receiver/TestSweeperBroadcastReceiver.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/receiver/TestSweeperBroadcastReceiver.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/receiver/TestSweeperBroadcastReceiver.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/util/SweeperFutianCmdUtil.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperFutianCmdUtil.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/util/SweeperFutianCmdUtil.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperFutianCmdUtil.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/util/SweeperMapAssetStyleUtil.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperMapAssetStyleUtil.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/util/SweeperMapAssetStyleUtil.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperMapAssetStyleUtil.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/LegendItemView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/LegendItemView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/LegendItemView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/LegendItemView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/NoTouchConstraintLayout.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchConstraintLayout.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/NoTouchConstraintLayout.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchConstraintLayout.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/NoTouchFrameLayout.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchFrameLayout.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/NoTouchFrameLayout.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchFrameLayout.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/SweeperLimitingVelocityView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperLimitingVelocityView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/SweeperLimitingVelocityView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperLimitingVelocityView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/VerticalDashLineView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/VerticalDashLineView.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/VerticalDashLineView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/VerticalDashLineView.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/BaseResponse.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/BaseResponse.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/BaseResponse.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/BaseResponse.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperMainTaskBean.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperMainTaskBean.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperMainTaskBean.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperMainTaskBean.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskBean.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskBean.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskBean.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskBean.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskDetailBean.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskDetailBean.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskDetailBean.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskDetailBean.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperControllerStatusCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperControllerStatusCallback.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperControllerStatusCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperControllerStatusCallback.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperTaskCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperTaskCallback.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperTaskCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperTaskCallback.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/IWeltMapSwitchToSmallCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/IWeltMapSwitchToSmallCallback.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/IWeltMapSwitchToSmallCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/IWeltMapSwitchToSmallCallback.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/constant/SubTaskTypeEnum.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/SubTaskTypeEnum.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/constant/SubTaskTypeEnum.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/SubTaskTypeEnum.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/constant/TaskStatusEnum.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/TaskStatusEnum.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/constant/TaskStatusEnum.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/TaskStatusEnum.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/event/WeltDataEvent.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/event/WeltDataEvent.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/event/WeltDataEvent.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/event/WeltDataEvent.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperTabFragment.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperTabFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperTabFragment.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperUIFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperUIFragment.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperUIFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperUIFragment.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperAmapNaviFragment.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperAmapNaviFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperAmapNaviFragment.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperFragment.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperFragment.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperFragment.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperFragment.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/WeltMapOverViewFragment.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/WeltMapOverViewFragment.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/WeltMapOverViewFragment.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/WeltMapOverViewFragment.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/model/SweeperTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperTaskModel.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/model/SweeperTaskModel.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperTaskModel.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperApiService.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperApiService.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperApiService.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperApiService.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/SweeperServiceManager.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperServiceManager.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/SweeperServiceManager.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperServiceManager.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperPresenter.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperPresenter.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperPresenter.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperPresenter.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/SweeperOperatePanelView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/SweeperOperatePanelView.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/SweeperOperatePanelView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/SweeperOperatePanelView.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperManualDrivingDialog.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperManualDrivingDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperManualDrivingDialog.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperNoTitleCommonDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperNoTitleCommonDialog.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperNoTitleCommonDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperNoTitleCommonDialog.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/SweeperOperatePanelPopWindow.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/SweeperOperatePanelPopWindow.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/SweeperOperatePanelPopWindow.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/util/SweeperAnalyticsManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/util/SweeperAnalyticsManager.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/util/SweeperAnalyticsManager.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/util/SweeperAnalyticsManager.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/util/SweeperTrajectoryManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/util/SweeperTrajectoryManager.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/util/SweeperTrajectoryManager.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/util/SweeperTrajectoryManager.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SlidePanelView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SlidePanelView.java similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SlidePanelView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SlidePanelView.java diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SubTaskView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SubTaskView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SubTaskView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SubTaskView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperCurrentTaskInfoView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperCurrentTaskInfoView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperCurrentTaskInfoView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficDataView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficDataView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficDataView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficDataView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficLightView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficLightView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficLightView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficLightView.kt diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperWorkModeView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperWorkModeView.kt similarity index 100% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperWorkModeView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperWorkModeView.kt diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/bg_shape_work_mode.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/bg_shape_work_mode.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_auto.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_auto.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_auto.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_auto.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_battery.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_battery.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_battery.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_battery.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_manual_driving.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_manual_driving.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_manual_driving.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_manual_driving.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_message_box.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_message_box.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_message_box_pressed.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_message_box_pressed.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_not_auto.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_not_auto.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_not_auto.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_not_auto.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_right_down_arrow.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_right_down_arrow.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_water_level_warning.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_water_level_warning.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_water_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_water_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_select.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_water_select.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_select.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/icon_water_select.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/no_task_data.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/no_task_data.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/no_task_data.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/no_task_data.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_car_big.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_car_big.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_car_small.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_car_small.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_card_normal.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_card_normal.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_card_pressed.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_card_pressed.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_loading.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_loading.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_loading.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_loading.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_rotate.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_rotate.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_rotate.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_rotate.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_rotation.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_rotation.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_rotation.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_rotation.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_collect_normal.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_collect_normal.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_line.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_line.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_line.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_line.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_loading_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_loading_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_setting_normal.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_setting_normal.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_task_not_working.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_task_not_working.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_task_working.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_task_working.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_left_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_left_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_left_select.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_left_select.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_right_nor.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_right_nor.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png b/OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_right_select.png similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png rename to OCH/sweeper/driver/src/main/res/drawable-xhdpi/turn_signal_right_select.png diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_bubble.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_bubble.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_bubble.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_bubble.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_clean_mode.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_clean_mode.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_clean_mode.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_clean_mode.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_cloud_view.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_dialog_cloud_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_cloud_view.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_dialog_cloud_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_dialog_no_title.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_dialog_no_title.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_bottom_round.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_left_bottom_round.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_bottom_round.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_left_bottom_round.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_left_right_bottom_round.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_left_right_bottom_round.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_right_bottom_round.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_right_bottom_round.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_panel.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_task_panel.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_panel.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_task_panel.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_task_state_not_ready.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_task_state_not_ready.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_working.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_task_state_working.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_working.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_task_state_working.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_welt_panel.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_shape_welt_panel.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_welt_panel.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_shape_welt_panel.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_task_menu.xml b/OCH/sweeper/driver/src/main/res/drawable/bg_task_menu.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/bg_task_menu.xml rename to OCH/sweeper/driver/src/main/res/drawable/bg_task_menu.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/icon_more.xml b/OCH/sweeper/driver/src/main/res/drawable/icon_more.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/icon_more.xml rename to OCH/sweeper/driver/src/main/res/drawable/icon_more.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_ai_collect_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_ai_collect_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_bad_case_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_bad_case_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_cloud_rotation_layer.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_cloud_rotation_layer.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_cloud_rotation_layer.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_cloud_rotation_layer.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_collect_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_collect_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_collect_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_collect_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend1.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_legend1.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend1.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_legend1.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend2.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_legend2.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend2.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_legend2.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend3.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_legend3.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend3.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_legend3.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend4.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_legend4.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend4.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_legend4.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend5.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_legend5.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend5.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_legend5.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend6.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_legend6.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend6.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_legend6.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_list_left_top_line.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_list_left_top_line.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_message_box.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_message_box.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_message_box.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_message_box.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_operation_status_bg.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_operation_status_bg.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_operation_status_bg_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_operation_status_bg_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_operation_status_select_bg.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_operation_status_select_bg.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_panel_anchor_bkg.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_panel_anchor_bkg.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_bkg.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_panel_bkg.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_bkg.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_panel_bkg.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_refresh.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_refresh.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_refresh.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_refresh.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_selector_msg_box.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_selector_msg_box.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_setting_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_setting_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_setting_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_setting_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_station_green_dash_line.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_station_green_dash_line.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_station_v_green_dash.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_station_v_green_dash.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_card_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_card_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_map_bg.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_map_bg.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_map_big_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_map_big_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_map_small_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_switch_map_small_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_btn.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_task_list_btn.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_btn.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_task_list_btn.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_not_selected.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_task_list_not_selected.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_not_selected.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_task_list_not_selected.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_selected.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_task_list_selected.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_selected.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_task_list_selected.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_upload_autopoiltstate.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_upload_autopoiltstate.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_upload_autopoiltstate.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_upload_autopoiltstate.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_water_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/sweeper_water_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/sweeper_water_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/sweeper_water_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_left_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/turn_signal_left_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_left_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/turn_signal_left_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_right_selector.xml b/OCH/sweeper/driver/src/main/res/drawable/turn_signal_right_selector.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_right_selector.xml rename to OCH/sweeper/driver/src/main/res/drawable/turn_signal_right_selector.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_cloud_loading.xml b/OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_cloud_loading.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_cloud_loading.xml rename to OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_cloud_loading.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_cloud_view.xml b/OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_cloud_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_cloud_view.xml rename to OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_cloud_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml b/OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_manual_driving.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml rename to OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_manual_driving.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_no_title.xml b/OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_no_title.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_no_title.xml rename to OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_no_title.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/fragment_och_sweeper.xml b/OCH/sweeper/driver/src/main/res/layout/fragment_och_sweeper.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/fragment_och_sweeper.xml rename to OCH/sweeper/driver/src/main/res/layout/fragment_och_sweeper.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/fragment_och_sweeper_cloud.xml b/OCH/sweeper/driver/src/main/res/layout/fragment_och_sweeper_cloud.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/fragment_och_sweeper_cloud.xml rename to OCH/sweeper/driver/src/main/res/layout/fragment_och_sweeper_cloud.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/fragment_welt_map_overview.xml b/OCH/sweeper/driver/src/main/res/layout/fragment_welt_map_overview.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/fragment_welt_map_overview.xml rename to OCH/sweeper/driver/src/main/res/layout/fragment_welt_map_overview.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_amap_navi_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_amap_navi_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_amap_navi_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_amap_navi_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_base_fragment.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_base_fragment.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_current_task_info.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_current_task_info.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_current_task_info.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_current_task_info.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_no_data_common_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_no_data_common_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_no_data_common_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_no_data_common_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_popwindow_operate_panel.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_popwindow_operate_panel.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_popwindow_operate_panel.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_popwindow_operate_panel.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_subtask_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_subtask_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_subtask_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_subtask_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_traffic_data.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_traffic_data.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_cloud_traffic_data.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_traffic_data.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_current_task_info.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_current_task_info.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_current_task_info.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_current_task_info.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_legend.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_item_legend.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_legend.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_item_legend.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_task_info.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_item_task_info.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_task_info.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_item_task_info.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_limiting_speed.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_limiting_speed.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_limiting_speed.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_limiting_speed.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_no_data_common_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_no_data_common_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_no_data_common_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_no_data_common_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_operate_panel_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_panel_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_operate_panel_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_operate_panel_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_popwindow_operate_panel.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_popwindow_operate_panel.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_popwindow_operate_panel.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_popwindow_operate_panel.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_subtask_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_subtask_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_subtask_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_subtask_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_task_menu.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_task_menu.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_task_menu.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_task_menu.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_test_bar_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_test_bar_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_test_bar_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_test_bar_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_traffic_data.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_traffic_data.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_light_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_traffic_light_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_light_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_traffic_light_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_turn_signal.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_turn_signal.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_turn_signal.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_turn_signal.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_map_overview.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_welt_map_overview.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_map_overview.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_welt_map_overview.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_welt_small_map_view.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_welt_small_map_view.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_work_mode.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_work_mode.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_work_mode.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_work_mode.xml diff --git a/OCH/sweeper/sweeper/src/main/res/raw/end_marker.nt3d b/OCH/sweeper/driver/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/raw/end_marker.nt3d rename to OCH/sweeper/driver/src/main/res/raw/end_marker.nt3d diff --git a/OCH/sweeper/sweeper/src/main/res/raw/star_marker.nt3d b/OCH/sweeper/driver/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/raw/star_marker.nt3d rename to OCH/sweeper/driver/src/main/res/raw/star_marker.nt3d diff --git a/OCH/sweeper/sweeper/src/main/res/values/attrs.xml b/OCH/sweeper/driver/src/main/res/values/attrs.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/values/attrs.xml rename to OCH/sweeper/driver/src/main/res/values/attrs.xml diff --git a/OCH/sweeper/sweeper/src/main/res/values/colors.xml b/OCH/sweeper/driver/src/main/res/values/colors.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/values/colors.xml rename to OCH/sweeper/driver/src/main/res/values/colors.xml diff --git a/OCH/sweeper/sweeper/src/main/res/values/dimens.xml b/OCH/sweeper/driver/src/main/res/values/dimens.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/values/dimens.xml rename to OCH/sweeper/driver/src/main/res/values/dimens.xml diff --git a/OCH/sweeper/sweeper/src/main/res/values/strings.xml b/OCH/sweeper/driver/src/main/res/values/strings.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/values/strings.xml rename to OCH/sweeper/driver/src/main/res/values/strings.xml diff --git a/OCH/sweeper/sweeper/src/main/res/values/style.xml b/OCH/sweeper/driver/src/main/res/values/style.xml similarity index 100% rename from OCH/sweeper/sweeper/src/main/res/values/style.xml rename to OCH/sweeper/driver/src/main/res/values/style.xml diff --git a/OCH/sweeper/sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt b/OCH/sweeper/driver/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt similarity index 100% rename from OCH/sweeper/sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt rename to OCH/sweeper/driver/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index cd4aa1a47c..171bfbe8e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -175,13 +175,11 @@ android { apply from: "./script/productFlavors/noop.gradle" apply from: "./script/productFlavors/shuttle.gradle" apply from: "./script/productFlavors/sweeperOperate.gradle" - apply from: "./script/productFlavors/sweeperCloud.gradle" apply from: "./script/productFlavors/taxi.gradle" apply from: "./script/productFlavors/taxiunmanned.gradle" // 配置不同渠道参数,直接影响功能完整度 apply from: "./script/vehicleFlavors/fPadLenovo.gradle" apply from: "./script/vehicleFlavors/ochJL.gradle" - apply from: "./script/vehicleFlavors/ochJL.gradle" apply from: "./script/vehicleFlavors/ochM2.gradle" apply from: "./script/vehicleFlavors/ochDFHQ.gradle" apply from: "./script/vehicleFlavors/ochFT.gradle" diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index d38b314f89..8d8f856d68 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -6,9 +6,6 @@ "sweeperOperate" :{ "driver": ["ochFT"] }, - "sweeperCloud" :{ - "driver": ["ochFT"] - }, "shuttle" :{ "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 41e69962e2..9d49e702be 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -3,7 +3,6 @@ apply from: "./script/utils.gradle" project.dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop) - // Bus司机端 // fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) // // Bus乘客端 @@ -13,9 +12,7 @@ project.dependencies { // fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) // // taxi乘客端 // fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - } else { - if (isCurrentDriver("noop")) { noopImplementation(project(':OCH:mogo-och-noop')) } else if (isCurrentDriver("bus")) { @@ -30,17 +27,15 @@ project.dependencies { implementation project(':OCH:shuttle:driver') } else if (isCurrentPassenger("shuttle")) { implementation project.project(':OCH:shuttle:passenger') - } else if (isCurrentDriver("sweeperCloud")) { - implementation project.project(':OCH:sweeper:sweeper-cloud') } else if (isCurrentDriver("sweeperOperate")) { - implementation project.project(':OCH:sweeper:sweeper') + implementation project.project(':OCH:sweeper:driver') } else if (isCurrentDriver("taxiunmanned")) { implementation project.project(':OCH:taxi:unmanned-driver') } else if (isCurrentPassenger("taxiunmanned")) { implementation project.project(':OCH:taxi:unmanned-passenger') } else if (isCurrentDriver("taxi")) { implementation project.project(':OCH:taxi:driver') - }else if (isCurrentPassenger("taxi")) { + } else if (isCurrentPassenger("taxi")) { implementation project.project(':OCH:taxi:passenger') } else { noopImplementation(project(':OCH:mogo-och-noop')) @@ -50,18 +45,13 @@ project.dependencies { implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:shuttle:driver') implementation project.project(':OCH:shuttle:passenger') - implementation project.project(':OCH:sweeper:sweeper-cloud') - implementation project.project(':OCH:sweeper:sweeper') + implementation project.project(':OCH:sweeper:driver') implementation project.project(':OCH:taxi:driver') implementation project.project(':OCH:taxi:passenger') implementation project.project(':OCH:taxi:unmanned-driver') implementation project.project(':OCH:taxi:unmanned-passenger') } - if(isCurrentFlavors("sweeperCloud")){ - project.dependencies.add('implementation', project.project(':OCH:sweeper:sweeper-cloud')) - } - // 多屏幕-Bus司机端 // fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) // // 多屏幕-Bus乘客端 @@ -74,6 +64,5 @@ project.dependencies { // // // 清扫车-多屏幕 // fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) - } } diff --git a/app/script/productFlavors/sweeperCloud.gradle b/app/script/productFlavors/sweeperCloud.gradle deleted file mode 100644 index 5c9bbc338c..0000000000 --- a/app/script/productFlavors/sweeperCloud.gradle +++ /dev/null @@ -1,32 +0,0 @@ -project.android.productFlavors { - // 清扫车业务 - sweeperCloud { - dimension "product" - - manifestPlaceholders = [ - // 标识 - CHANNEL_VALUE_HEAD: "Sweeper", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION:"landscape", - ] - - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" - - // ②连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - - if(isCurrentFlavors("sweeperCloud")){ - project.dependencies.add('implementation', project.project(':OCH:sweeper:sweeper-cloud')) - } - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index acf828b656..b2f11d08f5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -71,8 +71,7 @@ include ':OCH:mogo-och-noop' include(':OCH:mogo-och-common-module') include ':OCH:mogo-och-data' -include ':OCH:sweeper:sweeper' -include ':OCH:sweeper:sweeper-cloud' +include ':OCH:sweeper:driver' include ':OCH:charter:driver' include ':OCH:charter:passenger'