diff --git a/OCH/sweeper/sweeper-cloud/.gitignore b/OCH/sweeper/driver/.gitignore similarity index 100% rename from OCH/sweeper/sweeper-cloud/.gitignore rename to OCH/sweeper/driver/.gitignore diff --git a/OCH/sweeper/sweeper-cloud/AutopilotModeConfig.json b/OCH/sweeper/driver/AutopilotModeConfig.json similarity index 100% rename from OCH/sweeper/sweeper-cloud/AutopilotModeConfig.json rename to OCH/sweeper/driver/AutopilotModeConfig.json diff --git a/OCH/sweeper/sweeper-cloud/build.gradle b/OCH/sweeper/driver/build.gradle similarity index 98% rename from OCH/sweeper/sweeper-cloud/build.gradle rename to OCH/sweeper/driver/build.gradle index 499a56f6dc..8468774843 100644 --- a/OCH/sweeper/sweeper-cloud/build.gradle +++ b/OCH/sweeper/driver/build.gradle @@ -48,6 +48,7 @@ dependencies { implementation rootProject.ext.dependencies.kotlinstdlib implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.arouter + testImplementation 'junit:junit:4.12' annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap diff --git a/OCH/sweeper/sweeper-cloud/gradle.properties b/OCH/sweeper/driver/gradle.properties similarity index 100% rename from OCH/sweeper/sweeper-cloud/gradle.properties rename to OCH/sweeper/driver/gradle.properties diff --git a/OCH/sweeper/sweeper-cloud/proguard-rules.pro b/OCH/sweeper/driver/proguard-rules.pro similarity index 100% rename from OCH/sweeper/sweeper-cloud/proguard-rules.pro rename to OCH/sweeper/driver/proguard-rules.pro diff --git a/OCH/sweeper/sweeper-cloud/schemas/com.mogo.och.sweepercloud.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-cloud/schemas/com.mogo.och.sweepercloud.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-cloud/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-cloud/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.sweeper.database.MyDataBase/1.json b/OCH/sweeper/driver/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json similarity index 83% rename from OCH/sweeper/sweeper/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json rename to OCH/sweeper/driver/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json index a9451322a4..b3961faec0 100644 --- a/OCH/sweeper/sweeper/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json +++ b/OCH/sweeper/driver/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json @@ -2,11 +2,11 @@ "formatVersion": 1, "database": { "version": 1, - "identityHash": "0897ef4b7b6a43fccf8bcf4b2144dafa", + "identityHash": "48873cc5d9f967e9df0245dc045cf91a", "entities": [ { "tableName": "welt_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `subTaskId` INTEGER NOT NULL, `locLon` REAL NOT NULL, `locLat` REAL NOT NULL, `weltDistance` REAL NOT NULL, `cleanMode` INTEGER NOT NULL, `cleanDirection` INTEGER NOT NULL, `cleanIntensity` INTEGER NOT NULL)", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `subTaskId` TEXT, `locLon` REAL NOT NULL, `locLat` REAL NOT NULL, `weltDistance` REAL NOT NULL, `cleanMode` INTEGER NOT NULL, `cleanDirection` INTEGER NOT NULL, `cleanIntensity` INTEGER NOT NULL)", "fields": [ { "fieldPath": "id", @@ -17,8 +17,8 @@ { "fieldPath": "subTaskId", "columnName": "subTaskId", - "affinity": "INTEGER", - "notNull": true + "affinity": "TEXT", + "notNull": false }, { "fieldPath": "locLon", @@ -80,7 +80,7 @@ "views": [], "setupQueries": [ "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0897ef4b7b6a43fccf8bcf4b2144dafa')" + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '48873cc5d9f967e9df0245dc045cf91a')" ] } } \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/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-cloud/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 85% rename from OCH/sweeper/sweeper/src/main/AndroidManifest.xml rename to OCH/sweeper/driver/src/main/AndroidManifest.xml index c2a6c2cfeb..c994932e50 100644 --- a/OCH/sweeper/sweeper/src/main/AndroidManifest.xml +++ b/OCH/sweeper/driver/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ - + diff --git a/OCH/sweeper/sweeper-cloud/src/main/assets/map_style.data b/OCH/sweeper/driver/src/main/assets/map_style.data similarity index 100% rename from OCH/sweeper/sweeper-cloud/src/main/assets/map_style.data rename to OCH/sweeper/driver/src/main/assets/map_style.data diff --git a/OCH/sweeper/sweeper-cloud/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-cloud/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 68% 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 index ac2436d4f6..b44c16cc04 100644 --- 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 @@ -9,8 +9,9 @@ import androidx.fragment.app.FragmentManager; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.sweeper.constant.SweeperConst; -import com.mogo.och.sweeper.fragment.SweeperFragment; +import com.mogo.och.sweeper.cloud.fragment.SweeperCloudFragment; +import com.mogo.och.sweeper.common.constant.SweeperConst; +import com.mogo.och.sweeper.operate.fragment.SweeperOperateFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,7 +26,7 @@ public class SweeperProvider implements IMogoOCH { private static final String TAG = "SweeperProvider"; - private SweeperFragment sweeperFragment; + private SweeperOperateFragment sweeperOperateFragment; private int containerId; private FragmentActivity activity; @@ -34,26 +35,26 @@ public class SweeperProvider implements IMogoOCH { } private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); - if (sweeperFragment == null) { + if (sweeperOperateFragment == null) { CallerLogger.d(TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG); - if (fragmentByTag instanceof SweeperFragment) { - sweeperFragment = (SweeperFragment) fragmentByTag; + Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperOperateFragment.TAG); + if (fragmentByTag instanceof SweeperCloudFragment) { + sweeperOperateFragment = (SweeperOperateFragment) fragmentByTag; } else { - sweeperFragment = new SweeperFragment(); + sweeperOperateFragment = new SweeperOperateFragment(); } - if(!sweeperFragment.isAdded()) { - supportFragmentManager.beginTransaction().add(containerId, sweeperFragment, sweeperFragment.TAG).commitAllowingStateLoss(); + if(!sweeperOperateFragment.isAdded()) { + supportFragmentManager.beginTransaction().add(containerId, sweeperOperateFragment, sweeperOperateFragment.TAG).commitAllowingStateLoss(); } return; } CallerLogger.d(TAG, "准备show fragment"); - supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss(); + supportFragmentManager.beginTransaction().show(sweeperOperateFragment).commitAllowingStateLoss(); } private void hideFragment() { - if (sweeperFragment != null) { + if (sweeperOperateFragment != null) { CallerLogger.d(TAG, "准备hide fragment"); - activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss(); + activity.getSupportFragmentManager().beginTransaction().hide(sweeperOperateFragment).commitAllowingStateLoss(); } } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperCloudTaskCallback.kt similarity index 81% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperCloudTaskCallback.kt index 631cfd330a..808036e67c 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperCloudTaskCallback.kt @@ -1,17 +1,13 @@ -package com.mogo.och.sweepercloud.callback +package com.mogo.och.sweeper.cloud.callback import chassis.ChassisStatesOuterClass -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweepercloud.database.bean.WeltDataBean +import com.mogo.och.sweeper.common.database.bean.WeltDataBean import com.zhjt.mogo.adas.data.AiCloudTask -import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable.IsBootableResp import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon.Code import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask -import com.zhjt.mogo.adas.data.sweeper.task.big.SweeperBigTaskStatus import com.zhjt.mogo.adas.data.sweeper.task.cloud.s_r.SweeperTaskCloudSuspendResume.ActionType -import com.zhjt.mogo.adas.data.sweeper.task.cloud.s_r.SweeperTaskCloudSuspendResume.BigTaskActionPush import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop.StopTaskType /** @@ -62,7 +58,7 @@ interface ISweeperCloudTaskCallback { /** * 设置轨迹坐标点集合 */ - fun setRouteList(routeList: java.util.ArrayList) + fun setRouteList(routeList: java.util.ArrayList) /** * 贴边数据回传 */ diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperControllerStatusCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperControllerStatusCallback.java similarity index 91% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperControllerStatusCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperControllerStatusCallback.java index 2ad48d1d5b..3b153f16ad 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperControllerStatusCallback.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/ISweeperControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.callback; +package com.mogo.och.sweeper.cloud.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/SweeperCloudDialogClickListener.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/SweeperCloudDialogClickListener.kt similarity index 75% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/SweeperCloudDialogClickListener.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/SweeperCloudDialogClickListener.kt index abf3be40ca..715347142a 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/SweeperCloudDialogClickListener.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/callback/SweeperCloudDialogClickListener.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.callback +package com.mogo.och.sweeper.cloud.callback interface SweeperCloudDialogClickListener { fun onConfirm() diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java similarity index 95% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java index 6da04fafed..896fcd1907 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.fragment; +package com.mogo.och.sweeper.cloud.fragment; import static com.mogo.map.MogoMap.DEFAULT; @@ -41,15 +41,16 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager; import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil; -import com.mogo.och.sweepercloud.R; -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean; -import com.mogo.och.sweepercloud.callback.ISweeperTaskDataToFragmentCallback; -import com.mogo.och.sweepercloud.callback.IWeltMapSwitchToSmallCallback; -import com.mogo.och.sweepercloud.database.bean.WeltDataBean; -import com.mogo.och.sweepercloud.util.AutopilotModeConfigManager; -import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils; -import com.mogo.och.sweepercloud.view.SweeperTrafficDataView; -import com.mogo.och.sweepercloud.view.WeltSmallMapView; +import com.mogo.och.sweeper.R; +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean; +import com.mogo.och.sweeper.common.callback.ISweeperTaskDataToFragmentCallback; +import com.mogo.och.sweeper.common.callback.IWeltMapSwitchToSmallCallback; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; +import com.mogo.och.sweeper.cloud.util.AutopilotModeConfigManager; +import com.mogo.och.sweeper.cloud.util.SweeperCloudTaskUtils; +import com.mogo.och.sweeper.cloud.view.SweeperCloudTrafficDataView; +import com.mogo.och.sweeper.common.fragment.WeltMapOverViewFragment; +import com.mogo.och.sweeper.common.view.WeltSmallMapView; import com.zhjt.mogo.adas.data.AiCloudTask; import java.math.BigDecimal; @@ -65,7 +66,7 @@ import mogo.telematics.pad.MessagePad; * * @author tongchenfei */ -public abstract class BaseSweeperTabFragment> extends MvpFragment implements IMogoMapListener, +public abstract class BaseSweeperCloudTabFragment> extends MvpFragment implements IMogoMapListener, IWeltMapSwitchToSmallCallback, View.OnTouchListener { private static final String TAG = "BaseSweeperTabFragment"; @@ -82,7 +83,7 @@ public abstract class BaseSweeperTabFragment() { +class SweeperCloudFragment : BaseSweeperCloudTabFragment() { companion object { const val TAG = "SweeperFragment" @@ -82,8 +80,8 @@ class SweeperFragment : BaseSweeperTabFragment) { + override fun setTaskRouteList(routeList: ArrayList) { super.setTaskRouteList(routeList) } - private fun getCurrentTaskView(): SweeperCurrentTaskInfoView = sweeper_current_task_view + private fun getCurrentTaskView(): SweeperCloudCurrentTaskInfoView = sweeper_current_task_view fun handleSubTaskInfoDialog(taskId: String, subTaskId: String, isPop: Boolean) { if (mTaskInfo == null) return @@ -733,7 +731,7 @@ class SweeperFragment : BaseSweeperTabFragment * 清扫车任务管理 */ -public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IMoGoAutopilotStatusListener, IMoGoSweeperFutianCleanSystemListener { - private final String TAG = SweeperTaskModel.class.getSimpleName(); - private static volatile SweeperTaskModel sInstance; +public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListener, IMoGoAutopilotStatusListener, IMoGoSweeperFutianCleanSystemListener { + private final String TAG = SweeperCloudTaskModel.class.getSimpleName(); + private static volatile SweeperCloudTaskModel sInstance; public double mLongitude = 0; public double mLatitude = 0; private Context mContext; @@ -112,18 +111,18 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM //用于对应messageType和reqNo绑定在一起，保证请求的reqNo和响应的reqNo一致 private HashMap msgTypeAndReqNo = new HashMap<>(); - public static SweeperTaskModel getInstance() { + public static SweeperCloudTaskModel getInstance() { if (sInstance == null) { - synchronized (SweeperTaskModel.class) { + synchronized (SweeperCloudTaskModel.class) { if (sInstance == null) { - sInstance = new SweeperTaskModel(); + sInstance = new SweeperCloudTaskModel(); } } } return sInstance; } - private SweeperTaskModel() { + private SweeperCloudTaskModel() { } @@ -197,7 +196,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) { if (null != routeList && routeList.getWayPointsList() != null && routeList.getWayPointsList().size() > 0) { - CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: " + printMessage(routeList)); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: " + SweeperCloudTaskUtils.printMessage(routeList)); // MAP返回路线信息，在1秒内返回了2次，这里加上数据过滤 long current = System.currentTimeMillis(); @@ -336,7 +335,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM SweeperTask.TaskInfo taskInfo) { CallerLogger.d(M_SWEEPER + TAG, - "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " onSweeperFutianCloudTask：" + (taskInfo == null ? "null" : printMessage(taskInfo)) + " mSweeperTaskCallback：" + mSweeperTaskCallback); + "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " onSweeperFutianCloudTask：" + (taskInfo == null ? "null" : SweeperCloudTaskUtils.printMessage(taskInfo)) + " mSweeperTaskCallback：" + mSweeperTaskCallback); if (mSweeperTaskCallback != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTask(messageType, taskInfo); @@ -348,7 +347,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM SweeperTaskConfirm.TaskConfirm taskConfirm) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskConfirm：" + printMessage(taskConfirm)); + "onSweeperFutianCloudTaskConfirm：" + SweeperCloudTaskUtils.printMessage(taskConfirm)); if (mSweeperTaskCallback != null && taskConfirm != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskConfirm(taskConfirm.getTaskId(), taskConfirm.getSubTaskId(), taskConfirm.getIsPop()); @@ -359,7 +358,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTaskStatus(@NonNull AiCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStatus.TaskStatusPush taskStatusPush) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskStatus：" + printMessage(taskStatusPush)); + "onSweeperFutianCloudTaskStatus：" + SweeperCloudTaskUtils.printMessage(taskStatusPush)); if (mSweeperTaskCallback != null && taskStatusPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskStatus(taskStatusPush.getTaskId(), taskStatusPush.getSubTaskId(), taskStatusPush.getTaskStatus()); @@ -370,7 +369,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTaskStop(@NonNull AiCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStop.StopTaskReq stopTaskReq) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskStop：" + printMessage(stopTaskReq)); + "onSweeperFutianCloudTaskStop：" + SweeperCloudTaskUtils.printMessage(stopTaskReq)); if (mSweeperTaskCallback != null && stopTaskReq != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskStop(stopTaskReq.getTaskId(), stopTaskReq.getType(), stopTaskReq.getIsPop()); @@ -381,7 +380,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTaskSuspendResume(@NonNull AiCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskSuspendResume.SuspendResumeTaskResp suspendResumeTaskResp) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskSuspendResume：" + printMessage(suspendResumeTaskResp)); + "onSweeperFutianCloudTaskSuspendResume：" + SweeperCloudTaskUtils.printMessage(suspendResumeTaskResp)); if (mSweeperTaskCallback != null && suspendResumeTaskResp != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskSuspendResume(messageType, suspendResumeTaskResp.getTaskId(), @@ -393,7 +392,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudBootable(@NonNull AiCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBootable.IsBootableResp isBootableResp) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudBootable：" + printMessage(isBootableResp)); + "onSweeperFutianCloudBootable：" + SweeperCloudTaskUtils.printMessage(isBootableResp)); if (mSweeperTaskCallback != null && isBootableResp != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudBootable(isBootableResp.getTaskId(), isBootableResp.getSubTaskId(), isBootableResp); @@ -404,7 +403,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudBigTaskStatus(@NonNull AiCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBigTaskStatus.BigTaskStatusPush bigTaskStatusPush) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush)); + "onSweeperFutianCloudBigTaskStatus：" + SweeperCloudTaskUtils.printMessage(bigTaskStatusPush)); if (mSweeperTaskCallback != null && bigTaskStatusPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudBigTaskStatus(bigTaskStatusPush.getTaskId(), bigTaskStatusPush.getTaskStatus(), bigTaskStatusPush.getIsPop()); @@ -415,7 +414,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTaskCloudSuspendResume(@NonNull AiCloudTask.MessageType messageType, @Nullable String reqNo, long sysTime, @Nullable SweeperTaskCloudSuspendResume.BigTaskActionPush bigTaskActionPush) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskCloudSuspendResume：" + printMessage(bigTaskActionPush)); + "onSweeperFutianCloudTaskCloudSuspendResume：" + SweeperCloudTaskUtils.printMessage(bigTaskActionPush)); if (mSweeperTaskCallback != null && bigTaskActionPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudBigTaskSuspendResume(bigTaskActionPush.getTaskId(), bigTaskActionPush.getAction(), bigTaskActionPush.getIsPop()); @@ -521,7 +520,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM SweeperTask.GetTaskReq getTaskReq = builder.build(); CallerLogger.d(M_SWEEPER + TAG, - "getCurrentTask:" + printMessage(getTaskReq) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.PadSendGetTaskReq.getNumber()); + "getCurrentTask:" + SweeperCloudTaskUtils.printMessage(getTaskReq) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.PadSendGetTaskReq.getNumber()); getAutoPilotControlManager().sendSweeperGetTaskReq(reqNo, getTaskReq); } @@ -538,7 +537,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM getAutoPilotControlManager().sendSweeperStartTaskResp(reqNo, startTaskResp); CallerLogger.d(M_SWEEPER + TAG, - "sendSweeperStartTaskResp:" + printMessage(startTaskResp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTask.getNumber()); + "sendSweeperStartTaskResp:" + SweeperCloudTaskUtils.printMessage(startTaskResp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTask.getNumber()); } /** @@ -553,7 +552,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM SweeperTaskConfirm.TaskConfirmResp taskConfirmResp = builder.build(); String reqNo = msgTypeAndReqNo.get(AiCloudTask.MessageType.CloudPushTaskConfirm.getNumber()); CallerLogger.d(M_SWEEPER + TAG, - "sendSweeperTaskConfirmResp" + printMessage(taskConfirmResp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTaskConfirm.getNumber()); + "sendSweeperTaskConfirmResp" + SweeperCloudTaskUtils.printMessage(taskConfirmResp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTaskConfirm.getNumber()); getAutoPilotControlManager().sendSweeperTaskConfirmResp(reqNo, taskConfirmResp); } @@ -572,7 +571,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM String reqNo = msgTypeAndReqNo.get(AiCloudTask.MessageType.CloudPushTaskStop.getNumber()); CallerLogger.d(M_SWEEPER + TAG, - "sendSweeperStopTaskResp" + printMessage(stopTaskResp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTaskStop.getNumber()); + "sendSweeperStopTaskResp" + SweeperCloudTaskUtils.printMessage(stopTaskResp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTaskStop.getNumber()); getAutoPilotControlManager().sendSweeperStopTaskResp(reqNo, stopTaskResp); } @@ -593,7 +592,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM String reqNo = SweeperCloudTaskUtils.getRequestId(); CallerLogger.d(M_SWEEPER + TAG, - "sendSweeperAutopilotBootable" + printMessage(isBootable) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.PadSendBootable.getNumber()); + "sendSweeperAutopilotBootable" + SweeperCloudTaskUtils.printMessage(isBootable) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.PadSendBootable.getNumber()); getAutoPilotControlManager().sendSweeperAutopilotBootable(reqNo, isBootable); //SweeperCloudTaskUtils.mockSendCloudBootable(); } @@ -612,7 +611,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM String reqNo = msgTypeAndReqNo.get(AiCloudTask.MessageType.CloudPushTaskSuspendResume.getNumber()); CallerLogger.d(M_SWEEPER + TAG, - "sendSweeperSuspendResumeTaskResp" + printMessage(resp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTaskSuspendResume); + "sendSweeperSuspendResumeTaskResp" + SweeperCloudTaskUtils.printMessage(resp) + " reqNo:" + reqNo + " messageType:" + AiCloudTask.MessageType.CloudPushTaskSuspendResume); getAutoPilotControlManager().sendSweeperCloudSuspendResumeTaskResp(reqNo, resp); } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperCloudPresenter.java similarity index 77% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperCloudPresenter.java index 1e4b15569d..2d98852ecf 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperCloudPresenter.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.presenter; +package com.mogo.och.sweeper.cloud.presenter; import androidx.annotation.NonNull; @@ -10,13 +10,13 @@ import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCleanSystemListenerManager; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager; -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean; -import com.mogo.och.sweepercloud.callback.ISweeperCloudTaskCallback; -import com.mogo.och.sweepercloud.callback.ISweeperControllerStatusCallback; -import com.mogo.och.sweepercloud.callback.ISweeperTaskRouteCallback; -import com.mogo.och.sweepercloud.database.bean.WeltDataBean; -import com.mogo.och.sweepercloud.fragment.SweeperFragment; -import com.mogo.och.sweepercloud.model.SweeperTaskModel; +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean; +import com.mogo.och.sweeper.cloud.callback.ISweeperCloudTaskCallback; +import com.mogo.och.sweeper.cloud.callback.ISweeperControllerStatusCallback; +import com.mogo.och.sweeper.common.callback.ISweeperTaskRouteCallback; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; +import com.mogo.och.sweeper.cloud.fragment.SweeperCloudFragment; +import com.mogo.och.sweeper.cloud.model.SweeperCloudTaskModel; import com.zhjt.mogo.adas.data.AiCloudTask; import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable; import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon; @@ -34,15 +34,15 @@ import chassis.ChassisStatesOuterClass; * * @author tongchenfei */ -public class SweeperPresenter extends Presenter +public class SweeperCloudPresenter extends Presenter implements ISweeperControllerStatusCallback, ISweeperCloudTaskCallback, ISweeperTaskRouteCallback { private static final String TAG = "SweeperPresenter"; - public SweeperPresenter(SweeperFragment view) { + public SweeperCloudPresenter(SweeperCloudFragment view) { super(view); - SweeperTaskModel.getInstance().init(); + SweeperCloudTaskModel.getInstance().init(); OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp()); } @@ -55,18 +55,18 @@ public class SweeperPresenter extends Presenter @Override public void onDestroy(@NonNull LifecycleOwner owner) { super.onDestroy(owner); - SweeperTaskModel.getInstance().release(); + SweeperCloudTaskModel.getInstance().release(); releaseListener(); } public void initModelListener() { - SweeperTaskModel.getInstance().setControllerStatusCallback(this); - SweeperTaskModel.getInstance().setSweeperTaskCallback(this); + SweeperCloudTaskModel.getInstance().setControllerStatusCallback(this); + SweeperCloudTaskModel.getInstance().setSweeperTaskCallback(this); } public void releaseListener() { - SweeperTaskModel.getInstance().setControllerStatusCallback(null); - SweeperTaskModel.getInstance().setSweeperTaskCallback(null); + SweeperCloudTaskModel.getInstance().setControllerStatusCallback(null); + SweeperCloudTaskModel.getInstance().setSweeperTaskCallback(null); CallerSweeperFutianCleanSystemListenerManager.INSTANCE.removeListener(TAG); } @@ -94,28 +94,28 @@ public class SweeperPresenter extends Presenter * @return */ public int getAutopilotState() { - return SweeperTaskModel.getInstance().getAutopilotState(); + return SweeperCloudTaskModel.getInstance().getAutopilotState(); } /** * 清除路线缓存数据 */ public void clearRouteList() { - SweeperTaskModel.getInstance().clearRouteList(); + SweeperCloudTaskModel.getInstance().clearRouteList(); } /** * 设置当前子任务信息 */ public void setSubtask(String subTaskId, SweeperTask.TaskModel subTaskType, int currentLineId) { - SweeperTaskModel.getInstance().setSubtask(subTaskId, subTaskType, currentLineId); + SweeperCloudTaskModel.getInstance().setSubtask(subTaskId, subTaskType, currentLineId); } /** * 判断是否有任务数据 */ public void isHasTaskInfo(boolean isHasTaskInfo) { - SweeperTaskModel.getInstance().isHasTaskInfo(isHasTaskInfo); + SweeperCloudTaskModel.getInstance().isHasTaskInfo(isHasTaskInfo); } /** @@ -123,14 +123,14 @@ public class SweeperPresenter extends Presenter * @param preLineId */ public void setPreLineId(int preLineId) { - SweeperTaskModel.getInstance().setPreLineId(preLineId); + SweeperCloudTaskModel.getInstance().setPreLineId(preLineId); } /** * 获取当前正在执行的任务 */ public void getCurrentTask() { - SweeperTaskModel.getInstance().getCurrentTask(); + SweeperCloudTaskModel.getInstance().getCurrentTask(); } /** @@ -140,7 +140,7 @@ public class SweeperPresenter extends Presenter * @param code */ public void sendSweeperStartTaskResp(String taskId, SweeperTask.StartTaskCode code) { - SweeperTaskModel.getInstance().sendSweeperStartTaskResp(taskId, code); + SweeperCloudTaskModel.getInstance().sendSweeperStartTaskResp(taskId, code); } /** @@ -151,7 +151,7 @@ public class SweeperPresenter extends Presenter * @param code */ public void sendSweeperTaskConfirmResp(String taskId, String subTaskId, SweeperTaskConfirm.TaskConfirmCode code) { - SweeperTaskModel.getInstance().sendSweeperTaskConfirmResp(taskId, subTaskId, code); + SweeperCloudTaskModel.getInstance().sendSweeperTaskConfirmResp(taskId, subTaskId, code); } /** @@ -161,7 +161,7 @@ public class SweeperPresenter extends Presenter * @param code */ public void sendSweeperStopTaskResp(String taskId, SweeperTaskStop.StopTaskCode code) { - SweeperTaskModel.getInstance().sendSweeperStopTaskResp(taskId, code); + SweeperCloudTaskModel.getInstance().sendSweeperStopTaskResp(taskId, code); } /** @@ -172,7 +172,7 @@ public class SweeperPresenter extends Presenter * @param lineId */ public void sendSweeperAutopilotBootable(String taskId, String subTaskId, long lineId) { - SweeperTaskModel.getInstance().sendSweeperAutopilotBootable(taskId, subTaskId, lineId); + SweeperCloudTaskModel.getInstance().sendSweeperAutopilotBootable(taskId, subTaskId, lineId); } /** @@ -181,7 +181,7 @@ public class SweeperPresenter extends Presenter * @param code */ public void sendSweeperSuspendResumeTaskResp(String taskId, SweeperTaskCloudSuspendResume.Code code) { - SweeperTaskModel.getInstance().sendSweeperSuspendResumeTaskResp(taskId, code); + SweeperCloudTaskModel.getInstance().sendSweeperSuspendResumeTaskResp(taskId, code); } @Override diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperCloudDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudDialog.kt similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperCloudDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudDialog.kt index 23deab9621..4f162f2956 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperCloudDialog.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.ui.dialog +package com.mogo.och.sweeper.cloud.ui.dialog import android.animation.ObjectAnimator import android.animation.ValueAnimator @@ -10,9 +10,8 @@ import android.widget.TextView import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.util.ClickUtils -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.callback.SweeperCloudDialogClickListener -import com.mogo.och.sweepercloud.view.CountDownView +import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.cloud.view.CountDownView /** * 清扫车云控任务dialog基类 @@ -115,7 +114,7 @@ import com.mogo.och.sweepercloud.view.CountDownView var middleStr: String = "" var rightStr: String = "" var countDownTime: Int = 0 - var listener: SweeperCloudDialogClickListener? = null + var listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener? = null fun build(context: Context): SweeperCloudDialog { return SweeperCloudDialog(this, context) } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperCloudLoadingDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudLoadingDialog.kt similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperCloudLoadingDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudLoadingDialog.kt index 3321382705..fcb1f3e94f 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperCloudLoadingDialog.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperCloudLoadingDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.ui.dialog +package com.mogo.och.sweeper.cloud.ui.dialog import android.animation.ObjectAnimator import android.content.Context @@ -7,7 +7,7 @@ import androidx.lifecycle.LifecycleObserver import com.elegant.utils.UiThreadHandler import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.sweepercloud.R +import com.mogo.och.sweeper.R import kotlinx.android.synthetic.main.dialog_sweeper_cloud_loading.* /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/AutopilotModeConfigManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/AutopilotModeConfigManager.java similarity index 99% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/AutopilotModeConfigManager.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/AutopilotModeConfigManager.java index f828af22a5..9bf022e5d2 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/AutopilotModeConfigManager.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/AutopilotModeConfigManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.util; +package com.mogo.och.sweeper.cloud.util; import android.os.Environment; import android.text.TextUtils; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt similarity index 83% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt index ef14a2ef6a..c759f2f649 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.util +package com.mogo.och.sweeper.cloud.util import android.content.Context import android.util.Log @@ -14,11 +14,8 @@ import com.mogo.map.overlay.point.Point import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.OCHThreadPoolManager import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.callback.SweeperCloudDialogClickListener -import com.mogo.och.sweepercloud.constant.SweeperConst -import com.mogo.och.sweepercloud.model.SweeperTaskModel -import com.mogo.och.sweepercloud.ui.dialog.SweeperCloudDialog +import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.cloud.model.SweeperCloudTaskModel import com.zhjt.mogo.adas.data.AiCloudTask import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon @@ -43,7 +40,7 @@ object SweeperCloudTaskUtils { // UiThreadHandler.getsUiHandler().postDelayed({ // mockSendCloudTaskInfo(MessageType.PadSendGetTaskReq) // },1000) - SweeperTaskModel.getInstance().getCurrentTask() + SweeperCloudTaskModel.getInstance().getCurrentTask() } /** @@ -150,7 +147,7 @@ object SweeperCloudTaskUtils { // subBuilder3.lineId = 126 // subBuilder3.lineName = "测试路线3" // builder.addSubList(subBuilder3.build()) - SweeperTaskModel.getInstance().onSweeperFutianCloudTask( + SweeperCloudTaskModel.getInstance().onSweeperFutianCloudTask( messageType, "${System.currentTimeMillis()}", System.currentTimeMillis(), @@ -171,7 +168,7 @@ object SweeperCloudTaskUtils { builder.sn = getDriverSn() builder.taskId = "10" builder.subTaskId = "1" - SweeperTaskModel.getInstance().onSweeperFutianCloudTaskConfirm( + SweeperCloudTaskModel.getInstance().onSweeperFutianCloudTaskConfirm( AiCloudTask.MessageType.CloudPushTaskConfirm, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -187,7 +184,7 @@ object SweeperCloudTaskUtils { builder.taskId = "10" builder.subTaskId = "1" builder.taskStatus = SweeperCommon.TaskStatus.RUNNING - SweeperTaskModel.getInstance().onSweeperFutianCloudTaskStatus( + SweeperCloudTaskModel.getInstance().onSweeperFutianCloudTaskStatus( AiCloudTask.MessageType.CloudPushTaskStatus, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -202,7 +199,7 @@ object SweeperCloudTaskUtils { builder.sn = getDriverSn() builder.taskId = "10" builder.type = SweeperTaskStop.StopTaskType.ADVANCE - SweeperTaskModel.getInstance().onSweeperFutianCloudTaskStop( + SweeperCloudTaskModel.getInstance().onSweeperFutianCloudTaskStop( AiCloudTask.MessageType.CloudPushTaskStop, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -218,7 +215,7 @@ object SweeperCloudTaskUtils { builder.taskId = "10" builder.taskStatus = SweeperCommon.TaskStatus.FINISHED builder.systemTime = System.currentTimeMillis() - SweeperTaskModel.getInstance().onSweeperFutianCloudBigTaskStatus( + SweeperCloudTaskModel.getInstance().onSweeperFutianCloudBigTaskStatus( AiCloudTask.MessageType.CloudPushBigTaskStatus, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -235,7 +232,7 @@ object SweeperCloudTaskUtils { builder.subTaskId = "1" builder.code = SweeperCommon.Code.SUCCEED UiThreadHandler.getsUiHandler().postDelayed({ - SweeperTaskModel.getInstance().onSweeperFutianCloudBootable( + SweeperCloudTaskModel.getInstance().onSweeperFutianCloudBootable( AiCloudTask.MessageType.PadSendBootable, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -251,7 +248,7 @@ object SweeperCloudTaskUtils { val setMapMarkerRunnable = Runnable { val builder = Point.Options.Builder( - SweeperConst.TYPE_MARKER_SWEEPER_SUBTASK_START_END, + com.mogo.och.sweeper.common.constant.SweeperConst.TYPE_MARKER_SWEEPER_SUBTASK_START_END, Level.MAP_MARKER ) .setId(uuid) @@ -277,7 +274,7 @@ object SweeperCloudTaskUtils { //开启线程移除起终点marker设置 val removeMapMarkerRunnable = Runnable { val overlayManager = CallerMapUIServiceManager.getOverlayManager() - overlayManager?.removeAllPointsInOwner(SweeperConst.TYPE_MARKER_SWEEPER_SUBTASK_START_END) + overlayManager?.removeAllPointsInOwner(com.mogo.och.sweeper.common.constant.SweeperConst.TYPE_MARKER_SWEEPER_SUBTASK_START_END) } OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable) } @@ -291,11 +288,11 @@ object SweeperCloudTaskUtils { */ @JvmStatic fun createReceivedBigTaskInfoDialog( - context: Context?, - listener: SweeperCloudDialogClickListener?, - taskInfo: TaskInfo - ): SweeperCloudDialog? { - val builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + context: Context?, + listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener?, + taskInfo: TaskInfo + ): com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog? { + val builder: com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder = com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder() val startCalendar = DateTimeUtil.formatLongToCalendar(taskInfo.taskStartTime) val endCalendar = DateTimeUtil.formatLongToCalendar(taskInfo.taskEndTime) builder.titleStr = "任务接取" @@ -320,11 +317,11 @@ object SweeperCloudTaskUtils { */ @JvmStatic fun createConfirmStartSubTaskDialog( - context: Context?, - listener: SweeperCloudDialogClickListener?, - subTaskInfo: SubTaskInfo - ): SweeperCloudDialog? { - val builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + context: Context?, + listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener?, + subTaskInfo: SubTaskInfo + ): com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog? { + val builder: com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder = com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder() builder.titleStr = "子任务确认" builder.contentStr = "请确认并执行子任务 ${subTaskInfo.subTaskName}" builder.tipStr = @@ -342,12 +339,12 @@ object SweeperCloudTaskUtils { */ @JvmStatic fun createSweeperTaskEndDialog( - context: Context?, - listener: SweeperCloudDialogClickListener?, - stopTaskType: SweeperTaskStop.StopTaskType, - timeoutStr: String - ): SweeperCloudDialog? { - val builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + context: Context?, + listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener?, + stopTaskType: SweeperTaskStop.StopTaskType, + timeoutStr: String + ): com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog? { + val builder: com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder = com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder() val titleStr = when (stopTaskType) { SweeperTaskStop.StopTaskType.ADVANCE -> "任务中止" SweeperTaskStop.StopTaskType.EXCEPTION -> "任务异常结束" @@ -385,9 +382,9 @@ object SweeperCloudTaskUtils { @JvmStatic fun createSweeperTaskNormalEndDialog( context: Context?, - listener: SweeperCloudDialogClickListener? - ): SweeperCloudDialog? { - val builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener? + ): com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog? { + val builder: com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder = com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder() builder.titleStr = "任务结束" builder.contentStr = "任务已完成，干的漂亮！" builder.tipStr = "" @@ -404,11 +401,11 @@ object SweeperCloudTaskUtils { */ @JvmStatic fun createSweeperTaskExceptionEndDialog( - context: Context?, - listener: SweeperCloudDialogClickListener?, - isCancel: Boolean - ): SweeperCloudDialog? { - val builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + context: Context?, + listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener?, + isCancel: Boolean + ): com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog? { + val builder: com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder = com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder() builder.titleStr = "任务结束" builder.contentStr = if (isCancel) "任务已取消！" else "任务已异常结束！" builder.tipStr = "" @@ -423,9 +420,9 @@ object SweeperCloudTaskUtils { @JvmStatic fun createSweeperTaskSuspendDialog( context: Context?, - listener: SweeperCloudDialogClickListener? - ): SweeperCloudDialog? { - val builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener? + ): com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog? { + val builder: com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder = com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder() builder.titleStr = "任务暂停" builder.contentStr = "云端暂停任务，注意车辆即将停车！" builder.tipStr = "【云端任务恢复前不可启动自动驾驶】" @@ -439,11 +436,11 @@ object SweeperCloudTaskUtils { @JvmStatic fun createSweeperTaskResumeDialog( - context: Context?, - listener: SweeperCloudDialogClickListener?, - contentStr: String - ): SweeperCloudDialog? { - val builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + context: Context?, + listener: com.mogo.och.sweeper.cloud.callback.SweeperCloudDialogClickListener?, + contentStr: String + ): com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog? { + val builder: com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder = com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog.Builder() builder.titleStr = "任务恢复" builder.contentStr = contentStr builder.tipStr = "【注意安全，坐稳扶好】" diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/CountDownView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/CountDownView.kt similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/CountDownView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/CountDownView.kt index 5790ef8072..1ead6fa62c 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/CountDownView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/CountDownView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view +package com.mogo.och.sweeper.cloud.view import android.content.Context import android.os.Handler diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/FontAdaptionTextView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/FontAdaptionTextView.java similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/FontAdaptionTextView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/FontAdaptionTextView.java index 816baff142..be546001e7 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/FontAdaptionTextView.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/FontAdaptionTextView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view; +package com.mogo.och.sweeper.cloud.view; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SubTaskView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SubTaskView.kt similarity index 89% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SubTaskView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SubTaskView.kt index 8f2b8709ec..31249d8fe5 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SubTaskView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SubTaskView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view +package com.mogo.och.sweeper.cloud.view import android.content.Context import android.graphics.Color @@ -6,11 +6,11 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.och.sweepercloud.R +import com.mogo.och.sweeper.R import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask.SubTaskInfo import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask.TaskModel -import kotlinx.android.synthetic.main.sweeper_subtask_view.view.* +import kotlinx.android.synthetic.main.sweeper_cloud_subtask_view.view.* /** * 子任务View @@ -24,7 +24,7 @@ class SubTaskView : ConstraintLayout { constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_subtask_view, this) + LayoutInflater.from(context).inflate(R.layout.sweeper_cloud_subtask_view, this) } /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudCurrentTaskInfoView.kt similarity index 89% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudCurrentTaskInfoView.kt index 3295ab76a0..36e4d3b7f0 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudCurrentTaskInfoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view +package com.mogo.och.sweeper.cloud.view import android.annotation.SuppressLint import android.content.Context @@ -10,23 +10,23 @@ import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.sweepercloud.R +import com.mogo.och.sweeper.R import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon.TaskStatus import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask.SubTaskInfo import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask.TaskInfo -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.currentSubTask -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.lastSubTask -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.preSubTask -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.tvStartAuto -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.tvTaskName -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.tvTaskState -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.tvTaskTime +import kotlinx.android.synthetic.main.sweeper_cloud_current_task_info.view.currentSubTask +import kotlinx.android.synthetic.main.sweeper_cloud_current_task_info.view.lastSubTask +import kotlinx.android.synthetic.main.sweeper_cloud_current_task_info.view.preSubTask +import kotlinx.android.synthetic.main.sweeper_cloud_current_task_info.view.tvStartAuto +import kotlinx.android.synthetic.main.sweeper_cloud_current_task_info.view.tvTaskName +import kotlinx.android.synthetic.main.sweeper_cloud_current_task_info.view.tvTaskState +import kotlinx.android.synthetic.main.sweeper_cloud_current_task_info.view.tvTaskTime /** * 清扫车当前任务信息展示 */ -class SweeperCurrentTaskInfoView : ConstraintLayout { +class SweeperCloudCurrentTaskInfoView : ConstraintLayout { private val TAG: String = "SweeperCurrentTaskInfoView" //当前任务操作菜单 @@ -53,7 +53,7 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { } private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_current_task_info, this) + LayoutInflater.from(context).inflate(R.layout.sweeper_cloud_current_task_info, this) updateTaskStateText(TaskStatus.TO_START) } @@ -116,7 +116,7 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { ) { // 更新 任务名称、任务时间 taskInfo?.apply { - this@SweeperCurrentTaskInfoView.listTask = subListList + this@SweeperCloudCurrentTaskInfoView.listTask = subListList tvTaskName.text = taskName val calendarStart = DateTimeUtil.formatLongToCalendar(taskStartTime) val calendarEnd = DateTimeUtil.formatLongToCalendar(taskEndTime) diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudTrafficDataView.kt similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudTrafficDataView.kt index 875b5ca82c..0a783ad174 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudTrafficDataView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view +package com.mogo.och.sweeper.cloud.view import android.annotation.SuppressLint import android.content.Context @@ -18,14 +18,14 @@ import com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.sweepercloud.R +import com.mogo.och.sweeper.R import planning.RoboSweeperTaskIndexOuterClass import kotlin.math.roundToInt /** * 车辆基本信息：方向盘下方的档位 转向灯 限速 速度 电量 水量 */ -class SweeperTrafficDataView : ConstraintLayout, +class SweeperCloudTrafficDataView : ConstraintLayout, IMoGoBatteryManagementSystemListener, IMoGoChassisLamplightListener, IMoGoChassisGearStateListener, @@ -64,7 +64,7 @@ class SweeperTrafficDataView : ConstraintLayout, constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_traffic_data, this) + LayoutInflater.from(context).inflate(R.layout.sweeper_cloud_traffic_data, this) tapPositionView = findViewById(R.id.sweeperTrafficPosition) speedImage = findViewById(R.id.sweeperSpeedImage) speedTextView = findViewById(R.id.sweeperSpeedText) diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudWorkModeView.kt similarity index 88% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudWorkModeView.kt index 08dd7f348c..80ef087ff8 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCloudWorkModeView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view +package com.mogo.och.sweeper.cloud.view import android.content.Context import android.util.AttributeSet @@ -9,18 +9,22 @@ import chassis.ChassisStatesOuterClass.SweeperFuTianTaskSystemStates import com.elegant.utils.UiThreadHandler import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback -import com.mogo.och.sweepercloud.constant.OperateStateEnum -import com.mogo.och.sweepercloud.ui.popwindow.SweeperOperatePanelPopWindow -import com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil +import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.common.constant.OperateStateEnum +import com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil +import com.mogo.och.sweeper.common.view.SweeperOperatePanelPopWindow import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask.TaskModel -import kotlinx.android.synthetic.main.sweeper_work_mode.view.* +import kotlinx.android.synthetic.main.sweeper_work_mode.view.groupWorkModelPanel +import kotlinx.android.synthetic.main.sweeper_work_mode.view.ivOpenOperatePanel +import kotlinx.android.synthetic.main.sweeper_work_mode.view.tvCleaningDirection +import kotlinx.android.synthetic.main.sweeper_work_mode.view.tvCleaningIntensity +import kotlinx.android.synthetic.main.sweeper_work_mode.view.tvCleaningMode +import kotlinx.android.synthetic.main.sweeper_work_mode.view.tvNoDataDesc /** * 清扫车模式信息展示 */ -class SweeperWorkModeView : ConstraintLayout,ICleaningModeStateCallback { +class SweeperCloudWorkModeView : ConstraintLayout { private var isSelectPureSweepMode: Boolean = false private val TAG = "SweeperWorkModeView" @@ -46,7 +50,7 @@ class SweeperWorkModeView : ConstraintLayout,ICleaningModeStateCallback { /** * 设置view */ - fun setTrafficDataView(trafficDataView: SweeperTrafficDataView){ + fun setTrafficDataView(trafficDataView: com.mogo.och.sweeper.cloud.view.SweeperCloudTrafficDataView){ //清扫模式选择面板打开关闭处理 ivOpenOperatePanel.setOnClickListener { if (mOperatePanelPopWindow?.isShowing != true) { @@ -126,7 +130,7 @@ class SweeperWorkModeView : ConstraintLayout,ICleaningModeStateCallback { } } - override fun cleaningModeState(operateState: OperateStateEnum, cleanSystemState: SweeperFuTianTaskSystemStates?, isSelectPureSweepMode: Boolean) { + fun cleaningModeState(operateState: OperateStateEnum, cleanSystemState: SweeperFuTianTaskSystemStates?, isSelectPureSweepMode: Boolean) { this.isSelectPureSweepMode = isSelectPureSweepMode this.operateState=operateState setShowOrHideCleanSystemState(operateState, cleanSystemState) diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/bean/SweeperRoutePlanningUpdateReqBean.java similarity index 93% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/bean/SweeperRoutePlanningUpdateReqBean.java index 32fcf73e48..3633d8530f 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/bean/SweeperRoutePlanningUpdateReqBean.java @@ -1,9 +1,7 @@ -package com.mogo.och.sweeper.bean; +package com.mogo.och.sweeper.common.bean; import java.io.Serializable; import java.util.ArrayList; -import java.util.List; - /** * Created by pangfan on 2021/8/19 * diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ICleaningModeStateCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ICleaningModeStateCallback.java similarity index 72% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ICleaningModeStateCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ICleaningModeStateCallback.java index 300a7300ad..e4c58f702a 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ICleaningModeStateCallback.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ICleaningModeStateCallback.java @@ -1,6 +1,6 @@ -package com.mogo.och.sweepercloud.callback; +package com.mogo.och.sweeper.common.callback; -import com.mogo.och.sweepercloud.constant.OperateStateEnum; +import com.mogo.och.sweeper.common.constant.OperateStateEnum; import chassis.ChassisStatesOuterClass; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperADASStatusCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperADASStatusCallback.java similarity index 83% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperADASStatusCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperADASStatusCallback.java index f8ce45d1a5..e36f419418 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperADASStatusCallback.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperADASStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.callback; +package com.mogo.och.sweeper.common.callback; /** * Created on 2021/9/8 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskDataToFragmentCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskDataToFragmentCallback.kt similarity index 73% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskDataToFragmentCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskDataToFragmentCallback.kt index 4e5badf48d..91eeb0a5fe 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskDataToFragmentCallback.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskDataToFragmentCallback.kt @@ -1,8 +1,8 @@ -package com.mogo.och.sweepercloud.callback +package com.mogo.och.sweeper.common.callback import com.amap.api.maps.model.LatLng -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweepercloud.database.bean.WeltDataBean +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean +import com.mogo.och.sweeper.common.database.bean.WeltDataBean import java.util.ArrayList interface ISweeperTaskDataToFragmentCallback { diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskRouteCallback.kt similarity index 55% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskRouteCallback.kt index 5711c8e6ab..bc00fe2628 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/ISweeperTaskRouteCallback.kt @@ -1,6 +1,6 @@ -package com.mogo.och.sweeper.callback +package com.mogo.och.sweeper.common.callback -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean import java.util.ArrayList interface ISweeperTaskRouteCallback { diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/IWeltMapSwitchToSmallCallback.kt similarity index 63% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/IWeltMapSwitchToSmallCallback.kt index 20748b003b..4f5497f4bd 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/callback/IWeltMapSwitchToSmallCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.callback +package com.mogo.och.sweeper.common.callback interface IWeltMapSwitchToSmallCallback { fun onWeltMapSwitchToSmall() diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/OperateStateEnum.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/OperateStateEnum.kt similarity index 86% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/OperateStateEnum.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/OperateStateEnum.kt index d757fee453..dda8adfbd5 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/OperateStateEnum.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/OperateStateEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.constant +package com.mogo.och.sweeper.common.constant /** * 上装面板操作状态 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt index 1c4f5891e8..d9127e8b6d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.constant +package com.mogo.och.sweeper.common.constant import com.mogo.commons.debug.DebugConfig diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/MyDataBase.java similarity index 84% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/MyDataBase.java index 69b363a9b8..1cbeb0a021 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/MyDataBase.java @@ -1,8 +1,8 @@ -package com.mogo.och.sweeper.database; +package com.mogo.och.sweeper.common.database; import com.mogo.commons.AbsMogoApplication; -import com.mogo.och.sweeper.database.bean.WeltDataBean; -import com.mogo.och.sweeper.database.dao.WeltDataDao; +import com.mogo.och.sweeper.common.database.dao.WeltDataDao; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; import androidx.room.Database; import androidx.room.Room; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/bean/WeltDataBean.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/bean/WeltDataBean.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/bean/WeltDataBean.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/bean/WeltDataBean.java index f6a3be84ee..c54f0f870f 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/bean/WeltDataBean.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/bean/WeltDataBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.database.bean; +package com.mogo.och.sweeper.common.database.bean; import java.io.Serializable; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/dao/WeltDataDao.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/dao/WeltDataDao.java similarity index 68% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/dao/WeltDataDao.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/dao/WeltDataDao.java index 4217b93d85..86c2a546dc 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/dao/WeltDataDao.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/database/dao/WeltDataDao.java @@ -1,7 +1,6 @@ -package com.mogo.och.sweepercloud.database.dao; +package com.mogo.och.sweeper.common.database.dao; -import com.mogo.och.sweepercloud.database.bean.WeltDataBean; -import com.mogo.och.sweepercloud.database.bean.WeltDataBean; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; import java.util.List; @@ -10,7 +9,7 @@ import androidx.room.Insert; import androidx.room.OnConflictStrategy; import androidx.room.Query; -import static com.mogo.och.sweepercloud.database.bean.WeltDataBean.WeltDataTable; +import static com.mogo.och.sweeper.common.database.bean.WeltDataBean.WeltDataTable; @Dao public interface WeltDataDao { diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/BaseSweeperUIFragment.java similarity index 96% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/BaseSweeperUIFragment.java index 3ee40b9134..7c3a6360fa 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/BaseSweeperUIFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.fragment; +package com.mogo.och.sweeper.common.fragment; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/SweeperAmapNaviFragment.java similarity index 97% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/SweeperAmapNaviFragment.java index b6439c35bd..7db003e127 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/SweeperAmapNaviFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.fragment; +package com.mogo.och.sweeper.common.fragment; import android.os.Bundle; import android.view.View; @@ -43,21 +43,21 @@ public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AM protected void initViews(Bundle savedInstanceState) { super.initViews(savedInstanceState); if (mAMapNaviView != null) - mAMapNaviView.onCreate(savedInstanceState); + mAMapNaviView.onCreate(savedInstanceState); } @Override public void onResume() { super.onResume(); if (mAMapNaviView != null) - mAMapNaviView.onResume(); + mAMapNaviView.onResume(); } @Override public void onPause() { super.onPause(); if (mAMapNaviView != null) - mAMapNaviView.onPause(); + mAMapNaviView.onPause(); } @Override diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/WeltMapOverViewFragment.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/WeltMapOverViewFragment.kt similarity index 76% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/WeltMapOverViewFragment.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/WeltMapOverViewFragment.kt index de471c94b8..7f73035010 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/WeltMapOverViewFragment.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/fragment/WeltMapOverViewFragment.kt @@ -1,13 +1,12 @@ -package com.mogo.och.sweepercloud.fragment +package com.mogo.och.sweeper.common.fragment import android.os.Bundle import com.amap.api.maps.model.LatLng import com.mogo.commons.mvp.BaseFragment -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweepercloud.callback.ISweeperTaskDataToFragmentCallback -import com.mogo.och.sweepercloud.callback.IWeltMapSwitchToSmallCallback -import com.mogo.och.sweepercloud.database.bean.WeltDataBean +import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.common.callback.ISweeperTaskDataToFragmentCallback +import com.mogo.och.sweeper.common.callback.IWeltMapSwitchToSmallCallback +import com.mogo.och.sweeper.common.database.bean.WeltDataBean import kotlinx.android.synthetic.main.fragment_welt_map_overview.* import kotlinx.android.synthetic.main.sweeper_welt_map_overview.* @@ -16,7 +15,6 @@ import kotlinx.android.synthetic.main.sweeper_welt_map_overview.* */ class WeltMapOverViewFragment : BaseFragment(), ISweeperTaskDataToFragmentCallback { private var mIWeltMapSwitchToSmallCallBack: IWeltMapSwitchToSmallCallback? = null - private var mFragment: SweeperFragment? = null override fun getLayoutId(): Int = R.layout.fragment_welt_map_overview override fun getTagName(): String { return "WeltMapOverViewFragment" @@ -28,10 +26,6 @@ class WeltMapOverViewFragment : BaseFragment(), ISweeperTaskDataToFragmentCallba fun setWeltMapSwitchToSmallCallBack(iWeltMapSwitchToSmallCallback: IWeltMapSwitchToSmallCallback){ this.mIWeltMapSwitchToSmallCallBack=iWeltMapSwitchToSmallCallback } - fun setSweeperFragment(fragment: SweeperFragment){ - this.mFragment=fragment - mFragment?.setTaskDataToFragmentCallback(this) - } override fun initViews(savedInstanceState: Bundle?) { super.initViews(savedInstanceState) weltMapOverView?.onCreateView(savedInstanceState) @@ -43,7 +37,7 @@ class WeltMapOverViewFragment : BaseFragment(), ISweeperTaskDataToFragmentCallba val latLngs = bundle.getSerializable("subTaskCoordinates") as? ArrayList val latLng = bundle.getParcelable("subTaskEndCoordinates") val weltDataList = bundle.getSerializable("weltDataList") as? ArrayList - val routeList = bundle.getSerializable("routeList") as? ArrayList + val routeList = bundle.getSerializable("routeList") as? ArrayList val progress = bundle.getString("progress") routeList?.let { weltMapOverView?.setRouteList(it) @@ -67,13 +61,12 @@ class WeltMapOverViewFragment : BaseFragment(), ISweeperTaskDataToFragmentCallba companion object { @JvmStatic fun newInstance( - mIWeltMapSwitchToSmallCallBack: IWeltMapSwitchToSmallCallback, - mCurrentTaskEndStation:LatLng?, - weltDataList: ArrayList?, - latLngs: ArrayList?, - routeList: ArrayList?, - progress:String?, - sweeperFragment: SweeperFragment + mIWeltMapSwitchToSmallCallBack: IWeltMapSwitchToSmallCallback, + mCurrentTaskEndStation:LatLng?, + weltDataList: ArrayList?, + latLngs: ArrayList?, + routeList: ArrayList?, + progress:String? ): WeltMapOverViewFragment { val args = Bundle() args.putSerializable("weltDataList", weltDataList) @@ -83,7 +76,6 @@ class WeltMapOverViewFragment : BaseFragment(), ISweeperTaskDataToFragmentCallba args.putString("progress", progress) val fragment = WeltMapOverViewFragment() fragment.setWeltMapSwitchToSmallCallBack(mIWeltMapSwitchToSmallCallBack) - fragment.setSweeperFragment(sweeperFragment) fragment.arguments = args return fragment } @@ -119,7 +111,7 @@ class WeltMapOverViewFragment : BaseFragment(), ISweeperTaskDataToFragmentCallba weltMapOverView?.setProgress(progress) } - override fun setRouteList(routeList: java.util.ArrayList) { + override fun setRouteList(routeList: java.util.ArrayList) { weltMapOverView?.setRouteList(routeList) } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/receiver/TestSweeperBroadcastReceiver.java similarity index 90% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/receiver/TestSweeperBroadcastReceiver.java index 2c990d55ea..9999ef70ba 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/receiver/TestSweeperBroadcastReceiver.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.receiver; +package com.mogo.och.sweeper.common.receiver; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; @@ -7,7 +7,7 @@ import android.content.Context; import android.content.Intent; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.common.constant.SweeperConst; /** * 测试小巴车的场景 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperAnalyticsManager.java similarity index 98% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperAnalyticsManager.java index 36d48211ad..5cde8aa5cd 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperAnalyticsManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.util; +package com.mogo.och.sweeper.common.util; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER; @@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.common.constant.SweeperConst; import java.util.HashMap; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperFutianCmdUtil.java similarity index 99% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperFutianCmdUtil.java index 35e2a0963b..e4eb7beaf6 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperFutianCmdUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.util; +package com.mogo.och.sweeper.common.util; import chassis.ChassisStatesOuterClass; import chassis.SpecialVehicleTaskCmdOuterClass; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperMapAssetStyleUtil.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperMapAssetStyleUtil.java similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperMapAssetStyleUtil.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperMapAssetStyleUtil.java index 57d39a354b..c8673b1186 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperMapAssetStyleUtil.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperMapAssetStyleUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.util; +package com.mogo.och.sweeper.common.util; import android.content.Context; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/LegendItemView.kt similarity index 96% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/LegendItemView.kt index 9a6e360b14..135c965a6b 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/LegendItemView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.common.view import android.content.Context import android.util.AttributeSet diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchConstraintLayout.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchConstraintLayout.java similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchConstraintLayout.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchConstraintLayout.java index 0e5714b7cf..3f83a34c23 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchConstraintLayout.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchConstraintLayout.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view; +package com.mogo.och.sweeper.common.view; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchFrameLayout.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchFrameLayout.java similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchFrameLayout.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchFrameLayout.java index 10ff08d760..6b1b052963 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/NoTouchFrameLayout.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/NoTouchFrameLayout.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view; +package com.mogo.och.sweeper.common.view; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperLimitingVelocityView.kt similarity index 98% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperLimitingVelocityView.kt index 17e414c40d..004f85e812 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperLimitingVelocityView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.common.view import android.content.Context import android.util.AttributeSet diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperManualDrivingDialog.kt similarity index 88% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperManualDrivingDialog.kt index 788f2965e6..cf843cdfde 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperManualDrivingDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.ui.dialog +package com.mogo.och.sweeper.common.view import android.content.Context import android.widget.TextView @@ -16,7 +16,7 @@ class SweeperManualDrivingDialog: BaseFloatDialog, LifecycleObserver { private var clickListener: ClickListener? = null - constructor(builder: Builder,context: Context) : super(context) { + constructor(builder: Builder, context: Context) : super(context) { commonTips?.text = builder.tipsStr commonConfirm?.text = builder.confirmStr } @@ -53,12 +53,12 @@ class SweeperManualDrivingDialog: BaseFloatDialog, LifecycleObserver { class Builder{ var tipsStr:String = "" var confirmStr:String = "" - fun tips(tips: String) : Builder{ + fun tips(tips: String) : Builder { this.tipsStr = tips return this } - fun confirmStr(commit: String) : Builder{ + fun confirmStr(commit: String) : Builder { this.confirmStr = commit return this } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperNoTitleCommonDialog.kt similarity index 88% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperNoTitleCommonDialog.kt index 57618ccb5f..525ff7a64f 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperNoTitleCommonDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.ui.dialog +package com.mogo.och.sweeper.common.view import android.content.Context import android.widget.TextView @@ -17,7 +17,7 @@ class SweeperNoTitleCommonDialog: BaseFloatDialog, LifecycleObserver { private var clickListener: ClickListener? = null - constructor(builder: Builder,context: Context) : super(context) { + constructor(builder: Builder, context: Context) : super(context) { commonTips?.text = builder.tipsStr commonCancel?.text = builder.cancelStr commonConfirm?.text = builder.confirmStr @@ -62,17 +62,17 @@ class SweeperNoTitleCommonDialog: BaseFloatDialog, LifecycleObserver { var tipsStr:String = "" var confirmStr:String = "" var cancelStr:String = "" - fun tips(tips: String) : Builder{ + fun tips(tips: String) : Builder { this.tipsStr = tips return this } - fun confirmStr(commit: String) : Builder{ + fun confirmStr(commit: String) : Builder { this.confirmStr = commit return this } - fun cancelStr(cancel: String) : Builder{ + fun cancelStr(cancel: String) : Builder { this.cancelStr = cancel return this } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperOperatePanelPopWindow.kt similarity index 87% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperOperatePanelPopWindow.kt index 1004555886..941d55237e 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperOperatePanelPopWindow.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.ui.popwindow +package com.mogo.och.sweeper.common.view import android.content.Context import android.graphics.Color @@ -8,9 +8,9 @@ import android.view.ViewGroup import android.widget.PopupWindow import chassis.ChassisStatesOuterClass import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.callback.ICleaningModeStateCallback -import com.mogo.och.sweeper.constant.OperateStateEnum -import com.mogo.och.sweeper.ui.SweeperOperatePanelView +import com.mogo.och.sweeper.common.callback.ICleaningModeStateCallback +import com.mogo.och.sweeper.common.constant.OperateStateEnum +import com.mogo.och.sweeper.common.view.SweeperOperatePanelView /** * 清扫车面板浮窗 diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperOperatePanelView.java similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperOperatePanelView.java index 741b9a9e6e..92d9ee1cc4 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperOperatePanelView.java @@ -1,14 +1,4 @@ -package com.mogo.och.sweepercloud.ui; - -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP; +package com.mogo.och.sweeper.common.view; import android.animation.ObjectAnimator; import android.content.Context; @@ -31,14 +21,11 @@ import androidx.annotation.Nullable; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.och.sweepercloud.R; -import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback; -import com.mogo.och.sweepercloud.constant.OperateStateEnum; -import com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil; -import com.mogo.och.sweepercloud.view.NoTouchConstraintLayout; -import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback; -import com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil; -import com.mogo.och.sweepercloud.view.NoTouchConstraintLayout; +import com.mogo.och.sweeper.common.callback.ICleaningModeStateCallback; +import com.mogo.och.sweeper.R; +import com.mogo.och.sweeper.common.constant.OperateStateEnum; +import com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil; +import com.mogo.och.sweeper.common.view.NoTouchConstraintLayout; import java.util.Arrays; import java.util.HashMap; @@ -47,11 +34,6 @@ import java.util.List; import chassis.ChassisStatesOuterClass; import chassis.SpecialVehicleTaskCmdOuterClass; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_CLOSE; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_MODE_CLOSE; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_WORK_CLOSE; -import static com.mogo.och.sweepercloud.util.SweeperFutianCmdUtil.CLEAN_WORK_OPEN; - /** * 清扫车操作面板View */ diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperTrafficLightView.kt similarity index 99% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperTrafficLightView.kt index 18ae4794f1..7687ee8b8c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/SweeperTrafficLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.common.view import android.content.Context import android.util.AttributeSet diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt similarity index 98% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt index 57394c2ce8..8c43d614a7 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.common.view import android.animation.AnimatorSet import android.animation.ObjectAnimator diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/VerticalDashLineView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/VerticalDashLineView.java similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/VerticalDashLineView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/VerticalDashLineView.java index bc6aae4605..354a552356 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/VerticalDashLineView.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/VerticalDashLineView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view; +package com.mogo.och.sweeper.common.view; import android.content.Context; import android.graphics.Canvas; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt similarity index 97% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt index 438b14b0e9..6d38771549 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltMapOverView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.common.view import android.content.Context import android.graphics.Color @@ -20,10 +20,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweeper.constant.SweeperConst -import com.mogo.och.sweeper.database.bean.WeltDataBean -import com.mogo.och.sweeper.util.SweeperMapAssetStyleUtil +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean +import com.mogo.och.sweeper.common.constant.SweeperConst +import com.mogo.och.sweeper.common.database.bean.WeltDataBean +import com.mogo.och.sweeper.common.util.SweeperMapAssetStyleUtil import kotlinx.android.synthetic.main.sweeper_welt_map_overview.view.* /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltSmallMapView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt similarity index 92% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltSmallMapView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt index 4db516bb7a..585be4077d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltSmallMapView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/WeltSmallMapView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.view +package com.mogo.och.sweeper.common.view import android.content.Context import android.graphics.Color @@ -19,11 +19,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweepercloud.constant.SweeperConst -import com.mogo.och.sweepercloud.database.bean.WeltDataBean -import com.mogo.och.sweepercloud.util.SweeperMapAssetStyleUtil +import com.mogo.och.sweeper.common.database.bean.WeltDataBean +import com.mogo.och.sweeper.R import kotlinx.android.synthetic.main.sweeper_welt_small_map_view.view.* @@ -120,8 +117,8 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { // 加载自定义样式 val customMapStyleOptions = CustomMapStyleOptions() .setEnable(true) - .setStyleData(SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) - .setStyleExtraData(SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) + .setStyleData(com.mogo.och.sweeper.common.util.SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) + .setStyleExtraData(com.mogo.och.sweeper.common.util.SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) // 设置自定义样式 mAMap?.setCustomMapStyle(customMapStyleOptions) mAMap?.setOnMapLoadedListener(AMap.OnMapLoadedListener { @@ -129,8 +126,8 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { // 加载自定义样式 val customMapStyleOptions = CustomMapStyleOptions() .setEnable(true) - .setStyleData(SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) - .setStyleExtraData(SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) + .setStyleData(com.mogo.och.sweeper.common.util.SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) + .setStyleExtraData(com.mogo.och.sweeper.common.util.SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) // 设置自定义样式 mAMap?.setCustomMapStyle(customMapStyleOptions) mAMap?.setPointToCenter(sweeperSmallTextureMapView.width / 2, sweeperSmallTextureMapView.height / 2) @@ -184,7 +181,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { } } - if (weltDataBean.weltDistance == SweeperConst.NONWELT) {//非贴边 + if (weltDataBean.weltDistance == com.mogo.och.sweeper.common.constant.SweeperConst.NONWELT) {//非贴边 colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) } else if (weltDataBean.weltDistance < 0) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) @@ -249,7 +246,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { /** * 设置任务轨迹数据 */ - fun setRouteList(routeList: ArrayList) { + fun setRouteList(routeList: ArrayList) { val routeCoordinatesLatLngs = mutableListOf() for (i in routeList.indices) { routeCoordinatesLatLngs.add(LatLng(routeList[i].latitude, routeList[i].longitude)) diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/BaseResponse.java similarity index 91% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/BaseResponse.java index d13c872662..43a9640793 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean; +package com.mogo.och.sweeper.operate.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt similarity index 85% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt index f0793a69a5..96f3d6c1da 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean +package com.mogo.och.sweeper.operate.bean import com.mogo.cloud.passport.MoGoAiCloudClientConfig diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperMainTaskBean.kt similarity index 84% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperMainTaskBean.kt index ccb548653a..caaf02f64c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperMainTaskBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean +package com.mogo.och.sweeper.operate.bean /** * diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskBean.kt similarity index 94% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskBean.kt index 63ce688454..2943999645 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean +package com.mogo.och.sweeper.operate.bean /** * 子任务信息 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskDetailBean.java similarity index 99% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskDetailBean.java index c21229a738..7ad893ff1f 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SweeperSubTaskDetailBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.bean; +package com.mogo.och.sweeper.operate.bean; public class SweeperSubTaskDetailBean { private int id; //子任务id diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperControllerStatusCallback.java similarity index 90% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperControllerStatusCallback.java index 7a831a7c0e..fa7f0f845c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.callback; +package com.mogo.och.sweeper.operate.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperOperateTaskCallback.kt similarity index 56% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperOperateTaskCallback.kt index 377eb91145..f2951e5401 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperOperateTaskCallback.kt @@ -1,27 +1,27 @@ -package com.mogo.och.sweeper.callback +package com.mogo.och.sweeper.operate.callback -import com.mogo.och.sweeper.bean.SweeperMainTaskBean -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweeper.bean.SweeperSubTaskBean -import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean -import com.mogo.och.sweeper.constant.SubTaskTypeEnum -import com.mogo.och.sweeper.constant.TaskStatusEnum +import com.mogo.och.sweeper.operate.bean.SweeperMainTaskBean +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskBean +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskDetailBean +import com.mogo.och.sweeper.operate.constant.SubTaskTypeEnum +import com.mogo.och.sweeper.operate.constant.TaskStatusEnum import java.util.ArrayList /** * @author: wangmingjun * @date: 2021/10/22 */ -interface ISweeperTaskCallback { +interface ISweeperOperateTaskCallback { /** * 获取主任务列表 */ - fun setMainTaskList(mainTaskBeanList: MutableList?,refresh:Boolean) + fun setMainTaskList(mainTaskBeanList: MutableList?, refresh:Boolean) /** * 获取子任务列表 */ - fun setSubTaskBean(subTaskBean: SweeperSubTaskBean,isWorkingSubTask:Boolean) + fun setSubTaskBean(subTaskBean: SweeperSubTaskBean, isWorkingSubTask:Boolean) /** * 更新子任务状态 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/SubTaskTypeEnum.kt similarity index 78% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/SubTaskTypeEnum.kt index 9946b8b2ef..a03c0db0d4 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/SubTaskTypeEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.constant +package com.mogo.och.sweeper.operate.constant /** * 任务类型 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/TaskStatusEnum.kt similarity index 85% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/TaskStatusEnum.kt index 5d9fd9839a..47483b65ce 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/constant/TaskStatusEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.constant +package com.mogo.och.sweeper.operate.constant /** * 当前任务操作菜单 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java similarity index 95% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java index cb8754febb..e25b0fa61a 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.fragment; +package com.mogo.och.sweeper.operate.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -29,12 +29,14 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.och.common.module.map.AmapNaviToDestinationModel; import com.mogo.och.sweeper.R; -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean; -import com.mogo.och.sweeper.callback.ISweeperTaskDataToFragmentCallback; -import com.mogo.och.sweeper.callback.IWeltMapSwitchToSmallCallback; -import com.mogo.och.sweeper.database.bean.WeltDataBean; -import com.mogo.och.sweeper.view.SweeperTrafficDataView; -import com.mogo.och.sweeper.view.WeltSmallMapView; +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean; +import com.mogo.och.sweeper.common.callback.ISweeperTaskDataToFragmentCallback; +import com.mogo.och.sweeper.common.callback.IWeltMapSwitchToSmallCallback; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; +import com.mogo.och.sweeper.common.fragment.SweeperAmapNaviFragment; +import com.mogo.och.sweeper.common.fragment.WeltMapOverViewFragment; +import com.mogo.och.sweeper.operate.view.SweeperOperateTrafficDataView; +import com.mogo.och.sweeper.common.view.WeltSmallMapView; import java.math.BigDecimal; import java.math.RoundingMode; @@ -52,7 +54,7 @@ import androidx.fragment.app.FragmentTransaction; * * @author tongchenfei */ -public abstract class BaseSweeperTabFragment> extends MvpFragment implements IMogoMapListener, +public abstract class BaseSweeperOperateTabFragment> extends MvpFragment implements IMogoMapListener, View.OnClickListener, IWeltMapSwitchToSmallCallback, View.OnTouchListener { private static final String TAG = "BaseSweeperTabFragment"; @@ -69,7 +71,7 @@ public abstract class BaseSweeperTabFragment(), MenuPopWindow.OnMenuItemOnClickListener { +class SweeperOperateFragment : BaseSweeperOperateTabFragment(), MenuPopWindow.OnMenuItemOnClickListener { companion object { const val TAG = "SweeperFragment" @@ -80,8 +83,8 @@ class SweeperFragment : BaseSweeperTabFragment * 清扫车任务管理 */ -public class SweeperTaskModel { - private final String TAG = SweeperTaskModel.class.getSimpleName(); - private static volatile SweeperTaskModel sInstance; +public class SweeperOperateTaskModel { + private final String TAG = SweeperOperateTaskModel.class.getSimpleName(); + private static volatile SweeperOperateTaskModel sInstance; public double mLongitude = 0; public double mLatitude = 0; private Context mContext; @@ -83,7 +83,7 @@ public class SweeperTaskModel { private static final int VEHICLE_TYPE = 10; private ISweeperControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等 private ISweeperADASStatusCallback mADASStatusCallback; - private ISweeperTaskCallback mSweeperTaskCallback; + private ISweeperOperateTaskCallback mSweeperTaskCallback; ArrayList points = new ArrayList<>();//全路径信息 //当前子任务详情信息包括轨迹文件信息 private SweeperSubTaskDetailBean mCurrentSubTaskDetail; @@ -105,18 +105,18 @@ public class SweeperTaskModel { //自动驾驶状态 private int mAutopilotState = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE; - public static SweeperTaskModel getInstance() { + public static SweeperOperateTaskModel getInstance() { if (sInstance == null) { - synchronized (SweeperTaskModel.class) { + synchronized (SweeperOperateTaskModel.class) { if (sInstance == null) { - sInstance = new SweeperTaskModel(); + sInstance = new SweeperOperateTaskModel(); } } } return sInstance; } - private SweeperTaskModel() { + private SweeperOperateTaskModel() { } @@ -183,7 +183,7 @@ public class SweeperTaskModel { this.mControllerStatusCallback = callback; } - public void setSweeperTaskCallback(ISweeperTaskCallback callback) { + public void setSweeperTaskCallback(ISweeperOperateTaskCallback callback) { this.mSweeperTaskCallback = callback; } @@ -538,7 +538,7 @@ public class SweeperTaskModel { * 获取当前正在执行的任务 */ public void getCurrentTask() { - SweeperServiceManager.getCurrentTask(mContext, new OchCommonServiceCallback>() { + SweeperOperateServiceManager.getCurrentTask(mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { CallerLogger.d(M_SWEEPER + TAG, "getCurrentTask：" + GsonUtil.jsonFromObject(data)); @@ -578,7 +578,7 @@ public class SweeperTaskModel { * 获取主任务列表 */ public void getMainTaskList(boolean refresh) { - SweeperServiceManager.getMainTaskList(mContext, new OchCommonServiceCallback>>() { + SweeperOperateServiceManager.getMainTaskList(mContext, new OchCommonServiceCallback>>() { @Override public void onSuccess(BaseResponse> data) { CallerLogger.d(M_SWEEPER + TAG, "getMainTaskList：" + GsonUtil.jsonFromObject(data)); @@ -614,7 +614,7 @@ public class SweeperTaskModel { * 获取子任务列表 */ public void getSubTaskList(int taskId, SweeperSubTaskBean sweeperSubTaskBean) { - SweeperServiceManager.getSubTaskList(taskId, mContext, new OchCommonServiceCallback>>() { + SweeperOperateServiceManager.getSubTaskList(taskId, mContext, new OchCommonServiceCallback>>() { @Override public void onSuccess(BaseResponse> data) { CallerLogger.d(M_SWEEPER + TAG, "getSubTaskList：" + GsonUtil.jsonFromObject(data)); @@ -655,7 +655,7 @@ public class SweeperTaskModel { * 获取子任务详情包括轨迹文件信息 */ public void getSubTaskDetail(boolean isFirst, boolean isEnd, int subTaskId, SubTaskTypeEnum subTaskType, boolean isStartSubtask) { - SweeperServiceManager.getSubTaskDetail(subTaskId, mContext, new OchCommonServiceCallback>() { + SweeperOperateServiceManager.getSubTaskDetail(subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { CallerLogger.d(M_SWEEPER + TAG, "getSubTaskDetail：" + GsonUtil.jsonFromObject(data)); @@ -714,7 +714,7 @@ public class SweeperTaskModel { * 子任务开始上报 */ public void subTaskStart(boolean isFirst, boolean isEnd, int subTaskId, SubTaskTypeEnum subTaskType) { - SweeperServiceManager.subTaskStart(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { + SweeperOperateServiceManager.subTaskStart(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { CallerLogger.d(M_SWEEPER + TAG, "subTaskStart：" + GsonUtil.jsonFromObject(data)); @@ -725,7 +725,7 @@ public class SweeperTaskModel { mSweeperTaskCallback.updateSubTaskStatus(TaskStatusEnum.START_SUBTASK, false); if (subTaskType == SubTaskTypeEnum.AUTOPILOT_SUBTYPE) {//如果是自动驾驶子任务子开启自驾 if (FunctionBuildConfig.isDemoMode) {//美化模式开启时 - SweeperTaskModel.getInstance().startBeautificationMode(); + SweeperOperateTaskModel.getInstance().startBeautificationMode(); } //ÏstartAutopilot(false); } else { @@ -764,7 +764,7 @@ public class SweeperTaskModel { * 子任务结束上报 */ public void subTaskEnd(boolean isFirst, boolean isEnd, int subTaskId) { - SweeperServiceManager.subTaskEnd(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { + SweeperOperateServiceManager.subTaskEnd(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { CallerLogger.d(M_SWEEPER + TAG, "subTaskEnd：" + @@ -777,7 +777,7 @@ public class SweeperTaskModel { } if (isEnd) { if (FunctionBuildConfig.isDemoMode) {//美化模式开启时 - SweeperTaskModel.getInstance().closeBeautificationMode(); + SweeperOperateTaskModel.getInstance().closeBeautificationMode(); } clearAutopilotControlParameters(); //结束自动驾驶 @@ -815,7 +815,7 @@ public class SweeperTaskModel { * 子任务跳过上报 */ public void subTaskSkip(boolean isFirst, boolean isEnd, int subTaskId) { - SweeperServiceManager.subTaskSkip(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { + SweeperOperateServiceManager.subTaskSkip(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { CallerLogger.d(M_SWEEPER + TAG, "subTaskSkip：" + @@ -856,7 +856,7 @@ public class SweeperTaskModel { * 主任务重置 */ public void mainTaskReset(int taskId) { - SweeperServiceManager.mainTaskReset(taskId, mContext, new OchCommonServiceCallback>() { + SweeperOperateServiceManager.mainTaskReset(taskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { CallerLogger.d(M_SWEEPER + TAG, "mainTaskReset：" + GsonUtil.jsonFromObject(data)); diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperOperateApiService.java similarity index 87% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperOperateApiService.java index 5522f00dae..ab78c8e5ed 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperOperateApiService.java @@ -1,10 +1,10 @@ -package com.mogo.och.sweeper.net; -import com.mogo.och.sweeper.bean.BaseResponse; -import com.mogo.och.sweeper.bean.SubInfo; -import com.mogo.och.sweeper.bean.SubStartRequest; -import com.mogo.och.sweeper.bean.SweeperSubTaskBean; -import com.mogo.och.sweeper.bean.SweeperMainTaskBean; -import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean; +package com.mogo.och.sweeper.operate.net; +import com.mogo.och.sweeper.operate.bean.BaseResponse; +import com.mogo.och.sweeper.operate.bean.SubInfo; +import com.mogo.och.sweeper.operate.bean.SubStartRequest; +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskBean; +import com.mogo.och.sweeper.operate.bean.SweeperMainTaskBean; +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskDetailBean; import java.util.List; import java.util.Map; @@ -21,7 +21,7 @@ import retrofit2.http.QueryMap; /** * 清扫车相关接口 */ -public interface ISweeperApiService { +public interface ISweeperOperateApiService { /** * 获取当前正在执行的任务 * @param appId diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperOperateServiceManager.kt similarity index 89% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperOperateServiceManager.kt index 7ded92408d..35882d1427 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperOperateServiceManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.net +package com.mogo.och.sweeper.operate.net import android.content.Context import com.elegant.network.utils.GsonUtil @@ -10,13 +10,18 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl import com.mogo.och.common.module.biz.network.interceptor.transformTry -import com.mogo.och.sweeper.bean.* -import com.mogo.och.sweeper.model.SweeperTaskModel +import com.mogo.och.sweeper.operate.model.SweeperOperateTaskModel +import com.mogo.och.sweeper.operate.bean.BaseResponse +import com.mogo.och.sweeper.operate.bean.SubInfo +import com.mogo.och.sweeper.operate.bean.SubStartRequest +import com.mogo.och.sweeper.operate.bean.SweeperMainTaskBean +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskBean +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskDetailBean -object SweeperServiceManager { - private val TAG = SweeperTaskModel::class.java.simpleName - private val mService: ISweeperApiService = MoGoRetrofitFactory.getInstance(OchCommonConst.getSweeperUrl()).create( - ISweeperApiService::class.java +object SweeperOperateServiceManager { + private val TAG = SweeperOperateTaskModel::class.java.simpleName + private val mService: ISweeperOperateApiService = MoGoRetrofitFactory.getInstance(OchCommonConst.getSweeperUrl()).create( + ISweeperOperateApiService::class.java ) /** diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java similarity index 78% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java index 1a2bf393d3..37ba82a05b 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.presenter; +package com.mogo.och.sweeper.operate.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER; @@ -23,23 +23,23 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager; import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil; import com.mogo.och.common.module.utils.NumberFormatUtil; -import com.mogo.och.sweeper.bean.SweeperMainTaskBean; -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean; -import com.mogo.och.sweeper.bean.SweeperSubTaskBean; -import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean; -import com.mogo.och.sweeper.callback.ISweeperADASStatusCallback; -import com.mogo.och.sweeper.callback.ISweeperControllerStatusCallback; -import com.mogo.och.sweeper.callback.ISweeperTaskCallback; -import com.mogo.och.sweeper.callback.ISweeperTaskRouteCallback; -import com.mogo.och.sweeper.constant.SubTaskTypeEnum; -import com.mogo.och.sweeper.constant.SweeperConst; -import com.mogo.och.sweeper.constant.TaskStatusEnum; -import com.mogo.och.sweeper.database.MyDataBase; -import com.mogo.och.sweeper.database.bean.WeltDataBean; -import com.mogo.och.sweeper.fragment.SweeperFragment; -import com.mogo.och.sweeper.model.SweeperTaskModel; -import com.mogo.och.sweeper.util.SweeperFutianCmdUtil; -import com.mogo.och.sweeper.util.SweeperTrajectoryManager; +import com.mogo.och.sweeper.operate.bean.SweeperMainTaskBean; +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean; +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskBean; +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskDetailBean; +import com.mogo.och.sweeper.common.callback.ISweeperADASStatusCallback; +import com.mogo.och.sweeper.operate.callback.ISweeperControllerStatusCallback; +import com.mogo.och.sweeper.operate.callback.ISweeperOperateTaskCallback; +import com.mogo.och.sweeper.common.callback.ISweeperTaskRouteCallback; +import com.mogo.och.sweeper.operate.constant.SubTaskTypeEnum; +import com.mogo.och.sweeper.common.constant.SweeperConst; +import com.mogo.och.sweeper.operate.constant.TaskStatusEnum; +import com.mogo.och.sweeper.common.database.MyDataBase; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; +import com.mogo.och.sweeper.operate.fragment.SweeperOperateFragment; +import com.mogo.och.sweeper.operate.model.SweeperOperateTaskModel; +import com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil; +import com.mogo.och.sweeper.operate.util.SweeperTrajectoryManager; import org.jetbrains.annotations.NotNull; @@ -60,9 +60,9 @@ import system_master.SystemStatusInfo; * * @author tongchenfei */ -public class SweeperPresenter extends Presenter +public class SweeperOperatePresenter extends Presenter implements IMoGoAutopilotStatusListener, ISweeperControllerStatusCallback, ISweeperADASStatusCallback, - IMoGoSweeperFutianCleanSystemListener, ISweeperTaskCallback, ISweeperTaskRouteCallback { + IMoGoSweeperFutianCleanSystemListener, ISweeperOperateTaskCallback, ISweeperTaskRouteCallback { private static final String TAG = "SweeperPresenter"; //当前子任务id @@ -80,13 +80,13 @@ public class SweeperPresenter extends Presenter private String longitude;//经度 private String latitude;//纬度 - public SweeperPresenter(SweeperFragment view) { + public SweeperOperatePresenter(SweeperOperateFragment view) { super(view); //2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口 CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this); //清扫车模式和贴边数据回调监听 CallerSweeperFutianCleanSystemListenerManager.INSTANCE.addListener(TAG, this); - SweeperTaskModel.getInstance().init(); + SweeperOperateTaskModel.getInstance().init(); OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp()); } @@ -99,20 +99,20 @@ public class SweeperPresenter extends Presenter @Override public void onDestroy(@NonNull LifecycleOwner owner) { super.onDestroy(owner); - SweeperTaskModel.getInstance().release(); + SweeperOperateTaskModel.getInstance().release(); releaseListener(); } public void initModelListener() { - SweeperTaskModel.getInstance().setControllerStatusCallback(this); - SweeperTaskModel.getInstance().setAdasStatusCallback(this); - SweeperTaskModel.getInstance().setSweeperTaskCallback(this); + SweeperOperateTaskModel.getInstance().setControllerStatusCallback(this); + SweeperOperateTaskModel.getInstance().setAdasStatusCallback(this); + SweeperOperateTaskModel.getInstance().setSweeperTaskCallback(this); } public void releaseListener() { - SweeperTaskModel.getInstance().setControllerStatusCallback(null); - SweeperTaskModel.getInstance().setAdasStatusCallback(null); - SweeperTaskModel.getInstance().setSweeperTaskCallback(null); + SweeperOperateTaskModel.getInstance().setControllerStatusCallback(null); + SweeperOperateTaskModel.getInstance().setAdasStatusCallback(null); + SweeperOperateTaskModel.getInstance().setSweeperTaskCallback(null); CallerSweeperFutianCleanSystemListenerManager.INSTANCE.removeListener(TAG); } @@ -126,34 +126,34 @@ public class SweeperPresenter extends Presenter @Override public void onAutopilotStatusResponse(int state) { - SweeperTaskModel.getInstance().setAutopilotState(state); + SweeperOperateTaskModel.getInstance().setAutopilotState(state); ThreadUtils.runOnUiThread(() -> mView.startAutoBtn(state)); switch (state) { case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE://不可自动驾驶 break; case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE://人工驾驶 - if (SweeperTaskModel.getInstance().getSubWorking()) { + if (SweeperOperateTaskModel.getInstance().getSubWorking()) { if (FunctionBuildConfig.isDemoMode) {//美化模式开启时 - SweeperTaskModel.getInstance().startBeautificationMode(); + SweeperOperateTaskModel.getInstance().startBeautificationMode(); } } else { if (FunctionBuildConfig.isDemoMode) {//美化模式开启时 //关闭美化模式 - SweeperTaskModel.getInstance().closeBeautificationMode(); + SweeperOperateTaskModel.getInstance().closeBeautificationMode(); } } break; case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING://自动驾驶中 - SweeperTaskModel.getInstance().triggerStartServiceEvent( - SweeperTaskModel.getInstance().isRestartAutopilot(), true); - if (SweeperTaskModel.getInstance().getSubWorking()) { + SweeperOperateTaskModel.getInstance().triggerStartServiceEvent( + SweeperOperateTaskModel.getInstance().isRestartAutopilot(), true); + if (SweeperOperateTaskModel.getInstance().getSubWorking()) { if (FunctionBuildConfig.isDemoMode) {//美化模式开启时 - SweeperTaskModel.getInstance().startBeautificationMode(); + SweeperOperateTaskModel.getInstance().startBeautificationMode(); } } break; case IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING://平行驾驶 - if (SweeperTaskModel.getInstance().getSubWorking()) { + if (SweeperOperateTaskModel.getInstance().getSubWorking()) { if (FunctionBuildConfig.isDemoMode) {//美化模式开启时 FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;//是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾 @@ -161,7 +161,7 @@ public class SweeperPresenter extends Presenter } else { if (FunctionBuildConfig.isDemoMode) {//美化模式开启时 //关闭美化模式 - SweeperTaskModel.getInstance().closeBeautificationMode(); + SweeperOperateTaskModel.getInstance().closeBeautificationMode(); } } break; @@ -191,10 +191,10 @@ public class SweeperPresenter extends Presenter * 清除路线缓存数据 */ public void clearRouteList(){ - SweeperTaskModel.getInstance().clearRouteList(); + SweeperOperateTaskModel.getInstance().clearRouteList(); } public void startAutopilot() { - SweeperTaskModel.getInstance().startAutopilot(); + SweeperOperateTaskModel.getInstance().startAutopilot(); } /** @@ -202,10 +202,10 @@ public class SweeperPresenter extends Presenter */ public void setSubtask(boolean isFirstSubtask, boolean isLastSubtask, int subTaskId,int subTaskType) { this.mSubTaskId = subTaskId; - SweeperTaskModel.getInstance().setSubtask(isFirstSubtask, isLastSubtask, subTaskId,subTaskType); + SweeperOperateTaskModel.getInstance().setSubtask(isFirstSubtask, isLastSubtask, subTaskId,subTaskType); } public void setWorking(boolean isWorking){ - SweeperTaskModel.getInstance().setWorking(isWorking); + SweeperOperateTaskModel.getInstance().setWorking(isWorking); } /** * 测试使用 @@ -236,7 +236,7 @@ public class SweeperPresenter extends Presenter @Override public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) { - SweeperTaskModel.getInstance().onArriveTaskEnd(arrivalNotification); + SweeperOperateTaskModel.getInstance().onArriveTaskEnd(arrivalNotification); } @Override @@ -248,7 +248,7 @@ public class SweeperPresenter extends Presenter } public void onArriveTaskEnd(@Nullable MessagePad.ArrivalNotification arrivalNotification) { - SweeperTaskModel.getInstance().onArriveTaskEnd(arrivalNotification); + SweeperOperateTaskModel.getInstance().onArriveTaskEnd(arrivalNotification); } @Override @@ -348,7 +348,7 @@ public class SweeperPresenter extends Presenter weltDataBean.setCleanMode(roboSweeperTaskIndex.getCleanMode()); weltDataBean.setCleanDirection(roboSweeperTaskIndex.getCleanDirection()); weltDataBean.setCleanIntensity(roboSweeperTaskIndex.getCleanIntensity()); - weltDataBean.setSubTaskId(mSubTaskId); + weltDataBean.setSubTaskId(String.valueOf(mSubTaskId)); MyDataBase.getInstance().getWeltDataDao().insert(weltDataBean); String distance; if (roboSweeperTaskIndex.getDistToRefEdgePoint() >= 1.0) {//大于等于1m @@ -370,28 +370,28 @@ public class SweeperPresenter extends Presenter * 获取当前正在执行的任务 */ public void getCurrentTask() { - SweeperTaskModel.getInstance().getCurrentTask(); + SweeperOperateTaskModel.getInstance().getCurrentTask(); } /** * 获取主任务列表 */ public void getMainTaskList(boolean refresh) { - SweeperTaskModel.getInstance().getMainTaskList(refresh); + SweeperOperateTaskModel.getInstance().getMainTaskList(refresh); } /** * 获取子任务列表 */ public void getSubTaskList(int taskId, SweeperSubTaskBean sweeperSubTaskBean) { - SweeperTaskModel.getInstance().getSubTaskList(taskId, sweeperSubTaskBean); + SweeperOperateTaskModel.getInstance().getSubTaskList(taskId, sweeperSubTaskBean); } /** * 获取子任务详情包括轨迹文件信息 */ public void getSubTaskDetail(boolean isFirst, boolean isEnd, int subTaskId, SubTaskTypeEnum subTaskType, boolean isStartSubtask) { - SweeperTaskModel.getInstance().getSubTaskDetail(isFirst, isEnd, subTaskId, subTaskType, isStartSubtask); + SweeperOperateTaskModel.getInstance().getSubTaskDetail(isFirst, isEnd, subTaskId, subTaskType, isStartSubtask); } /** @@ -399,7 +399,7 @@ public class SweeperPresenter extends Presenter */ public void startTask(boolean isFirst, boolean isEnd, int subTaskId, SubTaskTypeEnum subTaskType, int subTaskStatus) { if (SubTaskTypeEnum.AUTOPILOT_SUBTYPE.getCode() == subTaskStatus) { - SweeperTaskModel.getInstance().subTaskStart(isFirst, isEnd, subTaskId, subTaskType); + SweeperOperateTaskModel.getInstance().subTaskStart(isFirst, isEnd, subTaskId, subTaskType); } } @@ -407,21 +407,21 @@ public class SweeperPresenter extends Presenter * 子任务结束上报 */ public void subTaskEnd(boolean isFirst, boolean isEnd, int subTaskId) { - SweeperTaskModel.getInstance().subTaskEnd(isFirst, isEnd, subTaskId); + SweeperOperateTaskModel.getInstance().subTaskEnd(isFirst, isEnd, subTaskId); } /** * 子任务跳过上报 */ public void subTaskSkip(boolean isFirst, boolean isEnd, int subTaskId) { - SweeperTaskModel.getInstance().subTaskSkip(isFirst, isEnd, subTaskId); + SweeperOperateTaskModel.getInstance().subTaskSkip(isFirst, isEnd, subTaskId); } /** * 主任务重置 */ public void mainTaskReset(int taskId) { - SweeperTaskModel.getInstance().mainTaskReset(taskId); + SweeperOperateTaskModel.getInstance().mainTaskReset(taskId); } @Override diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt similarity index 92% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt index ef9aaa9a61..0798e21305 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.ui.adapter +package com.mogo.och.sweeper.operate.ui.adapter import android.graphics.Color import android.view.LayoutInflater @@ -9,7 +9,7 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SweeperMainTaskBean +import com.mogo.och.sweeper.operate.bean.SweeperMainTaskBean class TaskListAdapter() : RecyclerView.Adapter() { private var mItemClickListener: TaskItemClickListener? = null @@ -42,12 +42,12 @@ class TaskListAdapter() : RecyclerView.Adapter() notifyDataSetChanged() } interface TaskItemClickListener { - fun onItemClick(position: Int,mainTask:SweeperMainTaskBean) + fun onItemClick(position: Int,mainTask: SweeperMainTaskBean) } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TaskViewHolder { val view = LayoutInflater.from(parent.context).inflate( - R.layout.sweeper_item_task_info, parent, false + R.layout.sweeper_operate_item_task_info, parent, false ) return TaskViewHolder(view) } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt similarity index 88% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt index 1f2c5ad8f0..d6e8e16037 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.ui.popwindow +package com.mogo.och.sweeper.operate.ui.popwindow import android.content.Context import android.graphics.Color @@ -9,7 +9,7 @@ import android.view.ViewGroup.LayoutParams import android.widget.PopupWindow import android.widget.TextView import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.constant.TaskStatusEnum +import com.mogo.och.sweeper.operate.constant.TaskStatusEnum /** * 当前任务操作菜单栏 @@ -24,9 +24,9 @@ class MenuPopWindow : PopupWindow, View.OnClickListener{ private var mTvCancelTask: TextView? = null - private var mMenuItemClickListener:OnMenuItemOnClickListener?=null + private var mMenuItemClickListener: OnMenuItemOnClickListener?=null - constructor(context: Context,menuItemClickListener:OnMenuItemOnClickListener) : super(context) { + constructor(context: Context,menuItemClickListener: OnMenuItemOnClickListener) : super(context) { init(context) this.mMenuItemClickListener=menuItemClickListener } @@ -36,7 +36,7 @@ class MenuPopWindow : PopupWindow, View.OnClickListener{ */ private fun init(context: Context) { setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - var view: View = LayoutInflater.from(context).inflate(R.layout.sweeper_task_menu, null) + var view: View = LayoutInflater.from(context).inflate(R.layout.sweeper_operate_task_menu, null) mTvJumpOverTask = view.findViewById(R.id.tvJumpOverTask) mTaskJumpLineView = view.findViewById(R.id.taskJumpLineView) mTvEndTask = view.findViewById(R.id.tvEndTask) diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/util/SweeperTrajectoryManager.java similarity index 97% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/util/SweeperTrajectoryManager.java index 3c072d77bd..ac6b237f8f 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/util/SweeperTrajectoryManager.java @@ -1,11 +1,11 @@ -package com.mogo.och.sweeper.util; +package com.mogo.och.sweeper.operate.util; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; -import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean; -import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskDetailBean; +import com.mogo.och.sweeper.common.constant.SweeperConst; import java.util.concurrent.TimeUnit; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SlidePanelView.java similarity index 99% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SlidePanelView.java index f7171bce89..b9e86e6284 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SlidePanelView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view; +package com.mogo.och.sweeper.operate.view; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateCurrentTaskInfoView.kt similarity index 89% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateCurrentTaskInfoView.kt index 39fc24fd81..d15f3402fc 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateCurrentTaskInfoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.operate.view import android.content.Context import android.graphics.Color @@ -11,22 +11,22 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SubInfo -import com.mogo.och.sweeper.bean.SweeperSubTaskBean -import com.mogo.och.sweeper.constant.SubTaskTypeEnum -import com.mogo.och.sweeper.presenter.SweeperPresenter -import com.mogo.och.sweeper.ui.popwindow.MenuPopWindow -import kotlinx.android.synthetic.main.sweeper_current_task_info.view.* +import com.mogo.och.sweeper.operate.bean.SubInfo +import com.mogo.och.sweeper.operate.bean.SweeperSubTaskBean +import com.mogo.och.sweeper.operate.constant.SubTaskTypeEnum +import com.mogo.och.sweeper.operate.presenter.SweeperOperatePresenter +import com.mogo.och.sweeper.operate.ui.popwindow.MenuPopWindow +import kotlinx.android.synthetic.main.sweeper_operate_current_task_info.view.* /** * 清扫车当前任务信息展示 */ -class SweeperCurrentTaskInfoView : ConstraintLayout { +class SweeperOperateCurrentTaskInfoView : ConstraintLayout { private val TAG: String = "SweeperCurrentTaskInfoView" //当前任务操作菜单 private var mTaskMenuPopWindow: MenuPopWindow? = null - private var presenter: SweeperPresenter? = null + private var presenter: SweeperOperatePresenter? = null private var mCurrentPosition = 0 private var listTask: List? = null private var mSubTaskType: SubTaskTypeEnum = SubTaskTypeEnum.AUTOPILOT_SUBTYPE @@ -43,7 +43,7 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_current_task_info, this) + LayoutInflater.from(context).inflate(R.layout.sweeper_operate_current_task_info, this) setEnableClickBtn(false) tvStartAuto.setOnClickListener { if (ClickUtils.isFastClick()){//防止重复点击 @@ -51,7 +51,7 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { ToastUtils.showLong("任务未开始无轨迹，无法启动自驾") return@setOnClickListener } - if (mSubTaskType==SubTaskTypeEnum.MANUAL_DRIVING_SUBTYPE){ + if (mSubTaskType== SubTaskTypeEnum.MANUAL_DRIVING_SUBTYPE){ ToastUtils.showLong("人工子任务无轨迹，无法启动自驾") return@setOnClickListener } @@ -66,17 +66,17 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { * 设置当前任务数据 */ fun setData( - workModePanelView: SweeperWorkModeView, - subTaskBean: SweeperSubTaskBean?, - currentPosition: Int, - menuItemClickListener: MenuPopWindow.OnMenuItemOnClickListener, - presenter: SweeperPresenter? + workModePanelView: SweeperOperateWorkModeView, + subTaskBean: SweeperSubTaskBean?, + currentPosition: Int, + menuItemClickListener: MenuPopWindow.OnMenuItemOnClickListener, + presenter: SweeperOperatePresenter? ) { this.presenter = presenter this.mCurrentPosition = currentPosition mTaskMenuPopWindow = MenuPopWindow(context, menuItemClickListener) subTaskBean?.apply { - this@SweeperCurrentTaskInfoView.listTask = subList + this@SweeperOperateCurrentTaskInfoView.listTask = subList tvTaskName.text = taskName val calendar = DateTimeUtil.formatLongToCalendar(taskStartTime) tvTaskTime.text = DateTimeUtil.formatCalendarToString(calendar, DateTimeUtil.HH_mm) diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateSubTaskView.kt similarity index 86% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateSubTaskView.kt index a3d6374066..5b84d18f5c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateSubTaskView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.operate.view import android.content.Context import android.graphics.Color @@ -8,13 +8,13 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SubInfo -import kotlinx.android.synthetic.main.sweeper_subtask_view.view.* +import com.mogo.och.sweeper.operate.bean.SubInfo +import kotlinx.android.synthetic.main.sweeper_operate_subtask_view.view.* /** * 子任务View */ -class SubTaskView : ConstraintLayout { +class SweeperOperateSubTaskView : ConstraintLayout { constructor(context: Context) : super(context) {} constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { initView(context) @@ -24,7 +24,7 @@ class SubTaskView : ConstraintLayout { constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_subtask_view, this) + LayoutInflater.from(context).inflate(R.layout.sweeper_operate_subtask_view, this) } /** diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateTrafficDataView.kt similarity index 96% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateTrafficDataView.kt index 3482edfd7e..c11778b7ce 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateTrafficDataView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.operate.view import android.annotation.SuppressLint import android.content.Context @@ -22,13 +22,14 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.common.view.TurnSignalView import planning.RoboSweeperTaskIndexOuterClass import kotlin.math.roundToInt /** * 车辆基本信息：方向盘下方的档位 转向灯 限速 速度 电量 水量 */ -class SweeperTrafficDataView : ConstraintLayout, +class SweeperOperateTrafficDataView : ConstraintLayout, IMoGoBatteryManagementSystemListener, IMoGoChassisLamplightListener, IMoGoChassisGearStateListener, @@ -68,7 +69,7 @@ class SweeperTrafficDataView : ConstraintLayout, constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_traffic_data, this) + LayoutInflater.from(context).inflate(R.layout.sweeper_operate_traffic_data, this) tapPositionView = findViewById(R.id.sweeperTrafficPosition) speedImage = findViewById(R.id.sweeperSpeedImage) speedTextView = findViewById(R.id.sweeperSpeedText) diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateWorkModeView.kt similarity index 90% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt rename to OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateWorkModeView.kt index fae8cfd18f..6eace23aee 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/view/SweeperOperateWorkModeView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.view +package com.mogo.och.sweeper.operate.view import android.content.Context import android.util.AttributeSet @@ -10,25 +10,25 @@ import com.elegant.utils.UiThreadHandler import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.callback.ICleaningModeStateCallback -import com.mogo.och.sweeper.constant.OperateStateEnum -import com.mogo.och.sweeper.constant.SubTaskTypeEnum -import com.mogo.och.sweeper.ui.popwindow.SweeperOperatePanelPopWindow -import com.mogo.och.sweeper.util.SweeperFutianCmdUtil +import com.mogo.och.sweeper.common.callback.ICleaningModeStateCallback +import com.mogo.och.sweeper.common.constant.OperateStateEnum +import com.mogo.och.sweeper.operate.constant.SubTaskTypeEnum +import com.mogo.och.sweeper.common.view.SweeperOperatePanelPopWindow +import com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil import kotlinx.android.synthetic.main.sweeper_work_mode.view.* /** * 清扫车模式信息展示 */ -class SweeperWorkModeView : ConstraintLayout, - ICleaningModeStateCallback { +class SweeperOperateWorkModeView : ConstraintLayout, + ICleaningModeStateCallback { private var isSelectPureSweepMode: Boolean = false private val TAG = "SweeperWorkModeView" //清扫模式选择面板 private var mOperatePanelPopWindow: SweeperOperatePanelPopWindow? = null - private var operateState: OperateStateEnum=OperateStateEnum.SYNCING_STATUS + private var operateState: OperateStateEnum = OperateStateEnum.SYNCING_STATUS constructor(context: Context) : super(context) {} constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { @@ -47,7 +47,7 @@ class SweeperWorkModeView : ConstraintLayout, /** * 设置view */ - fun setTrafficDataView(trafficDataView: SweeperTrafficDataView){ + fun setTrafficDataView(trafficDataView: SweeperOperateTrafficDataView){ //清扫模式选择面板打开关闭处理 ivOpenOperatePanel.setOnClickListener { if (mOperatePanelPopWindow?.isShowing != true) { @@ -72,12 +72,12 @@ class SweeperWorkModeView : ConstraintLayout, fun setSweeperFutianCleanSystemState(taskType: SubTaskTypeEnum, cleanSystemState: SweeperFuTianTaskSystemStates?) { // TODO:传递清扫车底盘数据给上装面板 //mOperatePanelPopWindow?.setCleanSystemState(cleanSystemState, this@SweeperWorkModeView) - if (this.operateState.code==OperateStateEnum.STARTING_STATUS.code){ + if (this.operateState.code== OperateStateEnum.STARTING_STATUS.code){ return } //如果状态是同步中，在底盘首次回调时把状态强制修改成成功 - if (this.operateState.code==OperateStateEnum.SYNCING_STATUS.code){ - this.operateState=OperateStateEnum.SUCCESS_STATUS + if (this.operateState.code== OperateStateEnum.SYNCING_STATUS.code){ + this.operateState= OperateStateEnum.SUCCESS_STATUS d(SceneConstant.M_SWEEPER + TAG, "SystemState operateState："+operateState.code) } //清扫车暂未选择清扫模式或者任务类型是人工驾驶子任务，则暂无清扫模式 diff --git a/OCH/sweeper/sweeper-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/src/main/res/layout/dialog_sweeper_cloud_view.xml b/OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_cloud_view.xml similarity index 99% rename from OCH/sweeper/sweeper-cloud/src/main/res/layout/dialog_sweeper_cloud_view.xml rename to OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_cloud_view.xml index a0b0c6a17b..36e98fe190 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/dialog_sweeper_cloud_view.xml +++ b/OCH/sweeper/driver/src/main/res/layout/dialog_sweeper_cloud_view.xml @@ -29,7 +29,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - @@ -24,13 +24,13 @@ app:xOffset="0dp" app:yOffset="0dp" android:layout_marginTop="-20dp"> - \ No newline at end of file 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_operate.xml similarity index 95% 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_operate.xml index 5f11cfe729..bd43c86dcd 100644 --- a/OCH/sweeper/sweeper/src/main/res/layout/fragment_och_sweeper.xml +++ b/OCH/sweeper/driver/src/main/res/layout/fragment_och_sweeper_operate.xml @@ -9,7 +9,7 @@ app:layout_constraintBottom_toBottomOf="parent" android:orientation="vertical"> - - + tools:listitem="@layout/sweeper_operate_item_task_info" /> - \ No newline at end of file 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 86% 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 index e5655ea229..96124b138b 100644 --- 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 @@ -2,7 +2,7 @@ - diff --git a/OCH/sweeper/sweeper-cloud/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-cloud/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 98% 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 index c4498cbaaa..283719b8f2 100644 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml +++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml @@ -16,7 +16,7 @@ android:layout_height="match_parent" /> - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_subtask_view.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_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_operate_subtask_view.xml diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_task_menu.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_task_menu.xml similarity index 100% rename from OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_task_menu.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_operate_task_menu.xml diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_traffic_data.xml similarity index 97% rename from OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_operate_traffic_data.xml index 7c71a6b184..0aaabc8faa 100644 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml +++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_traffic_data.xml @@ -59,7 +59,7 @@ app:layout_constraintBottom_toBottomOf="@+id/sweeperTrafficPosition" android:layout_marginStart="@dimen/dp_12" android:background="#414869"/> - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/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-cloud/src/main/res/layout/sweeper_welt_map_overview.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_welt_map_overview.xml similarity index 93% rename from OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_welt_map_overview.xml rename to OCH/sweeper/driver/src/main/res/layout/sweeper_welt_map_overview.xml index e51070b285..1cdb54ec5d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_welt_map_overview.xml +++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_welt_map_overview.xml @@ -65,7 +65,7 @@ android:gravity="center" app:layout_constraintWidth_percent="0.7" android:visibility="gone"/> - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/IMogoOCH.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/IMogoOCH.java deleted file mode 100644 index 028cb07e56..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/IMogoOCH.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mogo.och.sweepercloud; - -import androidx.annotation.IdRes; -import androidx.fragment.app.FragmentActivity; - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; - -public -/** - * @author congtaowang - * @since 2021/1/15 - * - * 网约车抽象接口 - */ -interface IMogoOCH extends IMoGoFunctionProvider { - - /** - * 初始化网约车容器 - * - * @param activity - * @param containerId 容器ID - */ - void createCoverage(FragmentActivity activity, @IdRes int containerId); -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java deleted file mode 100644 index 503ee93ce0..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.mogo.och.sweepercloud; - - -import android.content.Context; - -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.sweepercloud.constant.SweeperConst; -import com.mogo.och.sweepercloud.fragment.SweeperFragment; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * 清扫车业务实现入口 - * - * @author tongchenfei - */ -@Route(path = SweeperConst.PATH) -public class SweeperProvider implements IMogoOCH { - - private static final String TAG = "SweeperProvider"; - - private SweeperFragment sweeperFragment; - private int containerId; - private FragmentActivity activity; - - @Override - public void init(Context context) { - } - private void showFragment() { - FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); - if (sweeperFragment == null) { - CallerLogger.d(TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG); - if (fragmentByTag instanceof SweeperFragment) { - sweeperFragment = (SweeperFragment) fragmentByTag; - } else { - sweeperFragment = new SweeperFragment(); - } - if(!sweeperFragment.isAdded()) { - supportFragmentManager.beginTransaction().add(containerId, sweeperFragment, sweeperFragment.TAG).commitAllowingStateLoss(); - } - return; - } - CallerLogger.d(TAG, "准备show fragment"); - supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss(); - } - private void hideFragment() { - if (sweeperFragment != null) { - CallerLogger.d(TAG, "准备hide fragment"); - activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss(); - } - - } - - @Override - public void createCoverage(FragmentActivity activity, int containerId) { - - } - - @NotNull - @Override - public String getFunctionName() { - return null; - } - - @Nullable - @Override - public Fragment createCoverage(@Nullable FragmentActivity fragmentActivity, @Nullable Integer integer) { - this.containerId = integer; - this.activity = fragmentActivity; - showFragment(); - return null; - } - - @Override - public void onDestroy() { - //若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠 - if (activity == null) return; - activity.finish(); - } -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperRoutePlanningUpdateReqBean.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperRoutePlanningUpdateReqBean.java deleted file mode 100644 index e2b10f7824..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/bean/SweeperRoutePlanningUpdateReqBean.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.mogo.och.sweepercloud.bean; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by pangfan on 2021/8/19 - * - * 订单状态更新请求数据结构 - */ -public class SweeperRoutePlanningUpdateReqBean implements Serializable { - public String sn; - public int lineId; - public int startSiteId; - public int endSiteId; - public ArrayList points; - - public static class Result implements Serializable{ - public Double latitude; - public Double longitude; - } - - public SweeperRoutePlanningUpdateReqBean(String sn, int lineId, int startSiteId - , int endSiteId, ArrayList points) { - this.sn = sn; - this.lineId = lineId; - this.startSiteId = startSiteId; - this.endSiteId = endSiteId; - this.points = points; - } -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskRouteCallback.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskRouteCallback.kt deleted file mode 100644 index 81f37c8a64..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperTaskRouteCallback.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.mogo.och.sweepercloud.callback - -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean -import java.util.ArrayList - -interface ISweeperTaskRouteCallback { - fun setRouteList(routeList:ArrayList) -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/MyDataBase.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/MyDataBase.java deleted file mode 100644 index 7d2cdb3e22..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/database/MyDataBase.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mogo.och.sweepercloud.database; - -import com.mogo.commons.AbsMogoApplication; -import com.mogo.och.sweepercloud.database.bean.WeltDataBean; -import com.mogo.och.sweepercloud.database.dao.WeltDataDao; -import com.mogo.och.sweepercloud.database.bean.WeltDataBean; -import com.mogo.och.sweepercloud.database.dao.WeltDataDao; - -import androidx.room.Database; -import androidx.room.Room; -import androidx.room.RoomDatabase; - -//注解Database告诉系统这是Room数据库对象 -//entities指定该数据库有哪些表，多张表就逗号分隔 -//version指定数据库版本号，升级时需要用到 -//数据库继承自RoomDatabase -@Database(entities = {WeltDataBean.class}, version = 1) -public abstract class MyDataBase extends RoomDatabase { - private static final String DATABASE_NAME = "weltData_db"; - - //结合单例模式完成数据库实例创建 - public static MyDataBase getInstance() { - return SingleTon.instance; - } - - private static class SingleTon { - private static final MyDataBase instance = - Room.databaseBuilder(AbsMogoApplication.getApp().getApplicationContext(), MyDataBase.class, DATABASE_NAME).build(); - } - public abstract WeltDataDao getWeltDataDao(); -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperUIFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperUIFragment.java deleted file mode 100644 index e220d1a777..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperUIFragment.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.mogo.och.sweepercloud.fragment; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; - -/** - * @author: wangmingjun - * @date: 2021/9/9 - */ -public abstract class BaseSweeperUIFragment extends Fragment { - private View mRootView; - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - if (mRootView == null) { - mRootView = inflater.inflate(getLayoutId(), container, false); - } else { - ViewGroup viewGroup = (ViewGroup) mRootView.getParent(); - if (viewGroup != null) { - viewGroup.removeView(mRootView); - } - } - initViews(mRootView); - initViews(savedInstanceState); - return mRootView; - } - /** - * 布局资源 - * - * @return - */ - protected abstract int getLayoutId(); - - protected abstract void initViews(View view); - - protected void initViews(Bundle savedInstanceState) { - } - - @Override - public void onDestroy() { - super.onDestroy(); - mRootView = null; - } -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java deleted file mode 100644 index 17213ac1d1..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.mogo.och.sweepercloud.fragment; - -import android.os.Bundle; -import android.view.View; - -import com.amap.api.navi.AMapNaviViewListener; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.common.module.map.AmapNaviToDestinationModel; -import com.mogo.och.common.module.map.CommonAmapNaviVIew; -import com.mogo.och.common.module.map.ICommonNaviChangedCallback; -import com.mogo.och.sweepercloud.R; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; - -/** - * @author: wangmingjun - * @date: 2021/11/30 - */ -public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AMapNaviViewListener { - - private CommonAmapNaviVIew mAMapNaviView; - private ICommonNaviChangedCallback mNaviToStartInfoCallback; - public static SweeperAmapNaviFragment newInstance() { - - Bundle args = new Bundle(); - - SweeperAmapNaviFragment fragment = new SweeperAmapNaviFragment(); - fragment.setArguments(args); - return fragment; - } - - @Override - protected int getLayoutId() { - return R.layout.sweeper_amap_navi_view; - } - - @Override - protected void initViews(View view) { - mAMapNaviView = view.findViewById(R.id.navi_view); - } - - @Override - protected void initViews(Bundle savedInstanceState) { - super.initViews(savedInstanceState); - if (mAMapNaviView != null) - mAMapNaviView.onCreate(savedInstanceState); - } - - @Override - public void onResume() { - super.onResume(); - if (mAMapNaviView != null) - mAMapNaviView.onResume(); - } - - @Override - public void onPause() { - super.onPause(); - if (mAMapNaviView != null) - mAMapNaviView.onPause(); - } - - @Override - public void onHiddenChanged(boolean hidden) { - super.onHiddenChanged(hidden); - if (hidden) { //不在最前端界面显示 - if (mAMapNaviView != null){ - mAMapNaviView.onPause(); - } - } else { //重新显示到最前端 - if (mAMapNaviView != null){ - mAMapNaviView.onResume(); - } - } - } - @Override - public void onDestroy() { - super.onDestroy(); - - AmapNaviToDestinationModel.getInstance(getContext()).setVoiceIsMute(false); - if (mAMapNaviView != null){ - mAMapNaviView.onDestroy(); - } - - if (mNaviToStartInfoCallback != null){ - mNaviToStartInfoCallback = null; - } - } - - @Override - public void onNaviSetting() { - //底部导航设置点击回调 - } - - @Override - public void onNaviCancel() { - } - - @Override - public void onNaviMapMode(int naviMode) { - //导航态车头模式，0:车头朝上状态；1:正北朝上模式。 - } - - @Override - public void onNaviTurnClick() { - //转弯view的点击回调 - } - - @Override - public void onNextRoadClick() { - //下一个道路View点击回调 - } - - - @Override - public void onScanViewButtonClick() { - //全览按钮点击回调 - } - - - @Override - public void onLockMap(boolean isLock) { - //锁地图状态发生变化时回调 - } - - @Override - public void onNaviViewLoaded() { - CallerLogger.d(M_TAXI + "wlx", "导航页面加载成功"); - CallerLogger.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); - } - - @Override - public void onMapTypeChanged(int i) { - - } - - @Override - public void onNaviViewShowMode(int i) { - - } - - @Override - public boolean onNaviBackClick() { - return false; - } - - /** - * 车道信息说明： - *

- * 0xFF, 无对应车道 - * 0, 直行 - * 1, 左转 - * 2, 直行+左转 - * 3, 右转 - * 4, 直行+右转 - * 5, 左掉头 - * 6, 左转+右转 - * 7, 直行+左转+右转 - * 8, 右掉头 - * 9, 直行+左掉头 - * 10, 直行+右掉头 - * 11, 左转+左掉头 - * 12, 右转+右掉头 - * 13, 直行+扩展 - * 14, 左转+左掉头+扩展 - * 15, 保留 - * 16, 直行+左转+左掉头 - * 17, 右转+左掉头 - * 18, 左转+右转+左掉头 - * 19, 直行+右转+左掉头 - * 20, 左转+右掉头 - * 21, 公交车道 - * 22, 空车道 - * 23 可变车道 - */ - - String[] array = { - "直行车道" - , "左转车道" - , "左转或直行车道" - , "右转车道" - , "右转或直行车道" - , "左掉头车道" - , "左转或者右转车道" - , " 左转或右转或直行车道" - , "右转掉头车道" - , "直行或左转掉头车道" - , "直行或右转掉头车道" - , "左转或左掉头车道" - , "右转或右掉头车道" - , "直行并且车道扩展" - , "左转+左掉头+扩展" - , "不可以选择该车道" - , "直行+左转+左掉头车道" - , "右转+左掉头" - , "左转+右转+左掉头" - , "直行+右转+左掉头" - , "左转+右掉头" - , "公交车道" - , "空车道" - , "可变车道" - }; - - String[] actions = { - "直行" - , "左转" - , "左转或直行" - , "右转" - , "右转或这行" - , "左掉头" - , "左转或者右转" - , " 左转或右转或直行" - , "右转掉头" - , "直行或左转掉头" - , "直行或右转掉头" - , "左转或左掉头" - , "右转或右掉头" - , "直行并且车道扩展" - , "左转+左掉头+扩展" - , "不可以选择" - , "直行+左转+左掉头" - , "右转+左掉头" - , "左转+右转+左掉头" - , "直行+右转+左掉头" - , "左转+右掉头" - , "公交车道" - , "空车道" - , "可变车道" - }; -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java deleted file mode 100644 index c18cc6ada5..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.mogo.och.sweepercloud.receiver; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.sweepercloud.constant.SweeperConst; - -/** - * 测试小巴车的场景 - * - * @author donghongyu - * @date 4/26/21 12:08 PM - */ -public class TestSweeperBroadcastReceiver extends BroadcastReceiver { - private static final String TAG = "TestBusBroadcastReceiver"; - - private Context mContext; - - @Override - public void onReceive(Context context, Intent intent) { - try { - this.mContext = context; - int sceneType = intent.getIntExtra(SweeperConst.BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); - - // 分发场景 - dispatchSceneTest(sceneType); - } catch (Exception e) { - e.printStackTrace(); - } - } - - private void dispatchSceneTest(int sceneType) { - - } - - -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt deleted file mode 100644 index 52e21df88c..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.mogo.och.sweepercloud.ui.dialog - -import android.content.Context -import android.widget.TextView -import androidx.lifecycle.LifecycleObserver -import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog -import com.mogo.och.sweepercloud.R - -/** - * 不带带有title, tip,confirm,cancel的dialog - */ -class SweeperManualDrivingDialog: BaseFloatDialog, LifecycleObserver { - - private var commonConfirm : TextView? = null - private var commonTips : TextView? = null - - private var clickListener: ClickListener? = null - - constructor(builder: Builder,context: Context) : super(context) { - commonTips?.text = builder.tipsStr - commonConfirm?.text = builder.confirmStr - } - - init{ - setContentView(R.layout.dialog_sweeper_manual_driving) - - setCanceledOnTouchOutside(false) - - commonConfirm = findViewById(R.id.sweeper_common_confirm) - commonTips = findViewById(R.id.sweeper_common_tips) - - commonConfirm?.setOnClickListener{ - clickListener?.confirm() - dismiss() - } - } - - fun setClickListener(clickListener: ClickListener) { - this.clickListener = clickListener - } - - fun showUpgradeDialog(){ - if(isShowing){ - return - } - show() - } - - interface ClickListener{ - fun confirm() - } - - class Builder{ - var tipsStr:String = "" - var confirmStr:String = "" - fun tips(tips: String) : Builder{ - this.tipsStr = tips - return this - } - - fun confirmStr(commit: String) : Builder{ - this.confirmStr = commit - return this - } - fun build(context: Context): SweeperManualDrivingDialog? { - return SweeperManualDrivingDialog(this,context) - } - } - -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt deleted file mode 100644 index a2b41f4592..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.mogo.och.sweepercloud.ui.dialog - -import android.content.Context -import android.widget.TextView -import androidx.lifecycle.LifecycleObserver -import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog -import com.mogo.och.sweepercloud.R - -/** - * 不带带有title, tip,confirm,cancel的dialog - */ -class SweeperNoTitleCommonDialog: BaseFloatDialog, LifecycleObserver { - - private var commonConfirm : TextView? = null - private var commonCancel : TextView? = null - private var commonTips : TextView? = null - - private var clickListener: ClickListener? = null - - constructor(builder: Builder,context: Context) : super(context) { - commonTips?.text = builder.tipsStr - commonCancel?.text = builder.cancelStr - commonConfirm?.text = builder.confirmStr - } - - init{ - setContentView(R.layout.dialog_sweeper_no_title) - - setCanceledOnTouchOutside(true) - - commonConfirm = findViewById(R.id.sweeper_common_confirm) - commonCancel = findViewById(R.id.sweeper_common_cancel) - commonTips = findViewById(R.id.sweeper_common_tips) - - commonConfirm?.setOnClickListener{ - clickListener?.confirm() - dismiss() - } - commonCancel?.setOnClickListener { - clickListener?.cancel() - dismiss() - } - } - - fun setClickListener(clickListener: ClickListener) { - this.clickListener = clickListener - } - - fun showUpgradeDialog(){ - if(isShowing){ - return - } - show() - } - - interface ClickListener{ - fun confirm() - fun cancel() - } - - class Builder{ - var tipsStr:String = "" - var confirmStr:String = "" - var cancelStr:String = "" - fun tips(tips: String) : Builder{ - this.tipsStr = tips - return this - } - - fun confirmStr(commit: String) : Builder{ - this.confirmStr = commit - return this - } - - fun cancelStr(cancel: String) : Builder{ - this.cancelStr = cancel - return this - } - - fun build(context: Context): SweeperNoTitleCommonDialog? { - return SweeperNoTitleCommonDialog(this,context) - } - } - -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt deleted file mode 100644 index 4db379e1ac..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.mogo.och.sweepercloud.ui.popwindow - -import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.PopupWindow -import chassis.ChassisStatesOuterClass -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback -import com.mogo.och.sweepercloud.constant.OperateStateEnum -import com.mogo.och.sweepercloud.ui.SweeperOperatePanelView - -/** - * 清扫车面板浮窗 - */ -class SweeperOperatePanelPopWindow : PopupWindow{ - - private var mOperatePanelView: SweeperOperatePanelView? = null - - constructor(context: Context) : super(context) { - init(context) - } - private fun init(context: Context) { - setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - mOperatePanelView = LayoutInflater.from(context).inflate(R.layout.sweeper_popwindow_operate_panel, null) as SweeperOperatePanelView? - width = ViewGroup.LayoutParams.WRAP_CONTENT - height = ViewGroup.LayoutParams.WRAP_CONTENT - contentView = mOperatePanelView - } - - /** - * 设置清扫模式数据 - */ - fun setCleanSystemState( - cleanSystemState: ChassisStatesOuterClass.SweeperFuTianTaskSystemStates?, - cleaningModeStateCallback: ICleaningModeStateCallback - ) { - mOperatePanelView?.setSweeperFutianCleanSystemState(cleanSystemState, cleaningModeStateCallback) - } - - /**. - * - * 设置是否让popWindow消失 - */ - fun setIsOutsideTouchable(isOutsideTouchable:Boolean){ - this.isFocusable = isOutsideTouchable - this.isOutsideTouchable = isOutsideTouchable - this.isTouchable=isOutsideTouchable - } - - /** - * 设置是否展示状态同步中 - */ - fun showSyncing(operateState: OperateStateEnum){ - mOperatePanelView?.showSyncing(operateState) - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java deleted file mode 100644 index dbee10c544..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.mogo.och.sweepercloud.util; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER; - -import android.os.Build; -import android.text.TextUtils; - -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.utils.MogoAnalyticUtils; -import com.mogo.eagle.core.data.app.AppConfigInfo; -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.util.DateTimeUtils; -import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.sweepercloud.constant.SweeperConst; - -import java.util.HashMap; - -/** - * OCH sweeper埋点工具 - * - * Created on 2022/3/24 - */ -public class SweeperAnalyticsManager { - - private static final class SingletonHolder { - private static final SweeperAnalyticsManager INSTANCE = new SweeperAnalyticsManager(); - } - - public static SweeperAnalyticsManager getInstance() { - return SweeperAnalyticsManager.SingletonHolder.INSTANCE; - } - - private String mStartAutopilotKey; - private HashMap mStartAutopilotParams = new HashMap<>(); - - private Runnable startAutopilotRunnable = () -> { - // 15s内未开启，上报失败埋点 - triggerStartAutopilotFailureEvent("", "15s后app等待超时"); - }; - - public void triggerStartAutopilotFailureEventByAdas(String failCode, String failMsg){ - removeWaitingCallback(); - triggerStartAutopilotFailureEvent(failCode, failMsg); - } - - private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ - if (mStartAutopilotParams.isEmpty()) return; - - CallerLogger.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); - - if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() != - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_FAILURE_CODE, failCode); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_FAILURE_MSG, failMsg); - } - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT - , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); - - MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); - - clearStartAutopilotParams();//清空参数数据，防止误传 - } - - private void removeWaitingCallback() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - if (startAutopilotRunnable != null) { - UiThreadHandler.removeCallbacks(startAutopilotRunnable); - } - } - } - - public void clearStartAutopilotFailureMSG(){ - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_FAILURE_CODE, ""); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_FAILURE_MSG, ""); - } - - private void clearStartAutopilotParams(){ - mStartAutopilotParams.clear(); - } - - /** - * 触发'开启自动驾驶'埋点流程 - * 开启自动驾驶，15s内成功则发送成功埋点，否则发送失败埋点 - * @param restart false（点击'滑动出发'启动）/true（接管后点击'自动驾驶'按钮启动） - * @param send 是否直接发送埋点（15s内开启成功则直接发送成功埋点） - */ - public void triggerStartAutopilotEvent( - boolean restart, boolean send, String startName, String endName, int lineId) { - mStartAutopilotKey = restart ? - SweeperConst.EVENT_KEY_RESTART_AUTOPILOT : SweeperConst.EVENT_KEY_START_SERVICE; - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); - String dateTime = DateTimeUtils.getTimeText( - System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); - - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_SN, sn); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_ENV_ONLINE, - DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE ? true : false); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_TIME, dateTime); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_NAME, startName); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_END_NAME, endName); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_LINE_ID, lineId); - - if (send) { - if (mStartAutopilotParams.isEmpty()) return; - // 开启成功，上报埋点 - clearStartAutopilotFailureMSG(); - removeWaitingCallback(); - mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT, true); - MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); - - clearStartAutopilotParams();//清空参数数据，防止误传 - } else { - UiThreadHandler.postDelayed(startAutopilotRunnable, SweeperConst.LOOP_PERIOD_15S); - } - } - - /** - * 触发"无法开启自驾已知异常"埋点 - * @param startName - * @param endName - * @param lineId - */ - public void triggerUnableStartAPReasonEvent(String startName, String endName, int lineId, - String reason) { - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); - String dateTime = DateTimeUtils.getTimeText( - System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); - - HashMap params = new HashMap<>(); - - params.put(SweeperConst.EVENT_PARAM_SN, sn); - params.put(SweeperConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); - params.put(SweeperConst.EVENT_PARAM_ENV_ONLINE, - DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE ? true : false); - params.put(SweeperConst.EVENT_PARAM_TIME, dateTime); - params.put(SweeperConst.EVENT_PARAM_START_NAME, startName); - params.put(SweeperConst.EVENT_PARAM_END_NAME, endName); - params.put(SweeperConst.EVENT_PARAM_LINE_ID, lineId); - params.put(SweeperConst.EVENT_PARAM_UNABLE_START_REASON, reason); - MogoAnalyticUtils.INSTANCE.track(SweeperConst.EVENT_KEY_AP_UNABLE_START_REASON, params); - } -} diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/LegendItemView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/LegendItemView.kt deleted file mode 100644 index b5598dce04..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/LegendItemView.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.mogo.och.sweepercloud.view - -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.widget.LinearLayout -import com.mogo.och.sweepercloud.R -import kotlinx.android.synthetic.main.sweeper_item_legend.view.* - -/** - * 任务路线全览图图例 - */ -class LegendItemView:LinearLayout { - constructor(context: Context) : super(context) {} - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { - initView(context) - } - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {} - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} - - private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_item_legend, this) - } - - /** - * 设置数据 - */ - fun setData(resId:Int,text:String){ - sweeperLegendIcon.setImageResource(resId) - sweeperLegendText.text = text - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperLimitingVelocityView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperLimitingVelocityView.kt deleted file mode 100644 index f7c2dff777..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperLimitingVelocityView.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.mogo.och.sweepercloud.view - -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.widget.LinearLayout -import com.mogo.eagle.core.data.enums.DataSourceType -import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener -import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.LimitingVelocityView_TAG -import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListener -import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager -import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.sweepercloud.R -import kotlinx.android.synthetic.main.sweeper_limiting_speed.view.* - -class SweeperLimitingVelocityView( - context: Context, - attrs: AttributeSet? = null, -) : LinearLayout(context, attrs), ILimitingVelocityListener, IViewControlListener { - - companion object { - private const val TAG = "SweeperLimitingVelocityView" - } - - init { - LayoutInflater.from(context).inflate(R.layout.sweeper_limiting_speed, this, true) - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - CallerLimitingVelocityListenerManager.addListener(TAG, this) - CallerHmiViewControlListenerManager.addListener(LimitingVelocityView_TAG, this) - } - - override fun onLimitingVelocityChange(limitingVelocity: Int, sourceType: DataSourceType) { - ThreadUtils.runOnUiThread { - if (limitingVelocity > 0) { - this.visibility = View.VISIBLE - tvLimitingVelocity.text = "$limitingVelocity" - } else { - this.visibility = View.GONE - } - } - } - - override fun visible(v: Int) { - super.visible(v) - this.visibility = v - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - CallerLimitingVelocityListenerManager.removeListener(TAG) - CallerHmiViewControlListenerManager.removeListener(LimitingVelocityView_TAG) - } - -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt deleted file mode 100644 index 96a5af1933..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt +++ /dev/null @@ -1,148 +0,0 @@ -package com.mogo.och.sweepercloud.view - -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.widget.LinearLayout -import com.mogo.eagle.core.data.enums.DataSourceType -import com.mogo.eagle.core.data.enums.TrafficLightEnum -import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener -import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.sweepercloud.R -import kotlinx.android.synthetic.main.sweeper_traffic_light_view.view.* - -/** - * 清扫车：红绿灯view- - * - * Created on 2022/3/29 - */ -class SweeperTrafficLightView @JvmOverloads constructor( - context: Context?, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr), IMoGoTrafficLightListener { - - companion object { - private const val TAG = "SweeperTrafficLightView" - } - - private var mCurrentLightId = TrafficLightEnum.BLACK - - init { - init(context) - } - - private fun init(context: Context?) { - LayoutInflater.from(context).inflate(R.layout.sweeper_traffic_light_view, this, true) - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - CallerTrafficLightListenerManager.addListener(TAG, this) - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - CallerTrafficLightListenerManager.removeListener(TAG) - } - - /** - * 展示红绿灯预警 - * - * @param checkLightId 0-都是默认，1-红，2-黄，3-绿 - * @param lightSource 1:云端下发；2:自车感知 - */ - override fun showTrafficLight(checkLightId: TrafficLightEnum, lightSource: DataSourceType) { - mCurrentLightId = checkLightId - updateTrafficLightIcon(checkLightId) - CallerLogger.d(SceneConstant.M_SWEEPER + TAG,"灯态类型："+checkLightId.name +" 灯态来源："+DataSourceType.getName(lightSource)) - } - - /** - * 关闭红绿灯预警展示，并重制灯态 - */ - override fun disableTrafficLight() { - UiThreadHandler.post { - mCurrentLightId = TrafficLightEnum.BLACK - sweeper_traffic_light_iv.setImageResource(R.drawable.sweeper_light_gay_nor) - sweeper_traffic_light_time_tv.text = "" - this@SweeperTrafficLightView.visibility = VISIBLE - CallerLogger.d(SceneConstant.M_SWEEPER + TAG,"灯态类型：disableTrafficLight") - } - } - - /** - * @param redNum 红灯倒计时 - * @param yellowNum 黄灯倒计时 - * @param greenNum 绿灯倒计时 - */ - override fun changeCountdownTrafficLightNum(redNum: Int, yellowNum: Int, greenNum: Int) { - when (mCurrentLightId) { - TrafficLightEnum.RED -> changeCountdownRed(redNum) - TrafficLightEnum.YELLOW -> changeCountdownYellow(yellowNum) - TrafficLightEnum.GREEN -> changeCountdownGreen(greenNum) - else -> UiThreadHandler.post { sweeper_traffic_light_time_tv.text = "" } - } - } - - override fun changeCountdownRed(redNum: Int) { - UiThreadHandler.post { - if (redNum > 0) { - sweeper_traffic_light_time_tv.text = redNum.toString() - } else { - sweeper_traffic_light_time_tv.text = "" - } - } - } - - override fun changeCountdownGreen(greenNum: Int) { - UiThreadHandler.post { - if (greenNum > 0) { - sweeper_traffic_light_time_tv.text = greenNum.toString() - } else { - sweeper_traffic_light_time_tv.text = "" - } - } - } - - override fun changeCountdownYellow(yellowNum: Int) { - UiThreadHandler.post { - if (yellowNum > 0) { - sweeper_traffic_light_time_tv.text = yellowNum.toString() - } else { - sweeper_traffic_light_time_tv.text = "" - } - } - } - - /** - * 更新红绿灯icon - * - * @param lightId 0-都是默认，1-红，2-黄，3-绿 - */ - private fun updateTrafficLightIcon(lightId: TrafficLightEnum) { - UiThreadHandler.post { - when (lightId) { - TrafficLightEnum.RED -> { - sweeper_traffic_light_iv.setImageResource(R.drawable.sweeper_light_red_nor) - this@SweeperTrafficLightView.visibility = VISIBLE - } - TrafficLightEnum.YELLOW -> { - sweeper_traffic_light_iv.setImageResource(R.drawable.sweeper_lightyellow_nor) - this@SweeperTrafficLightView.visibility = VISIBLE - } - TrafficLightEnum.GREEN -> { - sweeper_traffic_light_iv.setImageResource(R.drawable.sweeper_light_green_nor) - this@SweeperTrafficLightView.visibility = VISIBLE - } - else -> { - sweeper_traffic_light_iv.setImageResource(R.drawable.sweeper_light_gay_nor) - this@SweeperTrafficLightView.visibility = VISIBLE - } - } - } - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/TurnSignalView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/TurnSignalView.kt deleted file mode 100644 index 59bbe0788d..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/TurnSignalView.kt +++ /dev/null @@ -1,90 +0,0 @@ -package com.mogo.och.sweepercloud.view - -import android.animation.AnimatorSet -import android.animation.ObjectAnimator -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.widget.ImageView -import android.widget.LinearLayout -import chassis.Chassis -import com.mogo.och.sweepercloud.R -import kotlinx.android.synthetic.main.sweeper_turn_signal.view.* -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch - -class TurnSignalView : LinearLayout { - constructor(context: Context?) : super(context) {} - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { - initView(context) - } - - private var init: Boolean = false - - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super( - context, - attrs, - defStyleAttr - ) { - } - - constructor( - context: Context?, - attrs: AttributeSet?, - defStyleAttr: Int, - defStyleRes: Int - ) : super(context, attrs, defStyleAttr, defStyleRes) { - } - - private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_turn_signal, this) - init = true - } - - /** - * 转向灯动画 - */ - fun setTurnLight(directionLight: Chassis.LightSwitch?) { - GlobalScope.launch(Dispatchers.Main) { - if (!init) { - return@launch - } - //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 - when (directionLight) { - Chassis.LightSwitch.LIGHT_LEFT -> { //左转向 - leftSelectImage.visibility = View.VISIBLE - rightSelectImage.visibility = View.GONE - rightSelectImage.clearAnimation() - setAnimation(leftSelectImage) - } - Chassis.LightSwitch.LIGHT_RIGHT -> { //右转向 - leftSelectImage.visibility = View.GONE - rightSelectImage.visibility = View.VISIBLE - leftSelectImage.clearAnimation() - setAnimation(rightSelectImage) - } - else -> { //消失 - leftSelectImage.clearAnimation() - rightSelectImage.clearAnimation() - leftSelectImage.visibility = View.GONE - rightSelectImage.visibility = View.GONE - } - } - } - } - - //实现图片闪烁效果 - private fun setAnimation(imageView: ImageView) { - val animationSet = AnimatorSet() - val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) - val valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) - valueAnimator.duration = 1000 - valueAnimatorDisappare.duration = 800 - valueAnimator.repeatCount = -1 - valueAnimatorDisappare.repeatCount = -1 - animationSet.playTogether(valueAnimatorDisappare, valueAnimator) - animationSet.start() - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltMapOverView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltMapOverView.kt deleted file mode 100644 index 5f157e0d67..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/WeltMapOverView.kt +++ /dev/null @@ -1,342 +0,0 @@ -package com.mogo.och.sweepercloud.view - -import android.content.Context -import android.graphics.Color -import android.os.Bundle -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.widget.ImageView -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.ContextCompat -import com.amap.api.maps.AMap -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener -import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.CoordinateUtils -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweepercloud.constant.SweeperConst -import com.mogo.och.sweepercloud.database.bean.WeltDataBean -import com.mogo.och.sweepercloud.util.SweeperMapAssetStyleUtil -import kotlinx.android.synthetic.main.sweeper_welt_map_overview.view.* - - -/** - * 作业任务全览图 - */ -class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { - private var mTaskCoordinatesLatLng: MutableList = mutableListOf() //当前大任务的所有起终点集合 - private var mCarMarker: Marker? = null - private var mAMap: AMap? = null - private var mWeltPolylines: Polyline? = null - private var mRoutePolylines: Polyline?=null -// private val mLineMarkers: MutableList = mutableListOf() - private var mEndStationMarker: Marker? = null - private var mFirst: Boolean = false - - //清扫车任务地图 - private val TAG = "WeltMapOverView" - - constructor(context: Context) : super(context) {} - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { - initView(context) - } - - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {} - - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} - - private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_welt_map_overview, this) - initAMapView() - // 注册定位监听 - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this) - CallerChassisLocationGCJ02ListenerManager.setListenerHz(TAG,5) - } - - private fun initAMapView() { - mAMap = sweeperTextureMapView.map - // 地图文字标注 - mAMap?.showMapText(true) - //显示3D建筑物 - mAMap?.showBuildings(true) - // 设置导航地图模式，aMap是地图控制器对象。 - mAMap?.mapType = AMap.MAP_TYPE_NIGHT - // 关闭显示实时路况图层，aMap是地图控制器对象。 - mAMap?.isTrafficEnabled = false - // 设置 锚点 图标 - mCarMarker = mAMap?.addMarker( - MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_car_big)) - .anchor(0.5f, 0.5f) - ) - // 设置地图的样式 - val uiSettings = mAMap?.uiSettings - uiSettings?.isZoomControlsEnabled = false // 地图缩放级别的交换按钮 - uiSettings?.setAllGesturesEnabled(false) // 所有手势 - uiSettings?.isMyLocationButtonEnabled = false // 显示默认的定位按钮 - uiSettings?.setLogoBottomMargin(-150) //设置Logo下边界距离屏幕底部的边距,设置为负值即可 - // 加载自定义样式 - val customMapStyleOptions = CustomMapStyleOptions() - .setEnable(true) - .setStyleData(SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) - .setStyleExtraData(SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) - // 设置自定义样式 - mAMap?.setCustomMapStyle(customMapStyleOptions) - //mAMap?.moveCamera(CameraUpdateFactory.zoomTo(15f)) - mAMap?.setOnMapLoadedListener(AMap.OnMapLoadedListener { - //mAMap?.moveCamera(CameraUpdateFactory.zoomTo(15f)) - CallerLogger.d(SceneConstant.M_SWEEPER + TAG, "WeltView---onMapLoaded") - // 加载自定义样式 - val customMapStyleOptions = CustomMapStyleOptions() - .setEnable(true) - .setStyleData(SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) - .setStyleExtraData(SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) - // 设置自定义样式 - mAMap?.setCustomMapStyle(customMapStyleOptions) - // 实时路况图层关闭，必须添加在loaded结束之后,其他位置不生效 - mAMap?.isTrafficEnabled = false - mAMap?.showBuildings(true) - }) - } - - /** - * 添加画线颜色值 - */ - private fun getRouteColorList(weltData: MutableList):MutableList { - val colorList= mutableListOf() - var nextWeltDataBean:WeltDataBean?=null - for (i in weltData.indices) { - val weltDataBean = weltData[i] - if(i+110){ - colorList.add(Color.TRANSPARENT) - continue - } - } - if (weltDataBean.weltDistance == SweeperConst.NONWELT) {//非贴边 - colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) - } else if (weltDataBean.weltDistance < 0) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) - } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.1) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4)) - } else if (weltDataBean.weltDistance >= 0.1 && weltDataBean.weltDistance < 0.2) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d)) - } else if (weltDataBean.weltDistance >= 0.2) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b)) - } - } - return colorList - } - - override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { - ThreadUtils.getSinglePool().run { - mogoLocation?.let { gnssInfo -> - val currentLatLng = LatLng(gnssInfo.latitude, gnssInfo.longitude) - //更新车辆位置 - mCarMarker?.rotateAngle = (360 - gnssInfo.heading).toFloat() - mCarMarker?.position = currentLatLng - mCarMarker?.setToTop() - //圈定地图显示范围 - val boundsBuilder = LatLngBounds.Builder() - if (mTaskCoordinatesLatLng.size > 0) { - //存放经纬度 - for (i in mTaskCoordinatesLatLng.indices) { - val latLng = mTaskCoordinatesLatLng[i] - boundsBuilder.include(latLng) - } - } - mRoutePolylines?.points?.forEach {latLng-> - boundsBuilder.include(latLng) - } - boundsBuilder.include(currentLatLng) - mAMap?.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(), 100, 100, 100, 100)) - - } - } - } - - /** - * 根据贴边数据绘制任务路线 - */ - fun drawablePolyline(weltDatas: MutableList?) { - weltDatas?.let { - val colorList=getRouteColorList(it) - val coordinatesLatLngs= mutableListOf() - for (i in it.indices) { - coordinatesLatLngs.add(LatLng(it[i].locLat,it[i].locLon)) - } - if (coordinatesLatLngs.size > 2) { - //设置线段纹理 - mWeltPolylines?.remove() - val polylineOptions = PolylineOptions() - polylineOptions.addAll(coordinatesLatLngs) - polylineOptions.width(14f) //线段宽度 - polylineOptions.isUseTexture = false - polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare) - polylineOptions.colorValues(colorList) - polylineOptions.visible(true) - // 绘制线 - mWeltPolylines = mAMap?.addPolyline(polylineOptions) - } - } - } - - /** - * 绘制起点和终点的marker - */ - private fun drawStartAndEndMarker(startPoint: LatLng, endPoint: LatLng) { -// val startMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_start_maker_icon))) -// startMarker?.position = startPoint -// mLineMarkers.add(startMarker) -// val endMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_end_maker_icon))) -// endMarker?.position = endPoint -// mLineMarkers.add(endMarker) - } - - private fun drawEndMarker(endPoint: LatLng){ - mEndStationMarker?.remove() - mEndStationMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_end_maker_icon))) - mEndStationMarker?.position = endPoint - } - - /** - * 清除所有标记和路线 - */ - fun clearAllMarkerAndPolyline() { -// for (i in mLineMarkers.indices) { -// mLineMarkers[i]?.isVisible = false -// mLineMarkers[i]?.remove() -// } - mEndStationMarker?.remove() - mWeltPolylines?.remove() - mRoutePolylines?.remove() -// mLineMarkers.clear() - //mFirst = false - //showOrHiddenLegendData(false) - } - - /** - * 设置贴边数据 - */ - fun setWeltData(weltDatas: MutableList?, isWeltData: Boolean, distance: String?) { - drawablePolyline(weltDatas) - ThreadUtils.runOnUiThread { - distance?.let { - setDistance(it) - } - } - //if (!mFirst && isWeltData) { - // mFirst = true - // showOrHiddenLegendData(true) - //} - } - - /** - * 任务轨迹数据 - */ - fun setRouteList(routeList: ArrayList) { - val routeCoordinatesLatLngs= mutableListOf() - for (i in routeList.indices) { - routeCoordinatesLatLngs.add(LatLng(routeList[i].latitude,routeList[i].longitude)) - } - ThreadUtils.runOnUiThread { - drawRouteListPolyline(routeCoordinatesLatLngs) - } - } - - private fun drawRouteListPolyline(routeList: MutableList) { - mRoutePolylines?.remove() - val polylineOptions = PolylineOptions() - polylineOptions.width(14f) //线段宽度 - polylineOptions.isUseTexture = false - polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare) - polylineOptions.color(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) - polylineOptions.addAll(routeList) - polylineOptions.visible(true) - mRoutePolylines=mAMap?.addPolyline(polylineOptions) - } - - /** - * 设置当前大任务的所有子任务起终点集合 - */ - fun setTaskListCoordinatesLatLng(coordinatesLatLng: MutableList) { - ThreadUtils.runOnUiThread { - this.mTaskCoordinatesLatLng = coordinatesLatLng - if (mTaskCoordinatesLatLng.size > 0) { - drawStartAndEndMarker(mTaskCoordinatesLatLng[0], mTaskCoordinatesLatLng[mTaskCoordinatesLatLng.size - 1]) - } - } - } - /** - * 设置当前任务终点 - */ - fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) { - ThreadUtils.runOnUiThread { - drawEndMarker(coordinatesLatLng) - } - } - - /** - * 设置图例数据 - */ - private fun showOrHiddenLegendData(isShow: Boolean) { - groupLegend.visibility = if (isShow) View.VISIBLE else View.GONE - sweeperLegend1.setData(R.drawable.sweeper_legend1, "a<0") - sweeperLegend2.setData(R.drawable.sweeper_legend2, "0≤a<10") - sweeperLegend3.setData(R.drawable.sweeper_legend3, "10≤a<20") - sweeperLegend4.setData(R.drawable.sweeper_legend4, "a≥20") - sweeperLegend5.setData(R.drawable.sweeper_legend5, "非贴边") - sweeperLegend6.setData(R.drawable.sweeper_legend6, "未经过") - } - - private fun setDistance(distance: String) { - taskWeltDistanceTv.text="贴边:${distance}" - } - - fun setProgress(progress: String?) { - progress?.let { - if ("0" == progress) { - taskProgressTv.visibility = View.GONE - taskWeltDistanceTv.visibility = View.GONE - showOrHiddenLegendData(false) - } else { - taskProgressTv.visibility = View.VISIBLE - taskWeltDistanceTv.visibility = View.VISIBLE - taskProgressTv.text = it - showOrHiddenLegendData(true) - } - } - } - fun onCreateView(savedInstanceState: Bundle?) { - sweeperTextureMapView.onCreate(savedInstanceState) - } - - fun onResume() { - sweeperTextureMapView.onResume() - } - - fun onPause() { - sweeperTextureMapView.onPause() - } - - fun onDestroy() { - sweeperTextureMapView.onDestroy() - } - - fun getSweeperSwitchToSmall(): ImageView { - return sweeperSwitchToSmall - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/bg_shape_left_bottom_round.xml b/OCH/sweeper/sweeper-cloud/src/main/res/drawable/bg_shape_left_bottom_round.xml deleted file mode 100644 index 5d247295b3..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/bg_shape_left_bottom_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/bg_shape_welt_panel.xml b/OCH/sweeper/sweeper-cloud/src/main/res/drawable/bg_shape_welt_panel.xml deleted file mode 100644 index a6c900aa78..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/bg_shape_welt_panel.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/fragment_welt_map_overview.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/fragment_welt_map_overview.xml deleted file mode 100644 index b59e5e23eb..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/fragment_welt_map_overview.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml deleted file mode 100644 index 037aee6855..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_popwindow_operate_panel.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/values/colors.xml b/OCH/sweeper/sweeper-cloud/src/main/res/values/colors.xml deleted file mode 100644 index 6701ff7dec..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/res/values/colors.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - #FF1FA7FF - #FFFFFFFF - #FFFFFFFF - #FF51649D - #7F8299EB - - #51649D - #427d8e - #1FA7FF - #3FC281 - #427d8e - #3FC281 - - #FFFFFF - #99FFFFFF - #FF52BBFF - - #BF30334C - #fff - #f1f1f1 - - #7DE261 - #FF2B2B - #E3BC59 - #FFF - #256BFF - #FFFFFF - - #DB3137 - #3E77F6 - #323C6F - - #19FFFFFF - #FFFFFF - - #FFFFA28B - #FFDA1100 - #FF60FFD3 - #FF006D43 - #FFFFE198 - #FFFF9B00 - - #7DE261 - #f00 - #BF30334C - #548DB8 - #1FA7FF - #3769B5 - #BF30334C - - - #C22101 - - #4DFFA4 - - #FFDD4D - - #FF912B - - #236299 - - #3BA1CC - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/.gitignore b/OCH/sweeper/sweeper/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/OCH/sweeper/sweeper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/OCH/sweeper/sweeper/build.gradle b/OCH/sweeper/sweeper/build.gradle deleted file mode 100644 index 499a56f6dc..0000000000 --- a/OCH/sweeper/sweeper/build.gradle +++ /dev/null @@ -1,67 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - // buildToolsVersion rootProject.ext.android.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - - javaCompileOptions { - annotationProcessorOptions { - arguments = [AROUTER_MODULE_NAME: project.getName(),"room.schemaLocation": "$projectDir/schemas".toString()] - } - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - abortOnError false - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - debug { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation rootProject.ext.dependencies.kotlinstdlib - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.arouter - annotationProcessor rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.amapnavi3dmap - - implementation rootProject.ext.dependencies.rxjava - implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.androidxrecyclerview - implementation rootProject.ext.dependencies.androidxcardview - implementation rootProject.ext.dependencies.androidxroomruntime - annotationProcessor rootProject.ext.dependencies.androidxroomcompiler - - implementation project(":OCH:mogo-och-common-module") - compileOnly project(":libraries:mogo-map") - -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/sweeper/sweeper/gradle.properties b/OCH/sweeper/sweeper/gradle.properties deleted file mode 100644 index 6153f2df71..0000000000 --- a/OCH/sweeper/sweeper/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.och -POM_ARTIFACT_ID=och-sweeper -VERSION_CODE=1 diff --git a/OCH/sweeper/sweeper/proguard-rules.pro b/OCH/sweeper/sweeper/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/OCH/sweeper/sweeper/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt b/OCH/sweeper/sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt deleted file mode 100644 index ccebc3709a..0000000000 --- a/OCH/sweeper/sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.mogo.och.sweeper - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.mogo.och.sweeper", appContext.packageName) - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/assets/map_style.data b/OCH/sweeper/sweeper/src/main/assets/map_style.data deleted file mode 100644 index b200669659..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/assets/map_style.data and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/assets/map_style_extra.data b/OCH/sweeper/sweeper/src/main/assets/map_style_extra.data deleted file mode 100644 index 7aa8fa7b45..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/assets/map_style_extra.data and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java deleted file mode 100644 index df0ed8bc1d..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mogo.och.sweeper.callback; - -import com.mogo.och.sweeper.constant.OperateStateEnum; - -import chassis.ChassisStatesOuterClass; - -/** - * 上装状态回调 - */ -public interface ICleaningModeStateCallback { - void cleaningModeState(OperateStateEnum cleaningModeState, ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState,boolean isSelectPureSweepMode); -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java deleted file mode 100644 index 995e1723af..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.mogo.och.sweeper.callback; - -/** - * Created on 2021/9/8 - * - * Model->Presenter回调：ADAS相关（自动驾驶状态回调，到达终点等等） - */ -public interface ISweeperADASStatusCallback { - //自驾返回失败 - void onStartAdasFailure(); -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt deleted file mode 100644 index 2677042385..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.och.sweeper.callback - -import com.amap.api.maps.model.LatLng -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweeper.database.bean.WeltDataBean -import java.util.ArrayList - -interface ISweeperTaskDataToFragmentCallback { - fun setRouteList(routeList: ArrayList) - fun setWeltData(weltDatas: ArrayList?, distance: String) - fun clearAllMarkerAndPolyline() - fun setProgress(progress:String) - fun setTaskListCoordinatesLatLng(coordinatesLatLng: ArrayList) - fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt deleted file mode 100644 index 1b3e66bfe7..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.mogo.och.sweeper.callback - -interface IWeltMapSwitchToSmallCallback { - fun onWeltMapSwitchToSmall() -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt deleted file mode 100644 index fcb68755ba..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.mogo.och.sweeper.constant - -/** - * 上装面板操作状态 - */ -enum class OperateStateEnum(val code: Int) { - SYNCING_STATUS( 1),//清扫车底盘状态同步中 - STARTING_STATUS( 2),//上装中 - FAIL_STATUS( 3),//上装失败 - SUCCESS_STATUS(4),//上装成功 - NO_STATUS(-1);//暂无模式 -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt deleted file mode 100644 index 66b5ee3f23..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.mogo.och.sweeper.constant - -import com.mogo.commons.debug.DebugConfig - -/** - * Created on 2021/12/6 - */ -class SweeperConst { - companion object { - - // OCH arouter 路由path - const val PATH = "/driver/api" - - // 测试用的广播 - const val BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY = "sceneType" - - // 上报心跳轮询ms - const val LOOP_PERIOD_60S = 60 * 1000L - - // 开始服务启动自动驾驶等待时间（埋点上传） - const val LOOP_PERIOD_15S = 15 * 1000L - const val LOOP_PERIOD_1S = 1 * 1000L - const val LOOP_DELAY = 100L - - // 下发给MEC轨迹信息间隔时间 10秒 - const val LOOP_PERIOD_10S = 10 * 1000L - - // 尝试下发给MEC轨迹最多10次 - const val LOOP_SEND_TRAJ_TIMES = 10 - - //起点UUID - const val SWEEPER_START_MAP_MAKER = "sweeper_start_map_maker"; - - //终点UUID - const val SWEEPER_END_MAP_MAKER = "sweeper_end_map_maker"; - - // 埋点key：接管后点击'自动驾驶'按钮启动 - const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_och_sweeper_restart_autopilot" - - // 埋点key：开始服务开启自动驾驶（成功/失败） - const val EVENT_KEY_START_SERVICE = "event_key_och_sweeper_start_service" - const val EVENT_PARAM_SN = "sn" - const val EVENT_PARAM_TIME = "time" - const val EVENT_PARAM_START_NAME = "start_name" - const val EVENT_PARAM_END_NAME = "end_name" - const val EVENT_PARAM_LINE_ID = "line_id" - const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false - const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code - const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 - const val EVENT_PARAM_PLATE_NUM = "plate_number" // 车牌号 - const val EVENT_PARAM_ENV_ONLINE = "env_online" // 是否线上环境：true/false - - // 埋点key：开启自动驾驶前已识别的异常，会导致无法开启自驾 - const val EVENT_KEY_AP_UNABLE_START_REASON = "event_key_och_bus_ap_unable_start_reason" - const val EVENT_PARAM_UNABLE_START_REASON = "unable_start_reason"; - - /** - * 订单起终点Marker类型 - */ - const val TYPE_MARKER_SWEEPER_ORDER = "TYPE_MARKER_SWEEPER_ORDER" - - const val TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L - - //围栏到站 暂定10米 - const val ARRIVE_AT_END_STATION_DISTANCE = 10 - - //非贴边 - const val NONWELT = -10000.0 - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java deleted file mode 100644 index cee66c7e53..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.mogo.och.sweeper.database.bean; - -import java.io.Serializable; - -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Index; -import androidx.room.PrimaryKey; - -@Entity(tableName = WeltDataBean.WeltDataTable, indices = {@Index(value = "id", unique = true)}) -public class WeltDataBean implements Serializable { - - public static final String WeltDataTable = "welt_data_table"; - //ColumnInfo用于指定该字段存储在表中的名字，并指定类型 - - @PrimaryKey(autoGenerate = true) - - @ColumnInfo(name = "id", typeAffinity = ColumnInfo.INTEGER) - - private int id; - - @ColumnInfo(name = "subTaskId", typeAffinity = ColumnInfo.INTEGER)//子任务id - - private int subTaskId; - - @ColumnInfo(name = "locLon", typeAffinity = ColumnInfo.REAL) - - private double locLon;//自车RTK定位经度 - - @ColumnInfo(name = "locLat", typeAffinity = ColumnInfo.REAL) - - private double locLat;//自车RTK定位纬度 - - @ColumnInfo(name = "weltDistance", typeAffinity = ColumnInfo.REAL) - - private double weltDistance;//贴边距离 - - @ColumnInfo(name = "cleanMode", typeAffinity = ColumnInfo.INTEGER) - - private int cleanMode;//清扫作业模式 1–纯扫 2--洗扫, 3--纯洗, 4--纯吸 - - @ColumnInfo(name = "cleanDirection", typeAffinity = ColumnInfo.INTEGER) - - private int cleanDirection;//清扫方向 1--两侧, 2--左侧, 3--右侧 - - @ColumnInfo(name = "cleanIntensity", typeAffinity = ColumnInfo.INTEGER) - - private int cleanIntensity;//清扫强度 1--两侧, 2--左侧, 3--右侧 - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public int getSubTaskId() { - return subTaskId; - } - - public void setSubTaskId(int subTaskId) { - this.subTaskId = subTaskId; - } - - public double getLocLon() { - return locLon; - } - - public void setLocLon(double locLon) { - this.locLon = locLon; - } - - public double getLocLat() { - return locLat; - } - - public void setLocLat(double locLat) { - this.locLat = locLat; - } - - public double getWeltDistance() { - return weltDistance; - } - - public void setWeltDistance(double weltDistance) { - this.weltDistance = weltDistance; - } - - public int getCleanMode() { - return cleanMode; - } - - public void setCleanMode(int cleanMode) { - this.cleanMode = cleanMode; - } - - public int getCleanDirection() { - return cleanDirection; - } - - public void setCleanDirection(int cleanDirection) { - this.cleanDirection = cleanDirection; - } - - public int getCleanIntensity() { - return cleanIntensity; - } - - public void setCleanIntensity(int cleanIntensity) { - this.cleanIntensity = cleanIntensity; - } - - @Override - public String toString() { - return "WeltDataBean{" + - "id=" + id + - ", subTaskId='" + subTaskId + '\'' + - ", locLon=" + locLon + - ", locLat=" + locLat + - ", weltDistance=" + weltDistance + - ", cleanMode=" + cleanMode + - ", cleanDirection=" + cleanDirection + - ", cleanIntensity=" + cleanIntensity + - '}'; - } -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java deleted file mode 100644 index 097be3af3e..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.och.sweeper.database.dao; - -import com.mogo.och.sweeper.database.bean.WeltDataBean; - -import java.util.List; - -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; - -import static com.mogo.och.sweeper.database.bean.WeltDataBean.WeltDataTable; - -@Dao -public interface WeltDataDao { - //插入数据 - @Insert(onConflict = OnConflictStrategy.REPLACE) - void insert(WeltDataBean fileInfo); - - //删除所有数据 - @Query("DELETE FROM " + WeltDataTable) - int deleteAllWeltData(); - - //查询所有数据 - @Query("SELECT * FROM " + WeltDataTable) - List loadAllWeltDataInfo(); -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java deleted file mode 100644 index f294bae32a..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.mogo.och.sweeper.event; - -import com.amap.api.maps.model.LatLng; -import com.mogo.och.sweeper.database.bean.WeltDataBean; - -import java.util.ArrayList; - -public class WeltDataEvent{ - private int type; //1.添加起点和终点 2.实时添加贴边数据 3.清除数据 4.任务进度 5:任务轨迹数据 - private ArrayList weltDataBeanList; - private ArrayList markers; - private String distance;//贴边数据 - private String progress;//任务进度 - - public WeltDataEvent(int type) { - this.type = type; - } - - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } - - public ArrayList getWeltDataBeanList() { - return weltDataBeanList; - } - - public void setWeltDataBeanList(ArrayList weltDataBeanList) { - this.weltDataBeanList = weltDataBeanList; - } - - public ArrayList getMarkers() { - return markers; - } - - public void setMarkers(ArrayList markers) { - this.markers = markers; - } - - public String getDistance() { - return distance; - } - - public void setDistance(String distance) { - this.distance = distance; - } - - public String getProgress() { - return progress; - } - - public void setProgress(String progress) { - this.progress = progress; - } -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt deleted file mode 100644 index a34f658856..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt +++ /dev/null @@ -1,129 +0,0 @@ -package com.mogo.och.sweeper.fragment - -import android.os.Bundle -import com.amap.api.maps.model.LatLng -import com.mogo.commons.mvp.BaseFragment -import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweeper.callback.ISweeperTaskDataToFragmentCallback -import com.mogo.och.sweeper.callback.IWeltMapSwitchToSmallCallback -import com.mogo.och.sweeper.database.bean.WeltDataBean -import kotlinx.android.synthetic.main.fragment_welt_map_overview.* -import kotlinx.android.synthetic.main.sweeper_welt_map_overview.* - -/** - * 作业任务全览图 - */ -class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCallback { - private var mIWeltMapSwitchToSmallCallBack: IWeltMapSwitchToSmallCallback? = null - private var mFragment: SweeperFragment? = null - override fun getLayoutId(): Int = R.layout.fragment_welt_map_overview - override fun getTagName(): String { - return "WeltMapOverViewFragment" - } - - override fun initViews() { - - } - fun setWeltMapSwitchToSmallCallBack(iWeltMapSwitchToSmallCallback: IWeltMapSwitchToSmallCallback){ - this.mIWeltMapSwitchToSmallCallBack=iWeltMapSwitchToSmallCallback - } - fun setSweeperFragment(fragment: SweeperFragment){ - this.mFragment=fragment - mFragment?.setTaskDataToFragmentCallback(this) - } - override fun initViews(savedInstanceState: Bundle?) { - super.initViews(savedInstanceState) - weltMapOverView?.onCreateView(savedInstanceState) - sweeperSwitchToSmall.setOnClickListener { - mIWeltMapSwitchToSmallCallBack?.onWeltMapSwitchToSmall() - } - val bundle = arguments - if (bundle != null) { - val latLngs = bundle.getSerializable("subTaskCoordinates") as? ArrayList - val latLng = bundle.getParcelable("subTaskEndCoordinates") - val weltDataList = bundle.getSerializable("weltDataList") as? ArrayList - val routeList = bundle.getSerializable("routeList") as? ArrayList - val progress = bundle.getString("progress") - routeList?.let { - weltMapOverView?.setRouteList(it) - } - latLng?.let { - setCurrentTaskCoordinatesLatLng(it) - } - latLngs?.let { - setTaskListCoordinatesLatLng(it) - } - weltDataList?.let { - setWeltData(it,"0.0cm") - } - progress?.let { - weltMapOverView?.setProgress(progress) - } - } - - } - - companion object { - @JvmStatic - fun newInstance( - mIWeltMapSwitchToSmallCallBack: IWeltMapSwitchToSmallCallback, - mCurrentTaskEndStation:LatLng?, - weltDataList: ArrayList?, - latLngs: ArrayList?, - routeList: ArrayList?, - progress:String?, - sweeperFragment: SweeperFragment - ): WeltMapOverViewFragment { - val args = Bundle() - args.putSerializable("weltDataList", weltDataList) - args.putSerializable("subTaskCoordinates", latLngs) - args.putParcelable("subTaskEndCoordinates", mCurrentTaskEndStation) - args.putSerializable("routeList", routeList) - args.putString("progress", progress) - val fragment = WeltMapOverViewFragment() - fragment.setWeltMapSwitchToSmallCallBack(mIWeltMapSwitchToSmallCallBack) - fragment.setSweeperFragment(sweeperFragment) - fragment.arguments = args - return fragment - } - } - - override fun onPause() { - super.onPause() - weltMapOverView?.onPause() - } - - override fun onResume() { - super.onResume() - weltMapOverView?.onResume() - } - - override fun onDestroy() { - super.onDestroy() - weltMapOverView?.onDestroy() - } - override fun setTaskListCoordinatesLatLng(coordinatesLatLng: java.util.ArrayList) { - weltMapOverView?.setTaskListCoordinatesLatLng(coordinatesLatLng) - } - - override fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) { - weltMapOverView?.setCurrentTaskCoordinatesLatLng(coordinatesLatLng) - } - - override fun clearAllMarkerAndPolyline() { - weltMapOverView?.clearAllMarkerAndPolyline() - } - - override fun setProgress(progress: String) { - weltMapOverView?.setProgress(progress) - } - - override fun setRouteList(routeList: java.util.ArrayList) { - weltMapOverView?.setRouteList(routeList) - } - - override fun setWeltData(weltDatas: java.util.ArrayList?, distance: String) { - weltMapOverView?.setWeltData(weltDatas,true,distance) - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java deleted file mode 100644 index 934cc029de..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java +++ /dev/null @@ -1,1094 +0,0 @@ -package com.mogo.och.sweeper.ui; - -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP; - -import android.animation.ObjectAnimator; -import android.content.Context; -import android.os.Handler; -import android.os.Message; -import android.util.AttributeSet; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.animation.LinearInterpolator; -import android.widget.CheckedTextView; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; -import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; -import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.och.sweeper.R; -import com.mogo.och.sweeper.callback.ICleaningModeStateCallback; -import com.mogo.och.sweeper.constant.OperateStateEnum; -import com.mogo.och.sweeper.util.SweeperFutianCmdUtil; -import com.mogo.och.sweeper.view.NoTouchConstraintLayout; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import chassis.ChassisStatesOuterClass; -import chassis.SpecialVehicleTaskCmdOuterClass; - -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_CLOSE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_CLOSE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_WORK_CLOSE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_WORK_OPEN; - -/** - * 清扫车操作面板View - */ -public class SweeperOperatePanelView extends LinearLayout { - - private static final String TAG = "SweeperOperatePanelView"; - private static final int CMD_EXECUTE_TIMEOUT_SECONDS = 30; - private static final int CMD_EXECUTE_MOCK_SUCCESS_SECONDS = 3; - private boolean isFirst = false; - - CheckedTextView mBtnCleanWorkOpenClose;//开关 - CheckedTextView mBtnCleanModePureSweep;//纯扫 - CheckedTextView mBtnCleanModePureWash;//纯洗 - CheckedTextView mBtnCleanModeSweepWash;//洗扫 - CheckedTextView mBtnCleanModePureAbsorption;//纯吸 - CheckedTextView mBtnCleanDirectionLeftSide;//左侧 - CheckedTextView mBtnCleanDirectionRightSide;//右侧 - CheckedTextView mBtnCleanDirectionBothSide;//两侧 - CheckedTextView mBtnCleanIntensityStandard;//普通 - CheckedTextView mBtnCleanIntensityStrong;//强力 - FrameLayout mLoadingContainer;//loading container - TextView mLoadingHint;//loading 文本提示 - ImageView mLoadingView;//loading 转圈动画 - NoTouchConstraintLayout mWorkmodePanelRootView; - - // 作业模式相关操作按钮的id - List cleanModeBtnViewIds = Arrays.asList( - R.id.btn_clean_mode_pure_sweep, - R.id.btn_clean_mode_pure_wash, - R.id.btn_clean_mode_sweep_wash, - R.id.btn_clean_mode_pure_absorption); - - // 作业模式相关操作按钮，对应命令参数值 - HashMap cleanModeBtnAndCmdValueMap = new HashMap() { - { - put(R.id.btn_clean_mode_pure_sweep, CLEAN_MODE_PURE_SWEEP); - put(R.id.btn_clean_mode_pure_wash, CLEAN_MODE_PURE_WASH); - put(R.id.btn_clean_mode_sweep_wash, CLEAN_MODE_WASH_SWEEP); - put(R.id.btn_clean_mode_pure_absorption, CLEAN_MODE_PURE_DRAW); - } - }; - - // 清扫方向相关操作按钮的id - List cleanDirectionBtnViewIds = Arrays.asList( - R.id.btn_clean_direction_left_side, - R.id.btn_clean_direction_right_side, - R.id.btn_clean_direction_both_side); - - // 清扫方向相关按钮操作，对应命令参数值 - HashMap cleanDirectionBtnAndCmdValueMap = new HashMap() { - { - put(R.id.btn_clean_direction_left_side, CLEAN_DIRECTION_LEFT_SIDE); - put(R.id.btn_clean_direction_right_side, CLEAN_DIRECTION_RIGHT_SIDE); - put(R.id.btn_clean_direction_both_side, CLEAN_DIRECTION_BOTH_SIDE); - } - }; - - // 作业强度相关按钮操作 - List cleanIntensityBtnViewIds = Arrays.asList( - R.id.btn_clean_intensity_standard, - R.id.btn_clean_intensity_strong); - - // 作业强度相关按钮操作，对应命令参数值 - HashMap cleanIntensityBtnAndCmdValueMap = new HashMap() { - { - put(R.id.btn_clean_intensity_standard, CLEAN_INTENSITY_STRAND); - put(R.id.btn_clean_intensity_strong, CLEAN_INTENSITY_STRONG); - } - }; - private boolean isSelectPureSweepMode = false;//用于标注是否选中纯扫 - - private ICleaningModeStateCallback cleaningModeStateCallback; - - private OperateStateEnum operateStateEnum = OperateStateEnum.SYNCING_STATUS; - - private ObjectAnimator objectAnimator; - - private static ChassisStatesOuterClass.SweeperFuTianTaskSystemStates mCurrentCleanSystemState;//当前作业模式 - - public SweeperOperatePanelView(Context context) { - super(context); - } - - public SweeperOperatePanelView(Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - initView(context); - } - - public SweeperOperatePanelView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initView(context); - } - - public SweeperOperatePanelView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - initView(context); - } - - private void initView(Context context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_operate_panel_view, this, true); - mBtnCleanWorkOpenClose = (CheckedTextView) findViewById(R.id.btn_clean_work_open_close); - mWorkmodePanelRootView = (NoTouchConstraintLayout) findViewById(R.id.work_mode_panel_root_view); - mBtnCleanModePureSweep = (CheckedTextView) findViewById(R.id.btn_clean_mode_pure_sweep); - mBtnCleanModePureWash = (CheckedTextView) findViewById(R.id.btn_clean_mode_pure_wash); - mBtnCleanModeSweepWash = (CheckedTextView) findViewById(R.id.btn_clean_mode_sweep_wash); - mBtnCleanModePureAbsorption = (CheckedTextView) findViewById(R.id.btn_clean_mode_pure_absorption); - mBtnCleanDirectionLeftSide = (CheckedTextView) findViewById(R.id.btn_clean_direction_left_side); - mBtnCleanDirectionRightSide = (CheckedTextView) findViewById(R.id.btn_clean_direction_right_side); - mBtnCleanDirectionBothSide = (CheckedTextView) findViewById(R.id.btn_clean_direction_both_side); - mBtnCleanIntensityStandard = (CheckedTextView) findViewById(R.id.btn_clean_intensity_standard); - mBtnCleanIntensityStrong = (CheckedTextView) findViewById(R.id.btn_clean_intensity_strong); - mLoadingContainer = findViewById(R.id.loading_hint_container); - mLoadingHint = findViewById(R.id.loading_hint); - mLoadingView = findViewById(R.id.loading_view); - initViewListener(); - } - - private void initViewListener() { - setClickListener(mBtnCleanWorkOpenClose, (v) -> onCleanWorkBtnClick()); - setClickListener(mBtnCleanModePureSweep, (v) -> onCleanModeBtnClick(v)); - setClickListener(mBtnCleanModePureWash, (v) -> onCleanModeBtnClick(v)); - setClickListener(mBtnCleanModeSweepWash, (v) -> onCleanModeBtnClick(v)); - setClickListener(mBtnCleanModePureAbsorption, (v) -> onCleanModeBtnClick(v)); - setClickListener(mBtnCleanDirectionLeftSide, (v) -> onCleanDirectionBtnClick(v)); - setClickListener(mBtnCleanDirectionRightSide, (v) -> onCleanDirectionBtnClick(v)); - setClickListener(mBtnCleanDirectionBothSide, (v) -> onCleanDirectionBtnClick(v)); - setClickListener(mBtnCleanIntensityStandard, (v) -> onCleanIntensityBtnClick(v)); - setClickListener(mBtnCleanIntensityStrong, (v) -> onCleanIntensityBtnClick(v)); - } - - /** - * 清扫任务开关按钮点击事件 - */ - private void onCleanWorkBtnClick() { - // 是否是 关闭 操作 - boolean isCloseAction = mBtnCleanWorkOpenClose.isChecked(); - CmdRequestCallback cmdRequestCallback = new CmdRequestCallback() { - @Override - public void onSendCmd() { - showLoadingMask(CMD_EXECUTE_TIMEOUT_SECONDS); - } - - @Override - public void onCountDownTick(int seconds) { - updateLoadingCountDown(seconds); - } - - @Override - public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) { - boolean success = false; - if (cleanSystemState == null) { - return success; - } - if (isCloseAction) { - success = !cleanSystemState.getSecuMotWorkSts(); - } else { - success = cleanSystemState.getSecuMotWorkSts(); - } - return success; - } - - @Override - public void onCmdSuccess() { - if (isCloseAction) { - mBtnCleanWorkOpenClose.setText("打开"); - mBtnCleanWorkOpenClose.setChecked(false); - toggleCleanModeBtnsStatus(false); - toggleCleanDirectionBtnsStatus(false); - toggleCleanIntensityBtnsStatus(false); - } else { - mBtnCleanWorkOpenClose.setText("关闭"); - mBtnCleanWorkOpenClose.setChecked(true); - toggleCleanModeBtnsStatus(true); - } - hideLoadingMask(); - showCmdExecuteSuccessToast(); - } - - @Override - public void onCmdFailed() { - } - - @Override - public void onCmdTimeout() { - //按钮样式恢复原样 - if (isCloseAction) { - mBtnCleanWorkOpenClose.setText("关闭"); - mBtnCleanWorkOpenClose.setChecked(true); - } else { - mBtnCleanWorkOpenClose.setText("打开"); - mBtnCleanWorkOpenClose.setChecked(false); - } - hideLoadingMask(); - showCmdExecuteTimeoutToast(); - } - }; - if (isCloseAction) { - //关闭操作，点击时需要弹框提示确认后，关闭 - sendSweeperCmd( - SweeperFutianCmdUtil.buildCleanWorkStopCmd(), - cmdRequestCallback - , CMD_EXECUTE_TIMEOUT_SECONDS); - } else { - //打开操作，点击时打开 - sendSweeperCmd( - SweeperFutianCmdUtil.buildCleanWorkStartCmd(), - cmdRequestCallback, - CMD_EXECUTE_TIMEOUT_SECONDS); - } - } - - /** - * 作业模式按钮点击事件 - * - * @param currentClickView - */ - private void onCleanModeBtnClick(final View currentClickView) { - CheckedTextView currentChoosedModeBtnView = null; - for (Integer viewId : cleanModeBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - if (view.isChecked()) { - currentChoosedModeBtnView = view; - break; - } - } - boolean isClickCurrentChoosedModeBtn = currentChoosedModeBtnView != null - && currentChoosedModeBtnView.getId() == currentClickView.getId(); - //是否纯吸View - boolean isPureAbsorptionClick = currentClickView.getId() == R.id.btn_clean_mode_pure_absorption; - //是否纯洗View - boolean isPureWashClick = currentClickView.getId() == R.id.btn_clean_mode_pure_wash; - //是否纯扫View - boolean isPureSweepClick = currentClickView.getId() == R.id.btn_clean_mode_pure_sweep; - //是否洗扫View - boolean isWashSweepClick = currentClickView.getId() == R.id.btn_clean_mode_sweep_wash; - CmdRequestCallback cmdRequestCallback = new CmdRequestCallback() { - @Override - public void onSendCmd() { - showLoadingMask(CMD_EXECUTE_TIMEOUT_SECONDS); - } - - @Override - public void onCountDownTick(int seconds) { - updateLoadingCountDown(seconds); - } - - @Override - public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) { - boolean success = false; - if (cleanSystemState == null) { - return success; - } - // 洗扫 - boolean clean_mode_wash_sweep = cleanSystemState.getSecuModWashSweepSts(); - // 纯洗 - boolean clean_mode_pure_wash = cleanSystemState.getSecuModWashSts(); - // 纯吸 - boolean clean_mode_pure_draw = cleanSystemState.getSecuWorkTonSts(); - // 纯扫 模式判断：不是另外其他3个模式，同时有清扫方向，说明开启了纯扫模式 - boolean clean_mode_pure_sweep = SweeperFutianCmdUtil.checkIfCleanModePureSweep(cleanSystemState); - // 关闭作业模式（实际执行了3个操作： 关闭作业模式 关闭清扫方向 切换标准强度，实际以关闭作业模式成功为准） - boolean clean_mode_close = !clean_mode_wash_sweep - && !clean_mode_pure_wash - && !clean_mode_pure_draw - && !clean_mode_pure_sweep; - - if (isClickCurrentChoosedModeBtn && clean_mode_close) {// 关闭放第一判断 - success = clean_mode_close; - isSelectPureSweepMode = false; - } else if (isPureSweepClick) { - //success = clean_mode_pure_sweep; - //纯扫 这个模式实际在福田清扫车上没有这个按钮，只是发送指令给特种车端，默认此命令肯定是正确的 - success = true; - isSelectPureSweepMode = true; - } else if (isPureWashClick) { - success = clean_mode_pure_wash; - isSelectPureSweepMode = false; - } else if (isWashSweepClick) { - success = clean_mode_wash_sweep; - isSelectPureSweepMode = false; - } else if (isPureAbsorptionClick) { - success = clean_mode_pure_draw; - isSelectPureSweepMode = false; - } - return success; - } - - @Override - public void onCmdSuccess() { - ((CheckedTextView) currentClickView).setChecked(!isClickCurrentChoosedModeBtn); - toggleCleanModeBtnsByChoosedViewId(currentClickView.getId(), isClickCurrentChoosedModeBtn); - if (isClickCurrentChoosedModeBtn) { - toggleCleanDirectionBtnsStatus(false); - toggleCleanIntensityBtnsStatus(false); - } else { - // 如果是纯吸，没有设置清扫方向，同时自动设置作业强度为标准 - if (isPureAbsorptionClick) { - toggleCleanDirectionBtnsStatus(false); - setCleanIntensityStandard(); - } else { - toggleCleanDirectionBtnsStatus(true); - toggleCleanIntensityBtnsStatus(false); - } - } - hideLoadingMask(); - showCmdExecuteSuccessToast(); - } - - @Override - public void onCmdFailed() { - } - - @Override - public void onCmdTimeout() { - ((CheckedTextView) currentClickView).setChecked(isClickCurrentChoosedModeBtn); - hideLoadingMask(); - showCmdExecuteTimeoutToast(); - } - }; - - if (isClickCurrentChoosedModeBtn) { - //当前已选择模式的按钮，取消当前模式，并关闭清扫方向 - sendSweeperCmd( - SweeperFutianCmdUtil.buildCleanModeCloseCmd(), - cmdRequestCallback, - CMD_EXECUTE_TIMEOUT_SECONDS); - } else { - //开启新的作业模式，直接发送命令(纯吸需要一并设置作业强度为标准) - int cmdValue = cleanModeBtnAndCmdValueMap.get(currentClickView.getId()); - sendSweeperCmd( - isPureAbsorptionClick ? SweeperFutianCmdUtil.buildCleanModePureDrawCmd() - : SweeperFutianCmdUtil.buildCleanModeCmd(cmdValue), - cmdRequestCallback, - CMD_EXECUTE_TIMEOUT_SECONDS); - } - } - - private void onCleanDirectionBtnClick(final View currentClickView) { - CheckedTextView currentChoosedDirectionBtnView = null; - for (Integer viewId : cleanDirectionBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - if (view.isChecked()) { - currentChoosedDirectionBtnView = view; - break; - } - } - boolean isClickCurrentChoosedDirectionBtn = currentChoosedDirectionBtnView != null - && currentChoosedDirectionBtnView.getId() == currentClickView.getId(); - - boolean isLeftSide = currentClickView.getId() == R.id.btn_clean_direction_left_side; - boolean isRightSide = currentClickView.getId() == R.id.btn_clean_direction_right_side; - boolean isBothSide = currentClickView.getId() == R.id.btn_clean_direction_both_side; - CmdRequestCallback cmdRequestCallback = new CmdRequestCallback() { - @Override - public void onSendCmd() { - showLoadingMask(CMD_EXECUTE_TIMEOUT_SECONDS); - } - - @Override - public void onCountDownTick(int seconds) { - updateLoadingCountDown(seconds); - } - - @Override - public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) { - boolean success = false; - if (cleanSystemState == null) { - return success; - } - // 左侧 - boolean clean_direction_left_side = cleanSystemState.getSecuWorkLeftSts(); - // 右侧 - boolean clean_direction_right_side = cleanSystemState.getSecuWorkRightSts(); - // 两侧 - boolean clean_direction_both_side = cleanSystemState.getSecuWorkOnBothsidesSts(); - // 关闭清扫方向（实际执行了2个操作：关闭清扫方向 切换标准强度，实际以关闭清扫方向成功为准） - boolean clean_direction_close = !clean_direction_left_side && !clean_direction_right_side - && !clean_direction_both_side; - - if (isClickCurrentChoosedDirectionBtn && clean_direction_close) {//关闭放第一判断 - success = clean_direction_close; - } else if (isLeftSide) { - success = clean_direction_left_side; - } else if (isRightSide) { - success = clean_direction_right_side; - } else if (isBothSide) { - success = clean_direction_both_side; - } - return success; - } - - @Override - public void onCmdSuccess() { - ((CheckedTextView) currentClickView).setChecked(!isClickCurrentChoosedDirectionBtn); - toggleCleanDirectionBtnsByChoosedViewId(currentClickView.getId(), isClickCurrentChoosedDirectionBtn); - if (isClickCurrentChoosedDirectionBtn) { - toggleCleanIntensityBtnsStatus(false); - } else { - toggleCleanIntensityBtnsStatus(true); - // 一并设置作业强度为标准 - setCleanIntensityStandard(); - } - hideLoadingMask(); - showCmdExecuteSuccessToast(); - } - - @Override - public void onCmdFailed() { - } - - @Override - public void onCmdTimeout() { - ((CheckedTextView) currentClickView).setChecked(isClickCurrentChoosedDirectionBtn); - hideLoadingMask(); - showCmdExecuteTimeoutToast(); - } - }; - if (isClickCurrentChoosedDirectionBtn) { - //当前已选择模式的按钮，取消当前模式，重置作业强度为标准，并置灰作业强度按钮 - sendSweeperCmd( - SweeperFutianCmdUtil.buildCleanDirectionCloseCmd(), - cmdRequestCallback, - CMD_EXECUTE_TIMEOUT_SECONDS); - } else { - //开启新的作业模式，直接发送命令(作业强度默认为标准) - int cmdValue = cleanDirectionBtnAndCmdValueMap.get(currentClickView.getId()); - sendSweeperCmd( - SweeperFutianCmdUtil.buildCleanDirectionCmd(cmdValue), - cmdRequestCallback, - CMD_EXECUTE_TIMEOUT_SECONDS); - } - } - - private void onCleanIntensityBtnClick(final View currentClickView) { - CheckedTextView currentChoosedModeBtnView = null; - for (Integer viewId : cleanIntensityBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - if (view.isChecked()) { - currentChoosedModeBtnView = view; - break; - } - } - boolean isClickCurrentChoosedModeBtn = currentChoosedModeBtnView != null - && currentChoosedModeBtnView.getId() == currentClickView.getId(); - //作业强度如果已经选中，则重复点击时不需要再重复发送指令 - if (isClickCurrentChoosedModeBtn) { - return; - } - boolean isStandardBtnClick = currentClickView.getId() == R.id.btn_clean_intensity_standard; - boolean isStrongBtnClick = currentClickView.getId() == R.id.btn_clean_intensity_strong; - CmdRequestCallback cmdRequestCallback = new CmdRequestCallback() { - @Override - public void onSendCmd() { - showLoadingMask(CMD_EXECUTE_TIMEOUT_SECONDS); - } - - @Override - public void onCountDownTick(int seconds) { - updateLoadingCountDown(seconds); - } - - @Override - public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) { - boolean success = false; - if (cleanSystemState == null) { - return success; - } - boolean clean_intensity_standard = cleanSystemState.getSecuWorkStandSts(); - boolean clean_intensity_strong = cleanSystemState.getSecuWorkStrongSts(); - if (isStandardBtnClick) { - success = clean_intensity_standard; - } else if (isStrongBtnClick) { - success = clean_intensity_strong; - } - return success; - } - - @Override - public void onCmdSuccess() { - ((CheckedTextView) currentClickView).setChecked(true); - if (isStandardBtnClick) { - setCleanIntensityStandard(); - } else { - setCleanIntensityStrong(); - } - hideLoadingMask(); - showCmdExecuteSuccessToast(); - } - - @Override - public void onCmdFailed() { - } - - @Override - public void onCmdTimeout() { - ((CheckedTextView) currentClickView).setChecked(false); - hideLoadingMask(); - showCmdExecuteTimeoutToast(); - } - }; - int cmdValue = cleanIntensityBtnAndCmdValueMap.get(currentClickView.getId()); - sendSweeperCmd( - SweeperFutianCmdUtil.buildCleanIntensityCmd(cmdValue), - cmdRequestCallback, - CMD_EXECUTE_TIMEOUT_SECONDS); - } - - /** - * 作业模式按钮状态切换-置灰/开启 按钮 - * - * @param enable - */ - private void toggleCleanModeBtnsStatus(boolean enable) { - for (Integer viewId : cleanModeBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - view.setEnabled(enable); - view.setChecked(false); - } - } - - /** - * 作业模式按钮状态切换-将当前点击按钮之外的其他按钮 置灰或开启 - * - * @param choosedBtnId - * @param enable - */ - private void toggleCleanModeBtnsByChoosedViewId(int choosedBtnId, boolean enable) { - for (Integer viewId : cleanModeBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - if (view.getId() != choosedBtnId) { - view.setEnabled(enable); - view.setChecked(false); - } - } - } - - /** - * 清扫方向按钮状态切换-置灰/开启 按钮 - * - * @param enable - */ - private void toggleCleanDirectionBtnsStatus(boolean enable) { - for (Integer viewId : cleanDirectionBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - view.setEnabled(enable); - view.setChecked(false); - } - } - - /** - * 清扫方向按钮状态切换-将当前点击按钮之外的其他按钮 置灰或开启 - * - * @param choosedBtnId - * @param enable - */ - private void toggleCleanDirectionBtnsByChoosedViewId(int choosedBtnId, boolean enable) { - for (Integer viewId : cleanDirectionBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - if (view.getId() != choosedBtnId) { - view.setEnabled(enable); - view.setChecked(false); - } - } - } - - /** - * 作业强度按钮状态切换-置灰/开启 按钮 - * - * @param enable - */ - private void toggleCleanIntensityBtnsStatus(boolean enable) { - for (Integer viewId : cleanIntensityBtnViewIds) { - CheckedTextView view = (CheckedTextView) findViewById(viewId); - view.setEnabled(enable); - view.setChecked(false); - } - } - - /** - * 设置作业强度-标准 - */ - private void setCleanIntensityStandard() { - mBtnCleanIntensityStandard.setChecked(true); - mBtnCleanIntensityStandard.setEnabled(true); - mBtnCleanIntensityStrong.setChecked(false); - mBtnCleanIntensityStrong.setEnabled(true); - } - - /** - * 设置作业强度-加强 - */ - private void setCleanIntensityStrong() { - mBtnCleanIntensityStandard.setChecked(false); - mBtnCleanIntensityStandard.setEnabled(true); - mBtnCleanIntensityStrong.setChecked(true); - mBtnCleanIntensityStrong.setEnabled(true); - } - - /** - * 发送命令后等待时，展示loading - * - * @param timeout - */ - private void showLoadingMask(int timeout) { - mLoadingContainer.setVisibility(View.VISIBLE); - mWorkmodePanelRootView.setInterceptTouchEvent(true); - if (timeout < 0) {//状态同步中 - mLoadingHint.setText("状态同步中，请稍后"); - mLoadingView.setVisibility(View.GONE); - } else { - mLoadingHint.setText(timeout + "s"); - mLoadingView.setVisibility(View.VISIBLE); - startRotation(); - } - if (cleaningModeStateCallback != null && timeout > 0) { - operateStateEnum = OperateStateEnum.STARTING_STATUS; - cleaningModeStateCallback.cleaningModeState(operateStateEnum, mCurrentCleanSystemState, isSelectPureSweepMode); - } - } - - /** - * 隐藏loading - */ - private void hideLoadingMask() { - mSweeperOperateCmdHandler.removeMessages(MSG_CMD_EXECUTE_COUNT_DOWN); - mLoadingContainer.setVisibility(View.GONE); - mWorkmodePanelRootView.setInterceptTouchEvent(false); - } - - /** - * 更新loading中倒计时 - * - * @param timeout - */ - private void updateLoadingCountDown(int timeout) { - mLoadingHint.setText(timeout + "s"); - } - - /** - * 命令执行成功toast - */ - private void showCmdExecuteSuccessToast() { - if (cleaningModeStateCallback != null) { - operateStateEnum = OperateStateEnum.SUCCESS_STATUS; - cleaningModeStateCallback.cleaningModeState(operateStateEnum, mCurrentCleanSystemState, isSelectPureSweepMode); - } - //停止旋转动画 - stopRotation(); - ToastUtils.showLong("设备已响应，操作成功"); - } - - /** - * 命令执行超时toast - */ - private void showCmdExecuteTimeoutToast() { - if (cleaningModeStateCallback != null) { - operateStateEnum = OperateStateEnum.FAIL_STATUS; - cleaningModeStateCallback.cleaningModeState(operateStateEnum, mCurrentCleanSystemState, isSelectPureSweepMode); - } - //停止旋转动画 - stopRotation(); - ToastUtils.showLong("超时未响应，操作失败"); - } - - private void setClickListener(View view, OnClickListener listener) { - view.setOnClickListener(new OnPreventFastClickListener() { - @Override - public void onClickImpl(View v) { - listener.onClick(v); - } - }); - } - - public void setSweeperFutianCleanSystemState(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState, - ICleaningModeStateCallback cleaningModeStateCallback) { - this.cleaningModeStateCallback = cleaningModeStateCallback; - // 有命令正在执行 - if (mCurrentCmdRequestCallback != null) { - Log.d(TAG, "getSecuWorkLeftSts = " + cleanSystemState.getSecuWorkLeftSts()); - if (mCurrentCmdRequestCallback.onCheckIfCmdSuccess(cleanSystemState)) { - mCurrentCmdRequestCallback.onCmdSuccess(); - mCurrentCmdRequestCallback = null; - } - } - //正在上装中或者上装失败，则不更新面板内容 - if (operateStateEnum == OperateStateEnum.STARTING_STATUS) { - return; - } - if (!isFirst) { - isFirst = true; - onSyncVehicleStateCallBack(cleanSystemState); - } - } - - /** - * 设置是否展示状态同步中 - * - * @param operateState - */ - public void showSyncing(OperateStateEnum operateState) { - if (operateState == OperateStateEnum.SYNCING_STATUS) { - syncVehicleStateAndRecoverOperatePanelStates(); - isFirst = false; - } else { - hideLoadingMask(); - } - } - - /** - * 等待同步底盘数据，并根据底盘数据恢复操作面板中按钮的状态 - */ - private synchronized void syncVehicleStateAndRecoverOperatePanelStates() { - // show sync loading - showLoadingMask(-1); - } - - private synchronized void onSyncVehicleStateCallBack(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) { - if (cleanSystemState == null) return; - // 清扫作业开启状态（以电机状态为true代表Open成功，实际控制端控制步骤为：1.发送远程控制上装指令 2.发送电机启动指令） - boolean clean_open_requirement = cleanSystemState.getSecuMotWorkSts(); - // 作业模式状态 - // 洗扫 - boolean clean_mode_wash_sweep = cleanSystemState.getSecuModWashSweepSts(); - // 纯洗 - boolean clean_mode_pure_wash = cleanSystemState.getSecuModWashSts(); - // 纯吸 - boolean clean_mode_pure_draw = cleanSystemState.getSecuWorkTonSts(); - - // 清扫方向状态 - // 左侧 - boolean clean_direction_left_side = cleanSystemState.getSecuWorkLeftSts(); - // 右侧 - boolean clean_direction_right_side = cleanSystemState.getSecuWorkRightSts(); - // 两侧 - boolean clean_direction_both_side = cleanSystemState.getSecuWorkOnBothsidesSts(); - - // 纯扫 模式判断：不是另外其他3个模式，同时有清扫方向，说明开启了纯扫模式 - boolean clean_mode_pure_sweep = SweeperFutianCmdUtil.checkIfCleanModePureSweep(cleanSystemState); - - // 作业强度状态 - boolean clean_intensity_standard = cleanSystemState.getSecuWorkStandSts(); - boolean clean_intensity_strong = cleanSystemState.getSecuWorkStrongSts(); - if (clean_open_requirement) { - // 打开状态 - mBtnCleanWorkOpenClose.setText("关闭"); - mBtnCleanWorkOpenClose.setChecked(true); - } else { - // 关闭状态 - mBtnCleanWorkOpenClose.setText("打开"); - mBtnCleanWorkOpenClose.setChecked(false); - } - if (clean_mode_pure_sweep) { - //纯扫 - mBtnCleanModePureSweep.setChecked(true); - mBtnCleanModePureSweep.setEnabled(true); - toggleCleanModeBtnsByChoosedViewId(R.id.btn_clean_mode_pure_sweep, false); - } else if (clean_mode_pure_wash) { - //纯洗 - mBtnCleanModePureWash.setChecked(true); - mBtnCleanModePureWash.setEnabled(true); - toggleCleanModeBtnsByChoosedViewId(R.id.btn_clean_mode_pure_wash, false); - } else if (clean_mode_wash_sweep) { - //洗扫 - mBtnCleanModeSweepWash.setChecked(true); - mBtnCleanModeSweepWash.setEnabled(true); - toggleCleanModeBtnsByChoosedViewId(R.id.btn_clean_mode_sweep_wash, false); - } else if (clean_mode_pure_draw) { - //纯吸，需要disable作业方向 - mBtnCleanModePureAbsorption.setChecked(true); - mBtnCleanModePureAbsorption.setEnabled(true); - toggleCleanModeBtnsByChoosedViewId(R.id.btn_clean_mode_pure_absorption, false); - toggleCleanDirectionBtnsStatus(false); - } - - if (!clean_mode_pure_draw) {// 非纯吸模式才有清扫方向 - if (clean_direction_left_side) { - mBtnCleanDirectionLeftSide.setChecked(true); - mBtnCleanDirectionLeftSide.setEnabled(true); - toggleCleanDirectionBtnsByChoosedViewId(R.id.btn_clean_direction_left_side, false); - } else if (clean_direction_right_side) { - mBtnCleanDirectionRightSide.setChecked(true); - mBtnCleanDirectionRightSide.setEnabled(true); - toggleCleanDirectionBtnsByChoosedViewId(R.id.btn_clean_direction_right_side, false); - } else if (clean_direction_both_side) { - mBtnCleanDirectionBothSide.setChecked(true); - mBtnCleanDirectionBothSide.setEnabled(true); - toggleCleanDirectionBtnsByChoosedViewId(R.id.btn_clean_direction_both_side, false); - } - } - if (clean_intensity_standard) { - setCleanIntensityStandard(); - } else if (clean_intensity_strong) { - setCleanIntensityStrong(); - } - hideLoadingMask(); - } - - /** - * 发送清扫车相关作业命令 - * - * @param fuTianCleanCmd - * @param cmdRequestCallback - * @param timeout - */ - private void sendSweeperCmd( - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd fuTianCleanCmd, - CmdRequestCallback cmdRequestCallback, - int timeout) { - // 设置当前请求的回调 - mCurrentCmdRequestCallback = cmdRequestCallback; - // onSendCmd - mCurrentCmdRequestCallback.onSendCmd(); - // 发送命令 - CallerAutoPilotControlManager.INSTANCE.sendSweeperFuTianTaskCmd(fuTianCleanCmd); - // log发送命令 - logSweeperCmdValue(fuTianCleanCmd); - // 开启倒计时 - Message msg = Message.obtain(); - msg.what = MSG_CMD_EXECUTE_COUNT_DOWN; - msg.obj = timeout; - mSweeperOperateCmdHandler.sendMessage(msg); - // Mock Cmd Success - //mockCleanModeSuccess(fuTianCleanCmd); - } - - private void mockSendCmdSuccess() { - Message successMsg = Message.obtain(); - successMsg.what = MSG_CMD_EXECUTE_MOCK_SUCCESS; - mSweeperOperateCmdHandler.sendMessageDelayed(successMsg, 1000L * CMD_EXECUTE_MOCK_SUCCESS_SECONDS); - } - - private void logSweeperCmdValue(SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd taskCmd) { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd roboSweeperFutianCleanCmd = taskCmd.getRoboSweeperFutianCleanCmd(); - int clean_open_requirement = roboSweeperFutianCleanCmd.getCleanOpenRequirement(); - int clean_mode_requirement = roboSweeperFutianCleanCmd.getCleanModeRequirement(); - int clean_direction_requirement = roboSweeperFutianCleanCmd.getCleanDirectionRequirement(); - int clean_intensity_requirement = roboSweeperFutianCleanCmd.getCleanIntensityRequirement(); - Log.d(TAG, "---- sendSweeperFuTianTaskCmd ----" - + "[clean_open_requirement = " + clean_open_requirement + "]," - + "[clean_mode_requirement = " + clean_mode_requirement + "]," - + "[clean_direction_requirement = " + clean_direction_requirement + "]," - + "[clean_intensity_requirement = " + clean_intensity_requirement + "]" - ); - } - - private final static SweeperOperateCmdHandler mSweeperOperateCmdHandler = new SweeperOperateCmdHandler(); - private static CmdRequestCallback mCurrentCmdRequestCallback;//发送命令后的回调 - private static final int MSG_CMD_EXECUTE_COUNT_DOWN = 10001; - private static final int MSG_CMD_EXECUTE_MOCK_SUCCESS = 10002; - - /** - * 执行命令时倒计时的Handler - */ - static class SweeperOperateCmdHandler extends Handler { - - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - if (msg.what == MSG_CMD_EXECUTE_COUNT_DOWN) { - int seconds = (int) msg.obj; - if (seconds > 0) { - if (mCurrentCmdRequestCallback != null) { - mCurrentCmdRequestCallback.onCountDownTick(seconds); - } - Message newMsg = Message.obtain(); - newMsg.what = MSG_CMD_EXECUTE_COUNT_DOWN; - newMsg.obj = seconds - 1; - mSweeperOperateCmdHandler.sendMessageDelayed(newMsg, 1000L); - } else { - if (mCurrentCmdRequestCallback != null) { - mCurrentCmdRequestCallback.onCmdTimeout(); - mCurrentCmdRequestCallback = null; - } - removeMessages(MSG_CMD_EXECUTE_COUNT_DOWN); - } - } else if (msg.what == MSG_CMD_EXECUTE_MOCK_SUCCESS) { - if (mCurrentCmdRequestCallback != null) { - if (mCurrentCmdRequestCallback.onCheckIfCmdSuccess(mCurrentCleanSystemState)) { - mCurrentCmdRequestCallback.onCmdSuccess(); - mCurrentCmdRequestCallback = null; - } - } - removeMessages(MSG_CMD_EXECUTE_COUNT_DOWN); - } - } - } - - interface CmdRequestCallback { - void onSendCmd(); - - void onCountDownTick(int senonds); - - boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState); - - void onCmdSuccess(); - - void onCmdFailed(); - - void onCmdTimeout(); - } - - /** - * 开始旋转 - */ - private void startRotation() { - if (objectAnimator == null) { - objectAnimator = ObjectAnimator.ofFloat(mLoadingView, "rotation", 0, 360f); - objectAnimator.setDuration(1500); - objectAnimator.setRepeatCount(-1); - objectAnimator.setInterpolator(new LinearInterpolator()); - objectAnimator.start(); - } - } - - /** - * 停止旋转 - */ - private void stopRotation() { - if (objectAnimator != null && objectAnimator.isRunning()) { - objectAnimator.end(); - objectAnimator = null; - } - } - - /** - * 模拟指令操作成功 - */ - private void mockCleanModeSuccess(SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd fuTianTaskCmd) { - ChassisStatesOuterClass.SweeperFuTianTaskSystemStates.Builder builder = ChassisStatesOuterClass.SweeperFuTianTaskSystemStates.newBuilder(); - chassis.SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd fuTianCleanCmd = fuTianTaskCmd.getRoboSweeperFutianCleanCmd(); - if (fuTianCleanCmd.getCleanOpenRequirement() == CLEAN_WORK_OPEN) {//打开 - builder.setSecuMotWorkSts(true); - builder.setSecuModWashSweepSts(false); - builder.setSecuModWashSts(false); - builder.setSecuWorkTonSts(false); - builder.setSecuWorkOnBothsidesSts(false); - builder.setSecuWorkLeftSts(false); - builder.setSecuWorkRightSts(false); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanOpenRequirement() == CLEAN_WORK_CLOSE) {//关闭 - builder.setSecuModWashSweepSts(false); - builder.setSecuModWashSts(false); - builder.setSecuWorkTonSts(false); - builder.setSecuWorkOnBothsidesSts(false); - builder.setSecuWorkLeftSts(false); - builder.setSecuWorkRightSts(false); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - builder.setSecuMotWorkSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } - if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_PURE_SWEEP) {//纯扫 - builder.setSecuModWashSweepSts(false); - builder.setSecuModWashSts(false); - builder.setSecuWorkTonSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_WASH_SWEEP) {//洗扫 - builder.setSecuModWashSweepSts(!mCurrentCleanSystemState.getSecuModWashSweepSts()); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_PURE_WASH) {//纯洗 - builder.setSecuModWashSts(!mCurrentCleanSystemState.getSecuModWashSts()); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_PURE_DRAW) {//纯吸 - builder.setSecuWorkTonSts(!mCurrentCleanSystemState.getSecuWorkTonSts()); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkOnBothsidesSts(false); - builder.setSecuWorkLeftSts(false); - builder.setSecuWorkRightSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanModeRequirement() == CLEAN_MODE_CLOSE) { - builder.setSecuModWashSweepSts(false); - builder.setSecuModWashSts(false); - builder.setSecuWorkTonSts(false); - builder.setSecuWorkOnBothsidesSts(false); - builder.setSecuWorkLeftSts(false); - builder.setSecuWorkRightSts(false); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } - if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_BOTH_SIDE) {//两侧 - builder.setSecuWorkOnBothsidesSts(!mCurrentCleanSystemState.getSecuWorkOnBothsidesSts()); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_LEFT_SIDE) {//左侧 - builder.setSecuWorkLeftSts(!mCurrentCleanSystemState.getSecuWorkLeftSts()); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_RIGHT_SIDE) {//右侧 - builder.setSecuWorkRightSts(!mCurrentCleanSystemState.getSecuWorkRightSts()); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanDirectionRequirement() == CLEAN_DIRECTION_CLOSE) { - builder.setSecuWorkLeftSts(false); - builder.setSecuWorkRightSts(false); - builder.setSecuWorkOnBothsidesSts(false); - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } - if (fuTianCleanCmd.getCleanIntensityRequirement() == CLEAN_INTENSITY_STRAND) { - builder.setSecuWorkStrongSts(true); - builder.setSecuWorkStandSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - return; - } else if (fuTianCleanCmd.getCleanIntensityRequirement() == CLEAN_INTENSITY_STRONG) { - builder.setSecuWorkStandSts(true); - builder.setSecuWorkStrongSts(false); - mCurrentCleanSystemState = builder.build(); - mockSendCmdSuccess(); - } - - } - -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java deleted file mode 100644 index 79932ae4d2..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.mogo.och.sweeper.util; - -import chassis.ChassisStatesOuterClass; -import chassis.SpecialVehicleTaskCmdOuterClass; - -/** - * 清扫车-福田，构建业务命令数据的工具类 - */ -public class SweeperFutianCmdUtil { - public static final int CLEAN_WORK_OPEN = 1; //清扫作业-开启 - public static final int CLEAN_WORK_CLOSE = 2;//清扫作业-关闭 - public static final int CLEAN_MODE_PURE_SWEEP = 1;//作业模式-纯扫 - public static final int CLEAN_MODE_WASH_SWEEP = 2;//作业模式-洗扫 - public static final int CLEAN_MODE_PURE_WASH = 3;//作业模式-纯洗 - public static final int CLEAN_MODE_PURE_DRAW = 4;//作业模式-纯吸 - public static final int CLEAN_MODE_CLOSE = 5;//作业模式-关闭 - public static final int CLEAN_DIRECTION_BOTH_SIDE = 1;//清扫方向-两侧 - public static final int CLEAN_DIRECTION_LEFT_SIDE = 2;//清扫方向-左侧 - public static final int CLEAN_DIRECTION_RIGHT_SIDE = 3;//清扫方向-右侧 - public static final int CLEAN_DIRECTION_CLOSE = 4;//清扫方向-关闭 - public static final int CLEAN_INTENSITY_STRAND = 1;//作业强度-标准 - public static final int CLEAN_INTENSITY_STRONG = 2;//作业强度-加强 - - /** - * 清扫作业：打开 - * - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanWorkStartCmd() { - return buildCleanWorkCmd(CLEAN_WORK_OPEN); - } - - /** - * 清扫作业：关闭 - * - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanWorkStopCmd() { - return buildCleanWorkCmd(CLEAN_WORK_CLOSE); - } - - - private static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanWorkCmd(int startOrStop) { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.Builder builder = SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.newBuilder(); - builder.setCleanOpenRequirement(startOrStop); - return buildTaskCmd(builder.build()); - } - - /** - * 作业模式：传入具体的模式对应的值 - * - * @param value - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanModeCmd(int value) { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.Builder builder = SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.newBuilder(); - builder.setCleanModeRequirement(value); - return buildTaskCmd(builder.build()); - } - - /** - * 作业模式：纯吸 - * - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanModePureDrawCmd() { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.Builder builder = SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.newBuilder(); - builder.setCleanModeRequirement(CLEAN_MODE_PURE_DRAW); - //不用设置作业方向，自动设置作业强度为：标准 - builder.setCleanIntensityRequirement(CLEAN_INTENSITY_STRAND); - return buildTaskCmd(builder.build()); - } - - /** - * 作业模式：关闭作业模式 - * - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanModeCloseCmd() { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.Builder builder = SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.newBuilder(); - builder.setCleanModeRequirement(CLEAN_MODE_CLOSE); - //关闭清扫方向，待下次在选择 - builder.setCleanDirectionRequirement(CLEAN_DIRECTION_CLOSE); - //自动设置作业强度为：标准 - builder.setCleanIntensityRequirement(CLEAN_INTENSITY_STRAND); - return buildTaskCmd(builder.build()); - } - - /** - * 作业方向：根据具体的方向传入具体的值 - * - * @param value - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanDirectionCmd(int value) { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.Builder builder = SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.newBuilder(); - builder.setCleanDirectionRequirement(value); - builder.setCleanIntensityRequirement(CLEAN_INTENSITY_STRAND); - // 同时作业强度默认：标准 - return buildTaskCmd(builder.build()); - } - - /** - * 作业方向：关闭作业方向 - * - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanDirectionCloseCmd() { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.Builder builder = SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.newBuilder(); - builder.setCleanDirectionRequirement(CLEAN_DIRECTION_CLOSE); - //重置作业强度为标准 - builder.setCleanIntensityRequirement(CLEAN_INTENSITY_STRAND); - return buildTaskCmd(builder.build()); - } - - /** - * 作业强度：传入具体的值 - * - * @param value - * @return - */ - public static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildCleanIntensityCmd(int value) { - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.Builder builder = SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd.newBuilder(); - builder.setCleanIntensityRequirement(value); - return buildTaskCmd(builder.build()); - } - - private static SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd buildTaskCmd( - SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianCleanCmd fuTianCleanCmd) { - return SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd.newBuilder() - .setRoboSweeperFutianCleanCmd(fuTianCleanCmd).build(); - } - - /** - * 判断是否有作业模式 - * @param cleanSystemState - * @return true:没有作业模式 false：有作业模式 - */ - public static boolean checkIfCleanMode(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState){ - return (!cleanSystemState.getSecuModWashSweepSts()&&!cleanSystemState.getSecuModWashSts()&&!cleanSystemState.getSecuWorkTonSts())&& - (!cleanSystemState.getSecuWorkLeftSts()&&!cleanSystemState.getSecuWorkRightSts()&&!cleanSystemState.getSecuWorkOnBothsidesSts()); - } - - /** - * 判断是否有清扫方向 - * @param cleanSystemState - * @return true:没有清扫方向 false：有清扫方向 - */ - public static boolean checkIfCleanDirection(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState){ - return !cleanSystemState.getSecuWorkLeftSts()&&!cleanSystemState.getSecuWorkRightSts()&&!cleanSystemState.getSecuWorkOnBothsidesSts(); - } - /** - * 判断是否有作业强度 - * @param cleanSystemState - * @return true:没有作业强度 false：有作业强度 - */ - public static boolean checkIfCleanIntensity(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState){ - return !cleanSystemState.getSecuWorkStandSts()&&!cleanSystemState.getSecuWorkStrongSts(); - } - /** - * 判断是否纯扫模式 - * - * @param cleanSystemState - * @return - */ - public static boolean checkIfCleanModePureSweep(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) { - // 作业模式状态 - // 洗扫 - boolean clean_mode_wash_sweep = cleanSystemState.getSecuModWashSweepSts(); - // 纯洗 - boolean clean_mode_pure_wash = cleanSystemState.getSecuModWashSts(); - // 纯吸 - boolean clean_mode_pure_draw = cleanSystemState.getSecuWorkTonSts(); - - // 清扫方向状态 - // 左侧 - boolean clean_direction_left_side = cleanSystemState.getSecuWorkLeftSts(); - // 右侧 - boolean clean_direction_right_side = cleanSystemState.getSecuWorkRightSts(); - // 两侧 - boolean clean_direction_both_side = cleanSystemState.getSecuWorkOnBothsidesSts(); - - // 纯扫 模式判断：不是另外其他3个模式，同时有清扫方向，说明开启了纯扫模式 - boolean clean_mode_pure_sweep = (clean_direction_left_side || clean_direction_right_side || clean_direction_both_side) - && (!clean_mode_wash_sweep && !clean_mode_pure_wash && !clean_mode_pure_draw); - return clean_mode_pure_sweep; - } - /** - * 构建底盘Mock数据 - * - * @return - */ - public static ChassisStatesOuterClass.SweeperFuTianTaskSystemStates buildSweeperFuTionCleanSystemStateMockData() { - ChassisStatesOuterClass.SweeperFuTianTaskSystemStates.Builder builder = ChassisStatesOuterClass.SweeperFuTianTaskSystemStates.newBuilder(); - builder.setSecuMotWorkSts(true); - builder.setSecuModWashSts(true); - builder.setSecuWorkOnBothsidesSts(true); - builder.setSecuWorkStrongSts(true); - return builder.build(); - } - -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java deleted file mode 100644 index 5f9f1db28e..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.mogo.och.sweeper.util; - - -import android.content.Context; - -import java.io.IOException; -import java.io.InputStream; - -/** - * @author donghongyu - * @date 12/18/20 5:37 PM - */ -public class SweeperMapAssetStyleUtil { - - public static byte[] getAssetsStyle(Context context,String fileName) { - byte[] buffer1 = null; - InputStream is1 = null; - try { - is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style.data - int lenght1 = is1.available(); - buffer1 = new byte[lenght1]; - is1.read(buffer1); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - if (is1 != null) { - is1.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return buffer1; - } - - - public static byte[] getAssetsExtraStyle(Context context, String fileName) { - byte[] buffer1 = null; - InputStream is1 = null; - try { - is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style_extra.data - int lenght1 = is1.available(); - buffer1 = new byte[lenght1]; - is1.read(buffer1); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - if (is1 != null) { - is1.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return buffer1; - } - - -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java deleted file mode 100644 index d559214b15..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.mogo.och.sweeper.view; - -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.Typeface; -import android.util.AttributeSet; -import android.util.DisplayMetrics; -import android.view.View; - -import androidx.annotation.Nullable; - -import com.mogo.och.sweeper.R; - -/** - * created by wujifei on 2021/3/24 16:20 - * describe: - */ -public class BusArcView extends View { - - //中心的文字描述 - private String mDes = "KM/H"; - //根据数据显示的圆弧Paint - private Paint mArcPaint; - //圆弧颜色 - private int mArcColor; - //圆弧的画笔的宽度 - private float mStrokeWith = getResources().getDimension(R.dimen.sweeper_ext_arcView_stroke_with); - //文字描述的paint - private Paint mTextPaint; - - //当前进度夹角大小 - private float mIncludedAngle = 0; - //当前数据 - private int currentValue; - //最大数据 - private int maxValue = 240; - //圆弧背景的开始和结束间的夹角大小 - private float mAngle = 270; - //上次绘制圆弧夹角 - private float lastAngle = 0; - - public BusArcView(Context context) { - this(context, null); - } - - public BusArcView(Context context, @Nullable AttributeSet attrs) { - this(context, attrs, 0); - } - - public BusArcView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - //初始化paint - initPaint(); - //绘制弧度 - drawArc(canvas); - //绘制文本 - drawText(canvas); - } - - private void drawText(Canvas canvas) { - Rect mRect = new Rect(); - String mValue = String.valueOf(currentValue); - mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); - //绘制中心的数值 - mTextPaint.getTextBounds(mValue, 0, mValue.length(), mRect); - canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2 - 10, mTextPaint); - - mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); - //绘制中心文字描述 - mTextPaint.setTextSize(getResources().getDimension(R.dimen.sweeper_ext_arcView_des_text_size)); - mTextPaint.getTextBounds(mDes, 0, mDes.length(), mRect); - canvas.drawText(mDes, getWidth() / 2, getHeight() * 17 / 20 + mRect.height() / 2, mTextPaint); - } - - private void drawArc(Canvas canvas) { - //绘制圆弧背景 - RectF mRectF = new RectF(mStrokeWith, mStrokeWith, getWidth() - mStrokeWith, getHeight() - mStrokeWith); - canvas.drawArc(mRectF, 135, mAngle, false, mArcPaint); - - //绘制当前数值对应的圆弧 - mArcPaint.setColor(mArcColor); - //根据当前数据绘制对应的圆弧 - canvas.drawArc(mRectF, 135, mIncludedAngle, false, mArcPaint); - } - - private void initPaint() { - //圆弧的paint - mArcPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - //抗锯齿 - mArcPaint.setAntiAlias(true); - mArcPaint.setColor(Color.parseColor("#151D4C")); - //设置透明度（数值为0-255） - mArcPaint.setAlpha(100); - //设置画笔的画出的形状 - mArcPaint.setStrokeJoin(Paint.Join.ROUND); - mArcPaint.setStrokeCap(Paint.Cap.ROUND); - //设置画笔类型 - mArcPaint.setStyle(Paint.Style.STROKE); - //画笔宽度 - mArcPaint.setStrokeWidth(mStrokeWith); - - //中心文字的paint - mTextPaint = new Paint(); - mTextPaint.setAntiAlias(true); - mTextPaint.setColor(Color.parseColor("#FFFFFF")); - //设置文本的对齐方式 - mTextPaint.setTextAlign(Paint.Align.CENTER); - //mTextPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_12)); - mTextPaint.setTextSize(getResources().getDimension(R.dimen.sweeper_ext_arcView_center_text_size)); - - } - - - /** - * 为绘制弧度及数据设置动画 - * - * @param startAngle 开始的弧度 - * @param currentAngle 需要绘制的弧度 - * @param time 动画执行的时长 - */ - private void setAnimation(float startAngle, float currentAngle, int time) { - //绘制当前数据对应的圆弧的动画效果 - ValueAnimator progressAnimator = ValueAnimator.ofFloat(startAngle, currentAngle); - progressAnimator.setDuration(time); - progressAnimator.setTarget(mIncludedAngle); - progressAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - mIncludedAngle = (float) animation.getAnimatedValue(); - //重新绘制，不然不会出现效果 - postInvalidate(); - } - }); - //开始执行动画 - progressAnimator.start(); - } - - - /** - * 设置弧形颜色 - * - * @param value 颜色值 - */ - public void setArcColor(int value) { - mArcColor = value; - } - - /** - * 设置数据 - * - * @param value 当前绘制的值 - */ - public void setValues(int value) { - //完全覆盖 - if (value > maxValue) { - value = maxValue; - } - if (value < 0) { - value = 0; - } - currentValue = value; - //计算弧度比重 - float scale = (float) currentValue / maxValue; - //计算弧度 - float currentAngle = scale * mAngle; - //开始执行动画 - setAnimation(lastAngle, currentAngle, 1000); - lastAngle = currentAngle; - //重新绘制 - postInvalidate(); - } - - - private float dp2px(float dp) { - DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics(); - return dp * metrics.density; - } -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java deleted file mode 100644 index 2bdbd938e0..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mogo.och.sweeper.view; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.MotionEvent; - -import androidx.constraintlayout.widget.ConstraintLayout; - -/** - * 强制拦截所有touch时间的约束布局 - * - * @author tongchenfei - */ -public class NoTouchConstraintLayout extends ConstraintLayout { - private boolean interceptTouchEvent = false; - - public NoTouchConstraintLayout(Context context) { - super(context); - } - - public NoTouchConstraintLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public NoTouchConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - if (interceptTouchEvent) { - return true; - } - return false; - } - - /** - * 设置事件拦截 - * - * @param interceptTouchEvent - */ - public void setInterceptTouchEvent(boolean interceptTouchEvent) { - this.interceptTouchEvent = interceptTouchEvent; - } -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java deleted file mode 100644 index 48b45b27af..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.mogo.och.sweeper.view; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.widget.FrameLayout; - -/** - * 强制拦截所有touch时间的约束布局 - * - * @author tongchenfei - */ -public class NoTouchFrameLayout extends FrameLayout { - public NoTouchFrameLayout(Context context) { - super(context); - } - - public NoTouchFrameLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public NoTouchFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - return false; - } -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java deleted file mode 100644 index 875722ea11..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.mogo.och.sweeper.view; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.DashPathEffect; -import android.graphics.LinearGradient; -import android.graphics.Paint; -import android.graphics.Path; -import android.graphics.Shader; -import android.util.AttributeSet; -import android.view.View; - -import androidx.annotation.Nullable; - -/** - * 垂直虚线 - * - * @author tongchenfei - */ -public class VerticalDashLineView extends View { - public VerticalDashLineView(Context context) { - this(context,null); - } - - public VerticalDashLineView(Context context, @Nullable AttributeSet attrs) { - this(context, attrs,0); - } - - public VerticalDashLineView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - init(); - } - - private final Paint linePaint = new Paint(Paint.ANTI_ALIAS_FLAG); - private final Path dashPath = new Path(); - - private void init(){ - linePaint.setColor(Color.GREEN); - linePaint.setStyle(Paint.Style.STROKE); - linePaint.setStrokeWidth(2); - linePaint.setPathEffect(new DashPathEffect(new float[]{5, 5}, 0)); - } - - public void setGradient(int startColor, int endColor) { - LinearGradient linearGradient = new LinearGradient(0, 0, getWidth(), getHeight(), startColor, endColor, Shader.TileMode.CLAMP); - linePaint.setShader(linearGradient); - invalidate(); - } - - public void setColor(int color) { - linePaint.setShader(null); - linePaint.setColor(color); - invalidate(); - } - - @Override - protected void onDraw(Canvas canvas) { - dashPath.reset(); - dashPath.moveTo((float) getWidth()/2, 0); - dashPath.lineTo((float) getWidth()/2,getHeight()); - canvas.drawPath(dashPath,linePaint); - } -} diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt deleted file mode 100644 index c6082d34cf..0000000000 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt +++ /dev/null @@ -1,344 +0,0 @@ -package com.mogo.och.sweeper.view - -import android.content.Context -import android.graphics.Color -import android.os.Bundle -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.widget.ImageView -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.ContextCompat -import com.amap.api.maps.AMap -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener -import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.CoordinateUtils -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweeper.constant.SweeperConst -import com.mogo.och.sweeper.database.bean.WeltDataBean -import com.mogo.och.sweeper.util.SweeperMapAssetStyleUtil -import kotlinx.android.synthetic.main.sweeper_welt_small_map_view.view.* - - -/** - * 作业任务小地图 - */ -class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { - private var mTaskCoordinatesLatLng: MutableList = mutableListOf() //当前大任务的所有起终点集合 - private var mCarMarker: Marker? = null - private var mAMap: AMap? = null - private var mWeltPolylines: Polyline? = null - private var mRoutePolylines: Polyline?=null -// private val mLineMarkers: MutableList = mutableListOf() - private var endStationMarker:Marker? = null - - //清扫车任务地图 - private val TAG = "WeltMapView" - - constructor(context: Context) : super(context) {} - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { - initView(context) - } - - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {} - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {} - - private fun initView(context: Context) { - LayoutInflater.from(context).inflate(R.layout.sweeper_welt_small_map_view, this) - initAMapView() - // 注册定位监听 - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this) - CallerChassisLocationGCJ02ListenerManager.setListenerHz(TAG,5) - } - - override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { - d(SceneConstant.M_SWEEPER + TAG, "mogoLocation：$mogoLocation") - ThreadUtils.getSinglePool().run { - mogoLocation?.let { - val currentLatLng = LatLng(it.latitude, it.longitude) - drawCarMarker(mogoLocation) - //圈定地图显示范围 - val boundsBuilder = LatLngBounds.Builder() - if (mTaskCoordinatesLatLng.size > 0) { - //存放经纬度 - for (i in mTaskCoordinatesLatLng.indices) { - boundsBuilder.include(mTaskCoordinatesLatLng[i]) - } - } - mRoutePolylines?.points?.forEach {latLng-> - boundsBuilder.include(latLng) - } - boundsBuilder.include(currentLatLng) - mAMap!!.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(), 100, 100, 100, 100)) - } - } - } - - /** - * 绘制自车 - * - * @param location - */ - private fun drawCarMarker(location: MogoLocation?) { - if (location == null) return - val currentLatLng = LatLng(location.latitude, location.longitude) - //更新车辆位置 - if (mCarMarker != null) { - mCarMarker!!.rotateAngle = (360 - location.heading).toFloat() - mCarMarker!!.position = currentLatLng - mCarMarker!!.setToTop() - } - } - - private fun initAMapView() { - mAMap = sweeperSmallTextureMapView?.map - // 地图文字标注 - mAMap?.showMapText(true) - // 设置导航地图模式，aMap是地图控制器对象。 - mAMap?.mapType = AMap.MAP_TYPE_NIGHT - // 关闭显示实时路况图层，aMap是地图控制器对象。 - mAMap?.isTrafficEnabled = false - // 设置 锚点 图标 - mCarMarker = mAMap?.addMarker( - MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_car_small)) - .anchor(0.5f, 0.5f) - ) - // 设置地图的样式 - val uiSettings = mAMap?.uiSettings - uiSettings?.isZoomControlsEnabled = false // 地图缩放级别的交换按钮 - uiSettings?.setAllGesturesEnabled(false) // 所有手势 - uiSettings?.isMyLocationButtonEnabled = false // 显示默认的定位按钮 - uiSettings?.setLogoBottomMargin(-150) //设置Logo下边界距离屏幕底部的边距,设置为负值即可 - // 加载自定义样式 - val customMapStyleOptions = CustomMapStyleOptions() - .setEnable(true) - .setStyleData(SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) - .setStyleExtraData(SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) - // 设置自定义样式 - mAMap?.setCustomMapStyle(customMapStyleOptions) - mAMap?.setOnMapLoadedListener(AMap.OnMapLoadedListener { - d(SceneConstant.M_SWEEPER + TAG, "WeltView---onMapLoaded") - // 加载自定义样式 - val customMapStyleOptions = CustomMapStyleOptions() - .setEnable(true) - .setStyleData(SweeperMapAssetStyleUtil.getAssetsStyle(context, "map_style.data")) - .setStyleExtraData(SweeperMapAssetStyleUtil.getAssetsExtraStyle(context, "map_style_extra.data")) - // 设置自定义样式 - mAMap?.setCustomMapStyle(customMapStyleOptions) - mAMap?.setPointToCenter(sweeperSmallTextureMapView.width / 2, sweeperSmallTextureMapView.height / 2) - }) - } - - /** - * 根据贴边数据绘制任务路线 - */ - private fun drawablePolyline(weltDatas: MutableList?) { - weltDatas?.let { - val colorList = getRouteColorList(it) - val coordinatesLatLngs = mutableListOf() - for (i in it.indices) { - coordinatesLatLngs.add(LatLng(it[i].locLat,it[i].locLon)) - } - if (coordinatesLatLngs.size > 2) { - //设置线段纹理 - mWeltPolylines?.remove() - val polylineOptions = PolylineOptions() - polylineOptions.addAll(coordinatesLatLngs) - polylineOptions.width(14f) //线段宽度 - polylineOptions.isUseTexture = false - polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare) - polylineOptions.colorValues(colorList) - polylineOptions.visible(true) - // 绘制线 - mWeltPolylines = mAMap?.addPolyline(polylineOptions) - } - } - } - - /** - * 添加画线颜色值 - */ - private fun getRouteColorList(weltData: MutableList): MutableList { - val colorList = mutableListOf() - var nextWeltDataBean: WeltDataBean?=null - for (i in weltData.indices) { - val weltDataBean = weltData[i] - if(i+110){ - colorList.add(Color.TRANSPARENT) - continue - } - } - - if (weltDataBean.weltDistance == SweeperConst.NONWELT) {//非贴边 - colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) - } else if (weltDataBean.weltDistance < 0) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) - } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.1) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4)) - } else if (weltDataBean.weltDistance >= 0.1 && weltDataBean.weltDistance < 0.2) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d)) - } else if (weltDataBean.weltDistance >= 0.2) { - colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b)) - } - } - return colorList - } - - /** - * 添加起点和终点的marker - */ - private fun addStartAndEndMarker(startPoint: LatLng, endPoint: LatLng) { -// for (i in mLineMarkers.indices) { -// mLineMarkers[i]?.isVisible = false -// mLineMarkers[i]?.remove() -// } -// mLineMarkers.clear() -// val startMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_start_marker_icon))) -// startMarker?.position = startPoint -// mLineMarkers.add(startMarker) -// val endMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_end_marker_icon))) -// endMarker?.position = endPoint -// mLineMarkers.add(endMarker) - } - - /** - * 设置当前大任务的所有子任务起终点集合 - */ - fun setTaskListCoordinatesLatLng(coordinatesLatLng: MutableList) { - this.mTaskCoordinatesLatLng = coordinatesLatLng -// if (mTaskCoordinatesLatLng.size > 0) { -// d( -// SceneConstant.M_SWEEPER + TAG, -// "startPoint：${mTaskCoordinatesLatLng[0]} endPoint：${mTaskCoordinatesLatLng[mTaskCoordinatesLatLng.size - 1]}" -// ) -// addStartAndEndMarker(mTaskCoordinatesLatLng[0], mTaskCoordinatesLatLng[mTaskCoordinatesLatLng.size - 1]) -// } - } - - /** - * 设置当前大任务的所有子任务起终点集合 - */ - fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) { - endStationMarker?.remove() - endStationMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_end_marker_icon))) - endStationMarker?.position = coordinatesLatLng - } - - /** - * 清除所有标记和路线 - */ - fun clearAllMarkerAndPolyline() { -// for (i in mLineMarkers.indices) { -// mLineMarkers[i]?.isVisible = false -// mLineMarkers[i]?.remove() -// } - endStationMarker?.remove() - mWeltPolylines?.remove() -// mLineMarkers.clear() - mRoutePolylines?.remove() - //mFirst = false - //showOrHiddenWelt(false) - } - - fun getSwitchToBig(): ImageView = sweeperSwitchToBig - - /** - * 显示或隐藏贴边 - */ - private fun showOrHiddenWelt(isShow: Boolean) { - taskProgressTv.visibility = if (isShow) View.VISIBLE else View.GONE - taskWeltDistanceTv.visibility = if (isShow) View.VISIBLE else View.GONE - } - - /** - * 设置贴边数据 - */ - fun setWeltData(weltDatas: MutableList, isWeltData: Boolean, distance: String) { - drawablePolyline(weltDatas) - ThreadUtils.runOnUiThread { - setWeltDistance(distance) - } - //if (!mFirst&&isWeltData) { - // showOrHiddenWelt(true) - // mFirst = true - //} - } - - /** - * 设置贴边距离 - */ - private fun setWeltDistance(distance: String) { - taskWeltDistanceTv.text = "贴边:${distance}" - } - - /** - * 设置任务轨迹数据 - */ - fun setRouteList(routeList: ArrayList) { - val routeCoordinatesLatLngs = mutableListOf() - for (i in routeList.indices) { - routeCoordinatesLatLngs.add(LatLng(routeList[i].latitude, routeList[i].longitude)) - } - ThreadUtils.runOnUiThread { - drawRouteListPolyline(routeCoordinatesLatLngs) - } - } - - private fun drawRouteListPolyline(routeList: MutableList) { - mRoutePolylines?.remove() - val polylineOptions = PolylineOptions() - polylineOptions.addAll(routeList) - polylineOptions.width(14f) //线段宽度 - polylineOptions.isUseTexture = false - polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare) - polylineOptions.color(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) - polylineOptions.visible(true) - mRoutePolylines=mAMap?.addPolyline(polylineOptions) - } - - /** - * 设置任务进度 - */ - fun setTaskProgress(progress: String?) { - if (progress == "0") { - taskWeltDistanceTv.visibility = View.GONE - taskProgressTv.visibility = View.GONE - } else { - taskWeltDistanceTv.visibility = View.VISIBLE - taskProgressTv.visibility = View.VISIBLE - taskProgressTv.text = progress - } - - } - - fun onCreateView(savedInstanceState: Bundle?) { - sweeperSmallTextureMapView?.onCreate(savedInstanceState) - } - - fun onResume() { - sweeperSmallTextureMapView?.onResume() - } - - fun onPause() { - sweeperSmallTextureMapView?.onPause() - } - - fun onDestroy() { - sweeperSmallTextureMapView?.onDestroy() - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png deleted file mode 100644 index 1140726f3f..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png deleted file mode 100644 index 943c88912d..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png deleted file mode 100755 index e98738b192..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_battery.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_battery.png deleted file mode 100644 index 5fee53445e..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_battery.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box.png deleted file mode 100644 index eaf471cf4c..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png deleted file mode 100644 index fd84812942..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png deleted file mode 100644 index 4939b986fe..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png deleted file mode 100644 index 96bf7d213a..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png deleted file mode 100644 index 75dc6a3497..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_select.png deleted file mode 100644 index 026549d193..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_select.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/no_task_data.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/no_task_data.png deleted file mode 100644 index 3a30c8efe8..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/no_task_data.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png deleted file mode 100644 index ed7b293b90..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png deleted file mode 100644 index 6349c77a8c..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png deleted file mode 100644 index 32151e5ada..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png deleted file mode 100644 index 438ee2136a..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png deleted file mode 100644 index ba3747994c..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png deleted file mode 100644 index b30095f4c9..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png deleted file mode 100644 index c3762f55bb..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png deleted file mode 100755 index ac5d521078..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png deleted file mode 100755 index 34456d135f..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png deleted file mode 100644 index cd3c35fe82..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png deleted file mode 100644 index 56525e7ed2..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png deleted file mode 100755 index 2b220e1513..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png deleted file mode 100755 index 3ceca7609c..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png deleted file mode 100644 index f39894922d..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png deleted file mode 100755 index 6da7b81fe4..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png deleted file mode 100755 index c0a978fc2b..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png deleted file mode 100755 index 22f88301f9..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png deleted file mode 100755 index d17834748b..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png deleted file mode 100755 index 73b03bc1f3..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png deleted file mode 100755 index dc4c4f6f0d..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png deleted file mode 100755 index ed3b871338..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png deleted file mode 100644 index 2b677df25f..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png deleted file mode 100644 index bae01408fd..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_line.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_line.png deleted file mode 100755 index 570b54f1be..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_line.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png deleted file mode 100644 index 0ff5309fab..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png deleted file mode 100644 index a3c3c32558..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png deleted file mode 100644 index a720a532ea..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png deleted file mode 100644 index ba41bf3a53..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png deleted file mode 100755 index 72a8664bef..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png deleted file mode 100755 index a765e75a41..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png deleted file mode 100644 index 44eeb23a8f..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png deleted file mode 100644 index b7cbac3f43..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png deleted file mode 100644 index 67c4ded462..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png deleted file mode 100755 index dbeae7fe2e..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png deleted file mode 100755 index cf3e5a3778..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png deleted file mode 100644 index bdc2725468..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png deleted file mode 100755 index 4ce0d75174..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png deleted file mode 100755 index 7c75d1e495..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png deleted file mode 100644 index 14a358eb90..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png deleted file mode 100755 index 45af8b7997..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png deleted file mode 100755 index f5bd232a66..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png deleted file mode 100644 index f68278023c..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png deleted file mode 100644 index 0114bb4f2b..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png deleted file mode 100644 index 05e741771b..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png deleted file mode 100644 index 74ffe011f8..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png deleted file mode 100644 index ae19bd2d81..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png deleted file mode 100644 index b6c41d676e..0000000000 Binary files a/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png and /dev/null differ diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_bubble.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_bubble.xml deleted file mode 100644 index 9533060ae5..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_bubble.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_clean_mode.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_clean_mode.xml deleted file mode 100644 index 57588e065f..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_clean_mode.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml deleted file mode 100644 index e6970921d5..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml deleted file mode 100644 index bd0ab9d1e1..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml deleted file mode 100644 index 7fc3db37cc..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_panel.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_panel.xml deleted file mode 100644 index 3a6f72848e..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_panel.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml deleted file mode 100644 index c808b231e8..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_working.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_working.xml deleted file mode 100644 index ad4e25124f..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_working.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml deleted file mode 100644 index 8455e0cafb..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml deleted file mode 100644 index 3de0910dcd..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml deleted file mode 100644 index 16e880f1a2..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml deleted file mode 100644 index ec0eeb317b..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml deleted file mode 100644 index 4e57ba75b0..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/bg_task_menu.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_task_menu.xml deleted file mode 100644 index 1df3248028..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/bg_task_menu.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/icon_more.xml b/OCH/sweeper/sweeper/src/main/res/drawable/icon_more.xml deleted file mode 100644 index 3d348cf41a..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/icon_more.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml deleted file mode 100755 index b0d14bd0c6..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml deleted file mode 100755 index 0ad963da07..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml deleted file mode 100644 index fe190c59ee..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_collect_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_collect_selector.xml deleted file mode 100644 index 8ed41c58fb..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_collect_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend1.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend1.xml deleted file mode 100644 index 3698943bc9..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend1.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend2.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend2.xml deleted file mode 100644 index d521b0a45d..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend2.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend3.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend3.xml deleted file mode 100644 index 59edb172fa..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend3.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend4.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend4.xml deleted file mode 100644 index 2a4efb7072..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend4.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend5.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend5.xml deleted file mode 100644 index c3ac48e545..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend5.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend6.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend6.xml deleted file mode 100644 index a8b8ac1b06..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend6.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml deleted file mode 100644 index 9d92ddd223..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_message_box.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_message_box.xml deleted file mode 100644 index 64c1e9d72e..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_message_box.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml deleted file mode 100644 index ba7719ba91..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml deleted file mode 100755 index c51538216c..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml deleted file mode 100644 index 4d612cb98f..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml deleted file mode 100755 index 996c623455..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml deleted file mode 100644 index 647222f919..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml deleted file mode 100644 index 7728783fa7..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml deleted file mode 100644 index a0be0f0b9e..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml deleted file mode 100644 index 21b39b7e37..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_bkg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_bkg.xml deleted file mode 100644 index 69539ed40f..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_bkg.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_refresh.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_refresh.xml deleted file mode 100644 index 58e3089f6f..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_refresh.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml deleted file mode 100644 index 142a5bc514..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_setting_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_setting_selector.xml deleted file mode 100644 index a6d5c8df82..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_setting_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml deleted file mode 100644 index ff80eb9103..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml deleted file mode 100644 index f43c213363..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml deleted file mode 100644 index 70950d6361..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml deleted file mode 100644 index 943ebcac05..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml deleted file mode 100644 index 9acad62868..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml deleted file mode 100644 index 3a4b699d93..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml deleted file mode 100644 index b00fbd8bd6..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml deleted file mode 100644 index 55353f3ca8..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_water_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_water_selector.xml deleted file mode 100755 index 9c959df076..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_water_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_left_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_left_selector.xml deleted file mode 100755 index 45c8f084e4..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_left_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_right_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_right_selector.xml deleted file mode 100755 index 97e3b8de55..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_right_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml b/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml deleted file mode 100644 index c6fca84ec2..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_no_title.xml b/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_no_title.xml deleted file mode 100644 index 4ed2048fdd..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_no_title.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_amap_navi_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_amap_navi_view.xml deleted file mode 100644 index 4653dc9dcf..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_amap_navi_view.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_legend.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_legend.xml deleted file mode 100644 index cb9c40f195..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_legend.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_task_info.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_task_info.xml deleted file mode 100644 index 69ec1c1128..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_task_info.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_limiting_speed.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_limiting_speed.xml deleted file mode 100644 index 1938d21ff5..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_limiting_speed.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_operate_panel_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_operate_panel_view.xml deleted file mode 100644 index 5c4e019611..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_operate_panel_view.xml +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_task_menu.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_task_menu.xml deleted file mode 100644 index f62a58d93c..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_task_menu.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_test_bar_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_test_bar_view.xml deleted file mode 100644 index 4322fdf328..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_test_bar_view.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_light_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_light_view.xml deleted file mode 100644 index dd319f141c..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_light_view.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_turn_signal.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_turn_signal.xml deleted file mode 100644 index 6ad67d647f..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_turn_signal.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_map_overview.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_map_overview.xml deleted file mode 100644 index 16a9957c97..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_map_overview.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml deleted file mode 100644 index 515958f87d..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_work_mode.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_work_mode.xml deleted file mode 100644 index f2e743be58..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_work_mode.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/values/attrs.xml b/OCH/sweeper/sweeper/src/main/res/values/attrs.xml deleted file mode 100644 index 396db92f74..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/values/attrs.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/values/dimens.xml b/OCH/sweeper/sweeper/src/main/res/values/dimens.xml deleted file mode 100644 index 8cc4e2b53a..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/values/dimens.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - 300dp - 348dp - 211dp - 276dp - - - 220dp - 98dp - 159dp - - 32dp - 20dp - 26dp - 42dp - - 15dp - - 20dp - 36dp - 28dp - 36dp - - 3dp - 3dp - 17dp - 17dp - - - 300dp - 270dp - 30dp - 24dp - 24dp - 1dp - 30dp - 23dp - 30dp - 146dp - 20dp - 23dp - 30dp - 23dp - 26dp - 34dp - 20dp - 80dp - 3dp - 34dp - 20dp - 28dp - 27dp - - 25.6dp - 20dp - 20dp - 64dp - 16dp - - 40dp - 40dp - 46dp - 24dp - - 530dp - 492dp - - 20dp - 20dp - 70dp - 130dp - 93dp - 150dp - 70dp - - 24dp - 616dp - 180dp - - 112dp - 112dp - - 92dp - - 30dp - 616dp - 754dp - - 40dp - 13dp - 12dp - 350dp - - 460dp - 30dp - - 110dp - 40dp - 320dp - 20dp - 40dp - 320dp - 460dp - 70dp - 460dp - 130dp - 30dp - - 10dp - 20dp - 200dp - 52dp - 65dp - 20dp - 50dp - 20dp - 38dp - 33dp - 368dp - 76dp - 60dp - - 276dp - 112dp - 22dp - 36dp - 50dp - 822dp - - 46dp - 700dp - 120dp - 560dp - 116dp - 50dp - - 225dp - 154dp - 60dp - 40dp - 23dp - 210dp - 120dp - 15dp - 17dp - 140dp - 130dp - 60dp - - 13dp - 32dp - \ No newline at end of file diff --git a/OCH/sweeper/sweeper/src/main/res/values/strings.xml b/OCH/sweeper/sweeper/src/main/res/values/strings.xml deleted file mode 100644 index 825239b64f..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/values/strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 近距视角 - 远距视角 - 启动中… - 启动成功 - 启动失败 - 自动驾驶 - 路线列表 - 路线: - 起点: - 终点: - 确认 - 准备出发 - 自动驾驶中，不可切换路线 - 当前行程未完成，不可切换路线 - 当前暂无任务 - 起点: - 终点: - 更换路线成功 - 更换路线失败 - 起点： - 终点： - 当前站点： - 下一站： - 自动驾驶状态为0不可用 - 预计等待%d秒 - 请保持档位在N档并拉起手刹后启动自动驾驶 - diff --git a/OCH/sweeper/sweeper/src/main/res/values/style.xml b/OCH/sweeper/sweeper/src/main/res/values/style.xml deleted file mode 100644 index 1f8f971a41..0000000000 --- a/OCH/sweeper/sweeper/src/main/res/values/style.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/OCH/sweeper/sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt b/OCH/sweeper/sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt deleted file mode 100644 index 1afdb5acad..0000000000 --- a/OCH/sweeper/sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.och.sweeper - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file 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 15da63986b..e2bad9d7a3 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'