diff --git a/OCH/sweeper/sweeper-cloud/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json b/OCH/sweeper/sweeper-cloud/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json deleted file mode 100644 index a9451322a4..0000000000 --- a/OCH/sweeper/sweeper-cloud/schemas/com.mogo.och.sweeper.database.MyDataBase/1.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "0897ef4b7b6a43fccf8bcf4b2144dafa", - "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)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "subTaskId", - "columnName": "subTaskId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "locLon", - "columnName": "locLon", - "affinity": "REAL", - "notNull": true - }, - { - "fieldPath": "locLat", - "columnName": "locLat", - "affinity": "REAL", - "notNull": true - }, - { - "fieldPath": "weltDistance", - "columnName": "weltDistance", - "affinity": "REAL", - "notNull": true - }, - { - "fieldPath": "cleanMode", - "columnName": "cleanMode", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "cleanDirection", - "columnName": "cleanDirection", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "cleanIntensity", - "columnName": "cleanIntensity", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_welt_data_table_id", - "unique": true, - "columnNames": [ - "id" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_welt_data_table_id` ON `${TABLE_NAME}` (`id`)" - } - ], - "foreignKeys": [] - } - ], - "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')" - ] - } -} \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/assets/map_style.data b/OCH/sweeper/sweeper-cloud/src/main/assets/map_style.data deleted file mode 100644 index b200669659..0000000000 Binary files a/OCH/sweeper/sweeper-cloud/src/main/assets/map_style.data and /dev/null differ diff --git a/OCH/sweeper/sweeper-cloud/src/main/assets/map_style_extra.data b/OCH/sweeper/sweeper-cloud/src/main/assets/map_style_extra.data deleted file mode 100644 index 7aa8fa7b45..0000000000 Binary files a/OCH/sweeper/sweeper-cloud/src/main/assets/map_style_extra.data and /dev/null differ 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/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/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/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/layout/sweeper_operate_panel_view.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_operate_panel_view.xml deleted file mode 100644 index 5312020968..0000000000 --- a/OCH/sweeper/sweeper-cloud/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-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/layout/sweeper_welt_map_overview.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_welt_map_overview.xml deleted file mode 100644 index e51070b285..0000000000 --- a/OCH/sweeper/sweeper-cloud/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-cloud/src/main/res/layout/sweeper_work_mode.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_work_mode.xml deleted file mode 100644 index 34be95b606..0000000000 --- a/OCH/sweeper/sweeper-cloud/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-cloud/AutopilotModeConfig.json b/OCH/sweeper/sweeper/AutopilotModeConfig.json similarity index 100% rename from OCH/sweeper/sweeper-cloud/AutopilotModeConfig.json rename to OCH/sweeper/sweeper/AutopilotModeConfig.json diff --git a/OCH/sweeper/sweeper-cloud/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json b/OCH/sweeper/sweeper/schemas/com.mogo.och.sweepercloud.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/sweeper/schemas/com.mogo.och.sweepercloud.database.MyDataBase/1.json diff --git a/OCH/sweeper/sweeper/src/main/AndroidManifest.xml b/OCH/sweeper/sweeper/src/main/AndroidManifest.xml index c2a6c2cfeb..c994932e50 100644 --- a/OCH/sweeper/sweeper/src/main/AndroidManifest.xml +++ b/OCH/sweeper/sweeper/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ - + diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index ac2436d4f6..703b86f0f6 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -9,8 +9,8 @@ import androidx.fragment.app.FragmentManager; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.sweeper.constant.SweeperConst; -import com.mogo.och.sweeper.fragment.SweeperFragment; +import com.mogo.och.sweeper.common.constant.SweeperConst; +import com.mogo.och.sweeper.operate.fragment.SweeperFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperTabFragment.java similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperTabFragment.java index 6da04fafed..b841045dfe 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperTabFragment.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,15 @@ 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.operate.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.SweeperTrafficDataView; +import com.mogo.och.sweeper.common.view.WeltSmallMapView; import com.zhjt.mogo.adas.data.AiCloudTask; import java.math.BigDecimal; @@ -101,7 +101,7 @@ public abstract class BaseSweeperTabFragment) { + override fun setTaskRouteList(routeList: ArrayList) { super.setTaskRouteList(routeList) } @@ -733,7 +731,7 @@ class SweeperFragment : BaseSweeperTabFragment 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 +66,13 @@ 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?, + sweeperFragment: SweeperFragment ): WeltMapOverViewFragment { val args = Bundle() args.putSerializable("weltDataList", weltDataList) @@ -119,7 +118,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-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperTaskModel.java similarity index 92% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperTaskModel.java index 2b749ff5ed..9d9e429b53 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperTaskModel.java @@ -1,7 +1,7 @@ -package com.mogo.och.sweepercloud.model; +package com.mogo.och.sweeper.cloud.model; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER; -import static com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.printMessage; +import static com.mogo.och.sweeper.cloud.util.SweeperCloudTaskUtils.printMessage; import android.content.Context; @@ -32,13 +32,13 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler; 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.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean; -import com.mogo.och.sweepercloud.callback.ISweeperCloudTaskCallback; -import com.mogo.och.sweepercloud.callback.ISweeperControllerStatusCallback; -import com.mogo.och.sweepercloud.constant.SweeperConst; -import com.mogo.och.sweepercloud.database.MyDataBase; -import com.mogo.och.sweepercloud.database.bean.WeltDataBean; -import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils; +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.constant.SweeperConst; +import com.mogo.och.sweeper.common.database.MyDataBase; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; +import com.mogo.och.sweeper.cloud.util.SweeperCloudTaskUtils; import com.zhjt.mogo.adas.data.AiCloudTask; import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable; import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask; @@ -197,7 +197,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 +336,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 +348,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 +359,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 +370,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 +381,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 +393,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 +404,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 +415,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 +521,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 +538,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 +553,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 +572,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 +593,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 +612,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/sweeper/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperPresenter.java similarity index 94% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperPresenter.java index 1e4b15569d..896a46e293 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/presenter/SweeperPresenter.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.SweeperFragment; +import com.mogo.och.sweeper.cloud.model.SweeperTaskModel; 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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/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/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/SweeperOperatePanelView.java index 741b9a9e6e..e567508b12 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/SweeperOperatePanelView.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/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.cloud.ui; 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-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperCloudDialog.kt b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/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/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperManualDrivingDialog.kt index 788f2965e6..2666c1f0f1 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperManualDrivingDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.ui.dialog +package com.mogo.och.sweeper.cloud.ui.dialog 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/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/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/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperNoTitleCommonDialog.kt index 57618ccb5f..c9b26a1de9 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/dialog/SweeperNoTitleCommonDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.ui.dialog +package com.mogo.och.sweeper.cloud.ui.dialog 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-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/popwindow/SweeperOperatePanelPopWindow.kt similarity index 81% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/popwindow/SweeperOperatePanelPopWindow.kt index 4db379e1ac..347a69610d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/popwindow/SweeperOperatePanelPopWindow.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/ui/popwindow/SweeperOperatePanelPopWindow.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.ui.popwindow +package com.mogo.och.sweeper.cloud.ui.popwindow import android.content.Context import android.graphics.Color @@ -7,10 +7,10 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.PopupWindow import chassis.ChassisStatesOuterClass -import com.mogo.och.sweepercloud.R -import com.mogo.och.sweepercloud.callback.ICleaningModeStateCallback -import com.mogo.och.sweepercloud.constant.OperateStateEnum -import com.mogo.och.sweepercloud.ui.SweeperOperatePanelView +import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.common.constant.OperateStateEnum +import com.mogo.och.sweeper.cloud.ui.SweeperOperatePanelView +import com.mogo.och.sweeper.common.callback.ICleaningModeStateCallback /** * 清扫车面板浮窗 @@ -24,7 +24,7 @@ class SweeperOperatePanelPopWindow : PopupWindow{ } private fun init(context: Context) { setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - mOperatePanelView = LayoutInflater.from(context).inflate(R.layout.sweeper_popwindow_operate_panel, null) as SweeperOperatePanelView? + mOperatePanelView = LayoutInflater.from(context).inflate(R.layout.sweeper_cloud_popwindow_operate_panel, null) as SweeperOperatePanelView? width = ViewGroup.LayoutParams.WRAP_CONTENT height = ViewGroup.LayoutParams.WRAP_CONTENT contentView = mOperatePanelView diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/AutopilotModeConfigManager.java b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperAnalyticsManager.java similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperAnalyticsManager.java index dbee10c544..16222c5f0f 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperAnalyticsManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.util; +package com.mogo.och.sweeper.cloud.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.sweepercloud.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/SweeperCloudTaskUtils.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt similarity index 82% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt index ef14a2ef6a..780a9b4be5 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt +++ b/OCH/sweeper/sweeper/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,11 @@ 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.callback.SweeperCloudDialogClickListener +import com.mogo.och.sweeper.common.constant.SweeperConst +import com.mogo.och.sweeper.cloud.model.SweeperTaskModel +import com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog 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 +43,7 @@ object SweeperCloudTaskUtils { // UiThreadHandler.getsUiHandler().postDelayed({ // mockSendCloudTaskInfo(MessageType.PadSendGetTaskReq) // },1000) - SweeperTaskModel.getInstance().getCurrentTask() + com.mogo.och.sweeper.cloud.model.SweeperTaskModel.getInstance().getCurrentTask() } /** @@ -150,7 +150,7 @@ object SweeperCloudTaskUtils { // subBuilder3.lineId = 126 // subBuilder3.lineName = "测试路线3" // builder.addSubList(subBuilder3.build()) - SweeperTaskModel.getInstance().onSweeperFutianCloudTask( + com.mogo.och.sweeper.cloud.model.SweeperTaskModel.getInstance().onSweeperFutianCloudTask( messageType, "${System.currentTimeMillis()}", System.currentTimeMillis(), @@ -171,7 +171,7 @@ object SweeperCloudTaskUtils { builder.sn = getDriverSn() builder.taskId = "10" builder.subTaskId = "1" - SweeperTaskModel.getInstance().onSweeperFutianCloudTaskConfirm( + com.mogo.och.sweeper.cloud.model.SweeperTaskModel.getInstance().onSweeperFutianCloudTaskConfirm( AiCloudTask.MessageType.CloudPushTaskConfirm, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -187,7 +187,7 @@ object SweeperCloudTaskUtils { builder.taskId = "10" builder.subTaskId = "1" builder.taskStatus = SweeperCommon.TaskStatus.RUNNING - SweeperTaskModel.getInstance().onSweeperFutianCloudTaskStatus( + com.mogo.och.sweeper.cloud.model.SweeperTaskModel.getInstance().onSweeperFutianCloudTaskStatus( AiCloudTask.MessageType.CloudPushTaskStatus, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -202,7 +202,7 @@ object SweeperCloudTaskUtils { builder.sn = getDriverSn() builder.taskId = "10" builder.type = SweeperTaskStop.StopTaskType.ADVANCE - SweeperTaskModel.getInstance().onSweeperFutianCloudTaskStop( + com.mogo.och.sweeper.cloud.model.SweeperTaskModel.getInstance().onSweeperFutianCloudTaskStop( AiCloudTask.MessageType.CloudPushTaskStop, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -218,7 +218,7 @@ object SweeperCloudTaskUtils { builder.taskId = "10" builder.taskStatus = SweeperCommon.TaskStatus.FINISHED builder.systemTime = System.currentTimeMillis() - SweeperTaskModel.getInstance().onSweeperFutianCloudBigTaskStatus( + com.mogo.och.sweeper.cloud.model.SweeperTaskModel.getInstance().onSweeperFutianCloudBigTaskStatus( AiCloudTask.MessageType.CloudPushBigTaskStatus, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -235,7 +235,7 @@ object SweeperCloudTaskUtils { builder.subTaskId = "1" builder.code = SweeperCommon.Code.SUCCEED UiThreadHandler.getsUiHandler().postDelayed({ - SweeperTaskModel.getInstance().onSweeperFutianCloudBootable( + com.mogo.och.sweeper.cloud.model.SweeperTaskModel.getInstance().onSweeperFutianCloudBootable( AiCloudTask.MessageType.PadSendBootable, "${System.currentTimeMillis()}", System.currentTimeMillis(), builder.build() ) @@ -251,7 +251,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 +277,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 +291,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 +320,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 +342,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 +385,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 +404,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 +423,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 +439,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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCurrentTaskInfoView.kt similarity index 90% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCurrentTaskInfoView.kt index 3295ab76a0..f6f728f2e6 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperCurrentTaskInfoView.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,18 +10,18 @@ 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 /** * 清扫车当前任务信息展示 @@ -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) } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficDataView.kt similarity index 97% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficDataView.kt index 875b5ca82c..8dd0f48284 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficDataView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficDataView.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,7 +18,7 @@ import com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.sweepercloud.R +import com.mogo.och.sweeper.R import planning.RoboSweeperTaskIndexOuterClass import kotlin.math.roundToInt @@ -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/SweeperTrafficLightView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficLightView.kt similarity index 98% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficLightView.kt index 96a5af1933..2bcd6fb5fa 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperTrafficLightView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperTrafficLightView.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 @@ -11,7 +11,7 @@ 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 com.mogo.och.sweeper.R import kotlinx.android.synthetic.main.sweeper_traffic_light_view.view.* /** diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperWorkModeView.kt similarity index 90% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperWorkModeView.kt index 08dd7f348c..cc81ded731 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperWorkModeView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/cloud/view/SweeperWorkModeView.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,23 +9,21 @@ 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.zhjt.mogo.adas.data.sweeper.task.SweeperTask.TaskModel import kotlinx.android.synthetic.main.sweeper_work_mode.view.* /** * 清扫车模式信息展示 */ -class SweeperWorkModeView : ConstraintLayout,ICleaningModeStateCallback { +class SweeperWorkModeView : ConstraintLayout { private var isSelectPureSweepMode: Boolean = false private val TAG = "SweeperWorkModeView" //清扫模式选择面板 - private var mOperatePanelPopWindow: SweeperOperatePanelPopWindow? = null + private var mOperatePanelPopWindow: com.mogo.och.sweeper.cloud.ui.popwindow.SweeperOperatePanelPopWindow? = null private var operateState: OperateStateEnum=OperateStateEnum.SYNCING_STATUS @@ -39,14 +37,14 @@ class SweeperWorkModeView : ConstraintLayout,ICleaningModeStateCallback { private fun initView(context: Context) { LayoutInflater.from(context).inflate(R.layout.sweeper_work_mode, this) - mOperatePanelPopWindow = SweeperOperatePanelPopWindow(context) + mOperatePanelPopWindow = com.mogo.och.sweeper.cloud.ui.popwindow.SweeperOperatePanelPopWindow(context) setShowOrHideCleanSystemState(OperateStateEnum.SYNCING_STATUS,null) } /** * 设置view */ - fun setTrafficDataView(trafficDataView: SweeperTrafficDataView){ + fun setTrafficDataView(trafficDataView: com.mogo.och.sweeper.cloud.view.SweeperTrafficDataView){ //清扫模式选择面板打开关闭处理 ivOpenOperatePanel.setOnClickListener { if (mOperatePanelPopWindow?.isShowing != true) { @@ -126,7 +124,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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/constant/OperateStateEnum.kt b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperFutianCmdUtil.java b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/view/TurnSignalView.kt b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/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/bean/BaseResponse.java b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperTaskCallback.kt similarity index 59% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperTaskCallback.kt index 377eb91145..b43d46a728 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/ISweeperTaskCallback.kt @@ -1,11 +1,11 @@ -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 /** @@ -16,12 +16,12 @@ interface ISweeperTaskCallback { /** * 获取主任务列表 */ - 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-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/IWeltMapSwitchToSmallCallback.kt similarity index 62% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/IWeltMapSwitchToSmallCallback.kt index 20748b003b..c7aa05acf7 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/IWeltMapSwitchToSmallCallback.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/callback/IWeltMapSwitchToSmallCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.callback +package com.mogo.och.sweeper.operate.callback interface IWeltMapSwitchToSmallCallback { fun onWeltMapSwitchToSmall() diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/event/WeltDataEvent.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/event/WeltDataEvent.java similarity index 92% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/event/WeltDataEvent.java index f294bae32a..774fdb071c 100644 --- 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/operate/event/WeltDataEvent.java @@ -1,7 +1,7 @@ -package com.mogo.och.sweeper.event; +package com.mogo.och.sweeper.operate.event; import com.amap.api.maps.model.LatLng; -import com.mogo.och.sweeper.database.bean.WeltDataBean; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; import java.util.ArrayList; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperTabFragment.java similarity index 98% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperTabFragment.java index cb8754febb..6a277033b4 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperTabFragment.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,12 @@ 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.operate.callback.IWeltMapSwitchToSmallCallback; +import com.mogo.och.sweeper.common.database.bean.WeltDataBean; +import com.mogo.och.sweeper.operate.view.SweeperTrafficDataView; +import com.mogo.och.sweeper.common.view.WeltSmallMapView; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/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/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperUIFragment.java index 3ee40b9134..b21d23e05d 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperUIFragment.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; diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperAmapNaviFragment.java similarity index 96% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperAmapNaviFragment.java index 17213ac1d1..46893733cc 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperAmapNaviFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepercloud.fragment; +package com.mogo.och.sweeper.operate.fragment; import android.os.Bundle; import android.view.View; @@ -8,7 +8,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.common.module.map.AmapNaviToDestinationModel; import com.mogo.och.common.module.map.CommonAmapNaviVIew; import com.mogo.och.common.module.map.ICommonNaviChangedCallback; -import com.mogo.och.sweepercloud.R; +import com.mogo.och.sweeper.R; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; @@ -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/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperFragment.kt similarity index 95% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperFragment.kt index de0eae391b..af40f0b6f0 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/SweeperFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.fragment +package com.mogo.och.sweeper.operate.fragment import android.graphics.Color import android.os.Bundle @@ -17,15 +17,19 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.* -import com.mogo.och.sweeper.constant.SubTaskTypeEnum -import com.mogo.och.sweeper.constant.TaskStatusEnum -import com.mogo.och.sweeper.database.MyDataBase -import com.mogo.och.sweeper.presenter.SweeperPresenter -import com.mogo.och.sweeper.ui.adapter.TaskListAdapter -import com.mogo.och.sweeper.ui.dialog.SweeperManualDrivingDialog -import com.mogo.och.sweeper.ui.dialog.SweeperNoTitleCommonDialog -import com.mogo.och.sweeper.ui.popwindow.MenuPopWindow +import com.mogo.och.sweeper.operate.bean.* +import com.mogo.och.sweeper.operate.constant.SubTaskTypeEnum +import com.mogo.och.sweeper.operate.constant.TaskStatusEnum +import com.mogo.och.sweeper.common.database.MyDataBase +import com.mogo.och.sweeper.operate.bean.SubInfo +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.presenter.SweeperPresenter +import com.mogo.och.sweeper.operate.ui.adapter.TaskListAdapter +import com.mogo.och.sweeper.operate.ui.dialog.SweeperManualDrivingDialog +import com.mogo.och.sweeper.operate.ui.dialog.SweeperNoTitleCommonDialog +import com.mogo.och.sweeper.operate.ui.popwindow.MenuPopWindow import kotlinx.android.synthetic.main.fragment_och_sweeper.* import kotlinx.android.synthetic.main.sweeper_current_task_info.view.* import kotlinx.android.synthetic.main.sweeper_no_data_common_view.* 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/operate/fragment/WeltMapOverViewFragment.kt similarity index 85% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/fragment/WeltMapOverViewFragment.kt index a34f658856..cf4e7c5f07 100644 --- 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/operate/fragment/WeltMapOverViewFragment.kt @@ -1,13 +1,13 @@ -package com.mogo.och.sweeper.fragment +package com.mogo.och.sweeper.operate.fragment import android.os.Bundle import com.amap.api.maps.model.LatLng import com.mogo.commons.mvp.BaseFragment import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean -import com.mogo.och.sweeper.callback.ISweeperTaskDataToFragmentCallback -import com.mogo.och.sweeper.callback.IWeltMapSwitchToSmallCallback -import com.mogo.och.sweeper.database.bean.WeltDataBean +import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean +import com.mogo.och.sweeper.common.callback.ISweeperTaskDataToFragmentCallback +import com.mogo.och.sweeper.operate.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.* @@ -67,13 +67,13 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall 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?, + sweeperFragment: SweeperFragment ): WeltMapOverViewFragment { val args = Bundle() args.putSerializable("weltDataList", weltDataList) diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/model/SweeperTaskModel.java similarity index 97% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/model/SweeperTaskModel.java index 5e99dd5719..a6dd43b24e 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/model/SweeperTaskModel.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.model; +package com.mogo.och.sweeper.operate.model; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER; @@ -40,21 +40,21 @@ import com.mogo.och.common.module.utils.PinYinUtil; import com.mogo.och.common.module.utils.ToastUtilsOch; import com.mogo.och.common.module.voice.VoiceNotice; import com.mogo.och.sweeper.R; -import com.mogo.och.sweeper.bean.BaseResponse; -import com.mogo.och.sweeper.bean.SubInfo; -import com.mogo.och.sweeper.bean.SweeperMainTaskBean; -import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean; -import com.mogo.och.sweeper.bean.SweeperSubTaskBean; -import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean; -import com.mogo.och.sweeper.callback.ISweeperADASStatusCallback; -import com.mogo.och.sweeper.callback.ISweeperControllerStatusCallback; -import com.mogo.och.sweeper.callback.ISweeperTaskCallback; -import com.mogo.och.sweeper.constant.SubTaskTypeEnum; -import com.mogo.och.sweeper.constant.SweeperConst; -import com.mogo.och.sweeper.constant.TaskStatusEnum; -import com.mogo.och.sweeper.net.SweeperServiceManager; -import com.mogo.och.sweeper.util.SweeperAnalyticsManager; -import com.mogo.och.sweeper.util.SweeperTrajectoryManager; +import com.mogo.och.sweeper.operate.bean.BaseResponse; +import com.mogo.och.sweeper.operate.bean.SubInfo; +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.ISweeperTaskCallback; +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.operate.net.SweeperServiceManager; +import com.mogo.och.sweeper.operate.util.SweeperAnalyticsManager; +import com.mogo.och.sweeper.operate.util.SweeperTrajectoryManager; import org.jetbrains.annotations.NotNull; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperApiService.java similarity index 88% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperApiService.java index 5522f00dae..1bf2476c8e 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/ISweeperApiService.java @@ -1,10 +1,10 @@ -package com.mogo.och.sweeper.net; -import com.mogo.och.sweeper.bean.BaseResponse; -import com.mogo.och.sweeper.bean.SubInfo; -import com.mogo.och.sweeper.bean.SubStartRequest; -import com.mogo.och.sweeper.bean.SweeperSubTaskBean; -import com.mogo.och.sweeper.bean.SweeperMainTaskBean; -import com.mogo.och.sweeper.bean.SweeperSubTaskDetailBean; +package com.mogo.och.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; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/SweeperServiceManager.kt similarity index 93% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/SweeperServiceManager.kt index 7ded92408d..5596f0cfb0 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/net/SweeperServiceManager.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,8 +10,13 @@ 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.SweeperTaskModel +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 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperPresenter.java similarity index 93% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperPresenter.java index 1a2bf393d3..a4b1a141f4 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperPresenter.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.ISweeperTaskCallback; +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.SweeperFragment; +import com.mogo.och.sweeper.operate.model.SweeperTaskModel; +import com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil; +import com.mogo.och.sweeper.operate.util.SweeperTrajectoryManager; import org.jetbrains.annotations.NotNull; @@ -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 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/operate/ui/SweeperOperatePanelView.java similarity index 96% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/SweeperOperatePanelView.java index 934cc029de..e0976ad50a 100644 --- 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/operate/ui/SweeperOperatePanelView.java @@ -1,14 +1,14 @@ -package com.mogo.och.sweeper.ui; +package com.mogo.och.sweeper.operate.ui; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_BOTH_SIDE; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_LEFT_SIDE; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_RIGHT_SIDE; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRAND; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_INTENSITY_STRONG; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_DRAW; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_SWEEP; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_MODE_PURE_WASH; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_MODE_WASH_SWEEP; import android.animation.ObjectAnimator; import android.content.Context; @@ -32,10 +32,10 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.sweeper.R; -import com.mogo.och.sweeper.callback.ICleaningModeStateCallback; -import com.mogo.och.sweeper.constant.OperateStateEnum; -import com.mogo.och.sweeper.util.SweeperFutianCmdUtil; -import com.mogo.och.sweeper.view.NoTouchConstraintLayout; +import com.mogo.och.sweeper.common.callback.ICleaningModeStateCallback; +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; @@ -44,10 +44,10 @@ import java.util.List; import chassis.ChassisStatesOuterClass; import chassis.SpecialVehicleTaskCmdOuterClass; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_CLOSE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_MODE_CLOSE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_WORK_CLOSE; -import static com.mogo.och.sweeper.util.SweeperFutianCmdUtil.CLEAN_WORK_OPEN; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_DIRECTION_CLOSE; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_MODE_CLOSE; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_WORK_CLOSE; +import static com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil.CLEAN_WORK_OPEN; /** * 清扫车操作面板View diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt similarity index 94% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/adapter/TaskListAdapter.kt index ef9aaa9a61..132a8e4154 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt +++ b/OCH/sweeper/sweeper/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,7 +42,7 @@ 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 { diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperManualDrivingDialog.kt similarity index 86% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperManualDrivingDialog.kt index 52e21df88c..b5458ed5de 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperManualDrivingDialog.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperManualDrivingDialog.kt @@ -1,10 +1,10 @@ -package com.mogo.och.sweepercloud.ui.dialog +package com.mogo.och.sweeper.operate.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 +import com.mogo.och.sweeper.R /** * 不带带有title, tip,confirm,cancel的dialog @@ -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-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperNoTitleCommonDialog.kt similarity index 86% rename from OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperNoTitleCommonDialog.kt index a2b41f4592..c20a6f811a 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/ui/dialog/SweeperNoTitleCommonDialog.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/dialog/SweeperNoTitleCommonDialog.kt @@ -1,10 +1,10 @@ -package com.mogo.och.sweepercloud.ui.dialog +package com.mogo.och.sweeper.operate.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 +import com.mogo.och.sweeper.R /** * 不带带有title, tip,confirm,cancel的dialog @@ -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/MenuPopWindow.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt similarity index 90% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/MenuPopWindow.kt index 1f2c5ad8f0..88ac8dfacd 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt +++ b/OCH/sweeper/sweeper/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 } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/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/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/SweeperOperatePanelPopWindow.kt index 1004555886..b0415e9913 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/ui/popwindow/SweeperOperatePanelPopWindow.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 @@ -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.operate.ui.SweeperOperatePanelView /** * 清扫车面板浮窗 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/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/sweeper/src/main/java/com/mogo/och/sweeper/operate/util/SweeperAnalyticsManager.java index 36d48211ad..0dfc9a3a90 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/util/SweeperAnalyticsManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweeper.util; +package com.mogo.och.sweeper.operate.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/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/SubTaskView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SubTaskView.kt similarity index 95% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SubTaskView.kt index a3d6374066..459b5d774e 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SubTaskView.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,7 +8,7 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SubInfo +import com.mogo.och.sweeper.operate.bean.SubInfo import kotlinx.android.synthetic.main.sweeper_subtask_view.view.* /** diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperCurrentTaskInfoView.kt similarity index 93% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperCurrentTaskInfoView.kt index 39fc24fd81..abc1824bdc 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperCurrentTaskInfoView.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,11 +11,11 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.sweeper.R -import com.mogo.och.sweeper.bean.SubInfo -import com.mogo.och.sweeper.bean.SweeperSubTaskBean -import com.mogo.och.sweeper.constant.SubTaskTypeEnum -import com.mogo.och.sweeper.presenter.SweeperPresenter -import com.mogo.och.sweeper.ui.popwindow.MenuPopWindow +import com.mogo.och.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.SweeperPresenter +import com.mogo.och.sweeper.operate.ui.popwindow.MenuPopWindow import kotlinx.android.synthetic.main.sweeper_current_task_info.view.* /** @@ -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,11 +66,11 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { * 设置当前任务数据 */ fun setData( - workModePanelView: SweeperWorkModeView, - subTaskBean: SweeperSubTaskBean?, - currentPosition: Int, - menuItemClickListener: MenuPopWindow.OnMenuItemOnClickListener, - presenter: SweeperPresenter? + workModePanelView: SweeperWorkModeView, + subTaskBean: SweeperSubTaskBean?, + currentPosition: Int, + menuItemClickListener: MenuPopWindow.OnMenuItemOnClickListener, + presenter: SweeperPresenter? ) { this.presenter = presenter this.mCurrentPosition = currentPosition diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficDataView.kt similarity index 98% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficDataView.kt index 3482edfd7e..6cd7225edc 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficDataView.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,6 +22,7 @@ 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 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/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/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficLightView.kt index 18ae4794f1..a2433f143c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperTrafficLightView.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 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperWorkModeView.kt similarity index 90% rename from OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperWorkModeView.kt index fae8cfd18f..47d54eb38d 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/operate/view/SweeperWorkModeView.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,26 @@ 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.operate.ui.popwindow.SweeperOperatePanelPopWindow +import com.mogo.och.sweeper.common.util.SweeperFutianCmdUtil +import com.mogo.och.sweeper.operate.view.SweeperTrafficDataView import kotlinx.android.synthetic.main.sweeper_work_mode.view.* /** * 清扫车模式信息展示 */ class SweeperWorkModeView : ConstraintLayout, - ICleaningModeStateCallback { + 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) { @@ -72,12 +73,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/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-cloud/src/main/res/drawable-xhdpi/icon_auto.png b/OCH/sweeper/sweeper/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/sweeper/src/main/res/drawable-xhdpi/icon_auto.png diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable-xhdpi/icon_manual_driving.png b/OCH/sweeper/sweeper/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/sweeper/src/main/res/drawable-xhdpi/icon_manual_driving.png diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable-xhdpi/icon_not_auto.png b/OCH/sweeper/sweeper/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/sweeper/src/main/res/drawable-xhdpi/icon_not_auto.png diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable-xhdpi/sweeper_cloud_loading.png b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/bg_shape_dialog_cloud_view.xml b/OCH/sweeper/sweeper/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/sweeper/src/main/res/drawable/bg_shape_dialog_cloud_view.xml diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_cloud_rotation_layer.xml b/OCH/sweeper/sweeper/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/sweeper/src/main/res/drawable/sweeper_cloud_rotation_layer.xml diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_upload_autopoiltstate.xml b/OCH/sweeper/sweeper/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/sweeper/src/main/res/drawable/sweeper_upload_autopoiltstate.xml diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/dialog_sweeper_cloud_loading.xml b/OCH/sweeper/sweeper/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/sweeper/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/sweeper/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/sweeper/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/sweeper/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_welt_map_overview.xml b/OCH/sweeper/sweeper/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/sweeper/src/main/res/layout/fragment_welt_map_overview.xml @@ -2,7 +2,7 @@ - diff --git a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml index c4498cbaaa..46421fd5b5 100644 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml +++ b/OCH/sweeper/sweeper/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_traffic_data.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml index 7c71a6b184..be29b4784e 100644 --- a/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml +++ b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml @@ -59,7 +59,7 @@ app:layout_constraintBottom_toBottomOf="@+id/sweeperTrafficPosition" android:layout_marginStart="@dimen/dp_12" android:background="#414869"/> - - - - - - - - -