diff --git a/OCH/README.md b/OCH/README.md index 5f1c0f7be9..8b20c7f940 100644 --- a/OCH/README.md +++ b/OCH/README.md @@ -4,4 +4,4 @@ 3. mogo-och-taxi：Taxi司机端（Taxi） 4. mogo-och-taxi-passenger：Taxi乘客端（TaxiPassenger） 5. mogo-och-noop：空实现，用于独立鹰眼打包 -6. mogo-och-sweepers: 清扫车（Sweepers） \ No newline at end of file +6. mogo-och-sweeper: 清扫车（Sweeper） \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/.gitignore b/OCH/mogo-och-sweeper/.gitignore similarity index 100% rename from OCH/mogo-och-sweepers/.gitignore rename to OCH/mogo-och-sweeper/.gitignore diff --git a/OCH/mogo-och-sweepers/build.gradle b/OCH/mogo-och-sweeper/build.gradle similarity index 100% rename from OCH/mogo-och-sweepers/build.gradle rename to OCH/mogo-och-sweeper/build.gradle diff --git a/OCH/mogo-och-sweepers/gradle.properties b/OCH/mogo-och-sweeper/gradle.properties similarity index 53% rename from OCH/mogo-och-sweepers/gradle.properties rename to OCH/mogo-och-sweeper/gradle.properties index a274aa5294..6153f2df71 100644 --- a/OCH/mogo-och-sweepers/gradle.properties +++ b/OCH/mogo-och-sweeper/gradle.properties @@ -1,3 +1,3 @@ GROUP=com.mogo.och -POM_ARTIFACT_ID=och-sweepers +POM_ARTIFACT_ID=och-sweeper VERSION_CODE=1 diff --git a/OCH/mogo-och-sweepers/proguard-rules.pro b/OCH/mogo-och-sweeper/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-sweepers/proguard-rules.pro rename to OCH/mogo-och-sweeper/proguard-rules.pro diff --git a/OCH/mogo-och-sweepers/src/androidTest/java/com/mogo/och/sweepers/ExampleInstrumentedTest.kt b/OCH/mogo-och-sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt similarity index 85% rename from OCH/mogo-och-sweepers/src/androidTest/java/com/mogo/och/sweepers/ExampleInstrumentedTest.kt rename to OCH/mogo-och-sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt index 1686bc1e3d..ccebc3709a 100644 --- a/OCH/mogo-och-sweepers/src/androidTest/java/com/mogo/och/sweepers/ExampleInstrumentedTest.kt +++ b/OCH/mogo-och-sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers +package com.mogo.och.sweeper import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.mogo.och.sweepers", appContext.packageName) + assertEquals("com.mogo.och.sweeper", appContext.packageName) } } \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/AndroidManifest.xml b/OCH/mogo-och-sweeper/src/main/AndroidManifest.xml similarity index 76% rename from OCH/mogo-och-sweepers/src/main/AndroidManifest.xml rename to OCH/mogo-och-sweeper/src/main/AndroidManifest.xml index 923c53bd47..b8d998f9b0 100644 --- a/OCH/mogo-och-sweepers/src/main/AndroidManifest.xml +++ b/OCH/mogo-och-sweeper/src/main/AndroidManifest.xml @@ -1,17 +1,17 @@ + package="com.mogo.och.sweeper"> - + - /> diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/IMogoOCH.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java similarity index 93% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/IMogoOCH.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java index 313e1c23b4..0f584c6b1d 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/IMogoOCH.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers; +package com.mogo.och.sweeper; import androidx.annotation.IdRes; import androidx.fragment.app.FragmentActivity; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/SweepersProvider.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java similarity index 79% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/SweepersProvider.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index e5e36f9c95..193a8a9bee 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/SweepersProvider.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers; +package com.mogo.och.sweeper; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; @@ -11,8 +11,8 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.MogoMapUIController; import com.mogo.module.common.MogoApisHandler; -import com.mogo.och.sweepers.constant.SweepersConst; -import com.mogo.och.sweepers.fragment.SweepersFragment; +import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.fragment.SweeperFragment; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -24,12 +24,12 @@ import org.jetbrains.annotations.Nullable; * * @author tongchenfei */ -@Route(path = SweepersConst.PATH) -public class SweepersProvider implements IMogoOCH { +@Route(path = SweeperConst.PATH) +public class SweeperProvider implements IMogoOCH { - private static final String TAG = "SweepersProvider"; + private static final String TAG = "SweeperProvider"; - private SweepersFragment sweepersFragment; + private SweeperFragment sweeperFragment; private int containerId; private FragmentActivity activity; @@ -44,25 +44,25 @@ public class SweepersProvider implements IMogoOCH { @Override public void init(Context context) { - MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("OchSweepers" + MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("OchSweeper" , StatusDescriptor.VR_MODE, statusChangedListener); } private void showFragment() { - if (sweepersFragment == null) { + if (sweeperFragment == null) { CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); - sweepersFragment = new SweepersFragment(); - activity.getSupportFragmentManager().beginTransaction().add(containerId, sweepersFragment).commitAllowingStateLoss(); + sweeperFragment = new SweeperFragment(); + activity.getSupportFragmentManager().beginTransaction().add(containerId, sweeperFragment).commitAllowingStateLoss(); return; } CallerLogger.INSTANCE.d(TAG, "准备show fragment"); - activity.getSupportFragmentManager().beginTransaction().show(sweepersFragment).commitAllowingStateLoss(); + activity.getSupportFragmentManager().beginTransaction().show(sweeperFragment).commitAllowingStateLoss(); } private void hideFragment() { - if (sweepersFragment != null) { + if (sweeperFragment != null) { CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); - activity.getSupportFragmentManager().beginTransaction().hide(sweepersFragment).commitAllowingStateLoss(); + activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss(); } } @@ -77,8 +77,8 @@ public class SweepersProvider implements IMogoOCH { } } else if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { // topView进行展示时推出网约车界面，但是不隐藏整个fragment - if (sweepersFragment != null && isTrue) { - sweepersFragment.hideOchSweepers(); + if (sweeperFragment != null && isTrue) { + sweeperFragment.hideOchSweeper(); } } }; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/CarHeartbeatReqBean.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/CarHeartbeatReqBean.java similarity index 77% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/CarHeartbeatReqBean.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/CarHeartbeatReqBean.java index 33ad3b248f..5aa4d7205f 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/CarHeartbeatReqBean.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/CarHeartbeatReqBean.java @@ -1,6 +1,6 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; -import com.mogo.och.sweepers.constant.SweepersConst; +import com.mogo.och.sweeper.constant.SweeperConst; import java.util.UUID; @@ -21,6 +21,6 @@ public class CarHeartbeatReqBean { this.lon = lon; this.lat = lat; this.msgId = UUID.randomUUID().toString(); - this.interval = (int) (SweepersConst.LOOP_PERIOD_60S / 1000); + this.interval = (int) (SweeperConst.LOOP_PERIOD_60S / 1000); } } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/QueryLeaveAwayPassengersRequest.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/QueryLeaveAwayPassengersRequest.java similarity index 90% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/QueryLeaveAwayPassengersRequest.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/QueryLeaveAwayPassengersRequest.java index 2b7e4781c8..c0a9b96dcf 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/QueryLeaveAwayPassengersRequest.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/QueryLeaveAwayPassengersRequest.java @@ -1,7 +1,6 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.network.Utils; /** * 查询下车乘客请求参数 diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/QueryLeaveAwayPassengersResponse.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/QueryLeaveAwayPassengersResponse.java similarity index 98% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/QueryLeaveAwayPassengersResponse.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/QueryLeaveAwayPassengersResponse.java index d4565b053d..dffc722d9b 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/QueryLeaveAwayPassengersResponse.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/QueryLeaveAwayPassengersResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOperationStatusRequest.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOperationStatusRequest.java similarity index 78% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOperationStatusRequest.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOperationStatusRequest.java index c8caf0efb3..c8b9995b24 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOperationStatusRequest.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOperationStatusRequest.java @@ -1,7 +1,6 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.network.Utils; public /** @@ -10,12 +9,12 @@ public * * 小巴车运营状态请求参数 */ -class SweepersOperationStatusRequest { +class SweeperOperationStatusRequest { private String sn; private double lat; private double lon; - public SweepersOperationStatusRequest(double lon, double lat) { + public SweeperOperationStatusRequest(double lon, double lat) { this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.lat = lat; this.lon = lon; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOperationStatusResponse.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOperationStatusResponse.java similarity index 72% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOperationStatusResponse.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOperationStatusResponse.java index e09ea9c78d..664def47df 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOperationStatusResponse.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOperationStatusResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.eagle.core.data.BaseData; @@ -8,7 +8,7 @@ import com.mogo.eagle.core.data.BaseData; * * 小巴车运营状态返回参数 */ -public class SweepersOperationStatusResponse extends BaseData { +public class SweeperOperationStatusResponse extends BaseData { public Result data; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOrderBean.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOrderBean.java similarity index 96% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOrderBean.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOrderBean.java index d0a7b61901..14be117b5b 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOrderBean.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOrderBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; /** * @author congtaowang @@ -6,7 +6,7 @@ package com.mogo.och.sweepers.bean; *

* 小巴订单 */ -public class SweepersOrderBean { +public class SweeperOrderBean { /** * orderNo number diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOrdersResponse.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOrdersResponse.java similarity index 70% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOrdersResponse.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOrdersResponse.java index 4bc9d1782e..38ab2a6e4e 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersOrdersResponse.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperOrdersResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.eagle.core.data.BaseData; @@ -8,10 +8,10 @@ import java.util.List; * @author: wangmingjun * @date: 2021/10/19 */ -public class SweepersOrdersResponse extends BaseData { +public class SweeperOrdersResponse extends BaseData { public Result data; public static class Result{ - public List orders; + public List orders; } @Override diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersQueryLineStationsRequest.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperQueryLineStationsRequest.java similarity index 87% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersQueryLineStationsRequest.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperQueryLineStationsRequest.java index 5af26f3404..2289886b1a 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersQueryLineStationsRequest.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperQueryLineStationsRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; /** @@ -7,7 +7,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig; * * 根据车机行驶线路站点信息 */ -public class SweepersQueryLineStationsRequest { +public class SweeperQueryLineStationsRequest { private String sn; private double lat; @@ -15,7 +15,7 @@ public class SweepersQueryLineStationsRequest { private boolean markDrivingStatus; // 默认false；true:是否需要返回站点的行驶状态，对应返回的drivingStatus // 0 - 关闭、1 - 启动 // public String status; - public SweepersQueryLineStationsRequest(double lon, double lat, boolean markDrivingStatus) { + public SweeperQueryLineStationsRequest(double lon, double lat, boolean markDrivingStatus) { this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.lat = lat; this.lon = lon; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersQueryLinesResponse.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperQueryLinesResponse.java similarity index 81% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersQueryLinesResponse.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperQueryLinesResponse.java index 74d27da78a..e1cf271b2d 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersQueryLinesResponse.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperQueryLinesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.eagle.core.data.BaseData; @@ -8,7 +8,7 @@ import java.util.List; * @author: wangmingjun * @date: 2022/2/9 */ -public class SweepersQueryLinesResponse extends BaseData { +public class SweeperQueryLinesResponse extends BaseData { public List data; public static class Result { diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersResetDrivingLineRequest.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperResetDrivingLineRequest.java similarity index 60% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersResetDrivingLineRequest.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperResetDrivingLineRequest.java index 2e37a268ae..718ba66504 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersResetDrivingLineRequest.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperResetDrivingLineRequest.java @@ -1,17 +1,16 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.network.Utils; /** * @author: wangmingjun * @date: 2021/10/18 */ -public class SweepersResetDrivingLineRequest { +public class SweeperResetDrivingLineRequest { public String sn; public int lineId; //切换到的线路id - public SweepersResetDrivingLineRequest(int lineId) { + public SweeperResetDrivingLineRequest(int lineId) { sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.lineId = lineId; } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutePlanningUpdateReqBean.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java similarity index 76% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutePlanningUpdateReqBean.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java index 753eb46550..9d58dbb4c4 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutePlanningUpdateReqBean.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import java.util.List; @@ -7,7 +7,7 @@ import java.util.List; * * 订单状态更新请求数据结构 */ -public class SweepersRoutePlanningUpdateReqBean { +public class SweeperRoutePlanningUpdateReqBean { public String sn; public int lineId; public int startSiteId; @@ -19,7 +19,7 @@ public class SweepersRoutePlanningUpdateReqBean { public Double longitude; } - public SweepersRoutePlanningUpdateReqBean(String sn, int lineId, int startSiteId + public SweeperRoutePlanningUpdateReqBean(String sn, int lineId, int startSiteId , int endSiteId, List points) { this.sn = sn; this.lineId = lineId; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutesResponse.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutesResponse.java similarity index 59% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutesResponse.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutesResponse.java index b8cf05d80c..6779f61b80 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutesResponse.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.eagle.core.data.BaseData; @@ -7,14 +7,14 @@ import com.mogo.eagle.core.data.BaseData; * * @author tongchenfei */ -public class SweepersRoutesResponse extends BaseData { - private SweepersRoutesResult data; +public class SweeperRoutesResponse extends BaseData { + private SweeperRoutesResult data; - public SweepersRoutesResult getResult() { + public SweeperRoutesResult getResult() { return data; } - public void setResult(SweepersRoutesResult data) { + public void setResult(SweeperRoutesResult data) { this.data = data; } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutesResult.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutesResult.java similarity index 91% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutesResult.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutesResult.java index 9a5c5709ae..545304b948 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersRoutesResult.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutesResult.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import java.util.List; @@ -7,8 +7,8 @@ import java.util.List; * * @author tongchenfei */ -public class SweepersRoutesResult { - private List sites; +public class SweeperRoutesResult { + private List sites; private int lineId; private String name; private int lineType; //线路类型，0:环形 @@ -36,11 +36,11 @@ public class SweepersRoutesResult { return name; } - public List getSites() { + public List getSites() { return sites; } - public void setSite(List site) { + public void setSite(List site) { this.sites = sites; } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersStationBean.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperStationBean.java similarity index 98% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersStationBean.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperStationBean.java index 7c91bde918..ad4fef2b65 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersStationBean.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperStationBean.java @@ -1,11 +1,11 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; /** * 单个网约车小巴车站信息 * * @author tongchenfei */ -public class SweepersStationBean { +public class SweeperStationBean { // private int lineId; // private int siteId; // private String siteName; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersUpdateSiteStatusRequest.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperUpdateSiteStatusRequest.java similarity index 68% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersUpdateSiteStatusRequest.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperUpdateSiteStatusRequest.java index 1b1a4db91f..422d5113fa 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/bean/SweepersUpdateSiteStatusRequest.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperUpdateSiteStatusRequest.java @@ -1,7 +1,6 @@ -package com.mogo.och.sweepers.bean; +package com.mogo.och.sweeper.bean; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.network.Utils; /** * @author congtaowang @@ -9,7 +8,7 @@ import com.mogo.commons.network.Utils; * * 小巴车运营状态请求参数 */ -public class SweepersUpdateSiteStatusRequest { +public class SweeperUpdateSiteStatusRequest { public String sn; public int seq;//站点序号 @@ -17,7 +16,7 @@ public class SweepersUpdateSiteStatusRequest { public double lon; public double lat; - public SweepersUpdateSiteStatusRequest(int seq, int siteId, double lon, double lat) { + public SweeperUpdateSiteStatusRequest(int seq, int siteId, double lon, double lat) { this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); this.seq = seq; this.siteId = siteId; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ICarOperationStatusCallback.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ICarOperationStatusCallback.java similarity index 79% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ICarOperationStatusCallback.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ICarOperationStatusCallback.java index 752f9f2ff4..cdd2a06f24 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ICarOperationStatusCallback.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ICarOperationStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.callback; +package com.mogo.och.sweeper.callback; /** * @author: wangmingjun diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/IRefreshSweeperStationsCallback.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/IRefreshSweeperStationsCallback.java new file mode 100644 index 0000000000..f6fd3ae0ab --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/IRefreshSweeperStationsCallback.java @@ -0,0 +1,13 @@ +package com.mogo.och.sweeper.callback; + +import com.mogo.och.sweeper.bean.SweeperStationBean; + +import java.util.List; + +/** + * @author: wangmingjun + * @date: 2021/10/22 + */ +public interface IRefreshSweeperStationsCallback { + void refreshBusStations(String lineName, List stationList, int currentStation, int nextStation, boolean isArrived); +} diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISlidePannelHideCallback.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISlidePannelHideCallback.java similarity index 76% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISlidePannelHideCallback.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISlidePannelHideCallback.java index 6c59de2916..246ccd2118 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISlidePannelHideCallback.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISlidePannelHideCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.callback; +package com.mogo.och.sweeper.callback; /** * @author: wangmingjun diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISweepersControllerStatusCallback.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java similarity index 81% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISweepersControllerStatusCallback.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java index e2eaa5d4f2..95543610ff 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISweepersControllerStatusCallback.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.callback; +package com.mogo.och.sweeper.callback; import android.location.Location; @@ -7,7 +7,7 @@ import android.location.Location; * * Model->Presenter回调：状态控制器监听（accOn、adas ui show、voice ui show、push ui show、v2x ui show等等） */ -public interface ISweepersControllerStatusCallback { +public interface ISweeperControllerStatusCallback { // 是否vr map模式 void onVRModeChanged(boolean isVRMode); // 自车定位 diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperLinesCallback.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperLinesCallback.java new file mode 100644 index 0000000000..74e166b736 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperLinesCallback.java @@ -0,0 +1,12 @@ +package com.mogo.och.sweeper.callback; + +import com.mogo.och.sweeper.bean.SweeperQueryLinesResponse; + +/** + * @author: wangmingjun + * @date: 2022/2/9 + */ +public interface ISweeperLinesCallback { + void onBusLinesChange(SweeperQueryLinesResponse lines); + void onChangeLineIdSuccess(); +} diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/constant/SweepersConst.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt similarity index 86% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/constant/SweepersConst.kt rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt index 271575ff21..9a534d3a85 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/constant/SweepersConst.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt @@ -1,11 +1,11 @@ -package com.mogo.och.sweepers.constant +package com.mogo.och.sweeper.constant import com.mogo.commons.debug.DebugConfig /** * Created on 2021/12/6 */ -class SweepersConst { +class SweeperConst { companion object { private const val BASE_URL_OCH_DEV = "http://tech-dev.zhidaohulian.com" @@ -26,7 +26,7 @@ class SweepersConst { const val PATH = "/och/api" // 测试用的广播 - const val BROADCAST_TEST_SWEEPERS_CONTROL_TYPE_EXTRA_KEY = "sceneType" + const val BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY = "sceneType" // 无状态 const val STATION_STATUS_IDLE = 0 // 已过站(历史站) @@ -49,14 +49,14 @@ class SweepersConst { const val LOOP_SEND_TRAJ_TIMES = 10 //起点UUID - const val SWEEPERS_START_MAP_MAKER = "sweepers_start_map_maker"; + const val SWEEPER_START_MAP_MAKER = "sweeper_start_map_maker"; //终点UUID - const val SWEEPERS_END_MAP_MAKER = "sweepers_end_map_maker"; + const val SWEEPER_END_MAP_MAKER = "sweeper_end_map_maker"; // 埋点key：接管后点击'自动驾驶'按钮启动 - const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_och_sweepers_restart_autopilot" + const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_och_sweeper_restart_autopilot" // 埋点key：开始服务开启自动驾驶（成功/失败） - const val EVENT_KEY_START_SERVICE = "event_key_och_sweepers_start_service" + 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" @@ -69,7 +69,7 @@ class SweepersConst { /** * 订单起终点Marker类型 */ - const val TYPE_MARKER_SWEEPERS_ORDER = "TYPE_MARKER_SWEEPERS_ORDER" + const val TYPE_MARKER_SWEEPER_ORDER = "TYPE_MARKER_SWEEPER_ORDER" const val TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/fragment/BaseSweepersTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java similarity index 88% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/fragment/BaseSweepersTabFragment.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java index 6696196fb8..cef6c8826a 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/fragment/BaseSweepersTabFragment.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java @@ -1,7 +1,7 @@ -package com.mogo.och.sweepers.fragment; +package com.mogo.och.sweeper.fragment; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; -import static com.mogo.och.sweepers.constant.SweepersConst.TIMER_START_AUTOPILOT_INTERVAL; +import static com.mogo.och.sweeper.constant.SweeperConst.TIMER_START_AUTOPILOT_INTERVAL; import android.animation.ObjectAnimator; import android.content.Intent; @@ -41,12 +41,12 @@ import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.DataTypes; import com.mogo.module.common.view.OnPreventFastClickListener; -import com.mogo.och.sweepers.R; -import com.mogo.och.sweepers.bean.SweepersRoutesResult; -import com.mogo.och.sweepers.constant.SweepersConst; -import com.mogo.och.sweepers.model.SweepersOrderModel; -import com.mogo.och.sweepers.util.BDRouteDataTestUtils; -import com.mogo.och.sweepers.view.SlidePanelView; +import com.mogo.och.sweeper.R; +import com.mogo.och.sweeper.bean.SweeperRoutesResult; +import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.model.SweeperOrderModel; +import com.mogo.och.sweeper.util.BDRouteDataTestUtils; +import com.mogo.och.sweeper.view.SlidePanelView; import mogo.telematics.pad.MessagePad; import record_cache.RecordPanelOuterClass; @@ -58,7 +58,7 @@ import record_cache.RecordPanelOuterClass; * * @author tongchenfei */ -public abstract class BaseSweepersTabFragment> extends MvpFragment implements IMogoMapListener, IMoGoAutopilotRecordListener { +public abstract class BaseSweeperTabFragment> extends MvpFragment implements IMogoMapListener, IMoGoAutopilotRecordListener { private static final String TAG = "BaseOchFragment"; @@ -101,7 +101,7 @@ public abstract class BaseSweepersTabFragment +public class SweeperFragment extends BaseSweeperTabFragment implements SlidePanelView.OnSlidePanelMoveToEndListener, View.OnClickListener { - private static final String TAG = "SweepersFragment"; + private static final String TAG = "SweeperFragment"; private TextView mCurrentStationName; private TextView mNextStationName; @@ -50,8 +50,8 @@ public class SweepersFragment extends BaseSweepersTabFragment { @@ -110,8 +110,8 @@ public class SweepersFragment extends BaseSweepersTabFragment stationList + public void refreshSweeperStations(String lineName, List stationList , int currentStation, int nextStation, boolean isArrived) { mCurrentStation = currentStation; if (getActivity() == null) { @@ -147,7 +147,7 @@ public class SweepersFragment extends BaseSweepersTabFragment stationList, int currentStation + private void renderCurrentStationStatus(String lineName, List stationList, int currentStation , int nextStation, boolean isArrived) { CallerLogger.INSTANCE.d(M_BUS + "MapMaker ", "currentStation=" + currentStation + ",nextStation=" + nextStation + "isArrived=" + isArrived); String currentStationName = null; @@ -168,34 +168,34 @@ public class SweepersFragment extends BaseSweepersTabFragment 0 && currentStation < stationList.size() - 1) {// 是否到达站点 isArriveAtStation = true; - mCurrentTag.setText(getResources().getString(R.string.sweepers_arrive_to_current_tag)); - mNextTag.setText(getResources().getString(R.string.sweepers_arrive_to_next_tag)); + mCurrentTag.setText(getResources().getString(R.string.sweeper_arrive_to_current_tag)); + mNextTag.setText(getResources().getString(R.string.sweeper_arrive_to_next_tag)); - setOrRemoveMapMaker(false, SweepersConst.SWEEPERS_START_MAP_MAKER, startStation.getLat() + setOrRemoveMapMaker(false, SweeperConst.SWEEPER_START_MAP_MAKER, startStation.getLat() , startStation.getLon(),R.raw.star_marker); - setOrRemoveMapMaker(true, SweepersConst.SWEEPERS_END_MAP_MAKER, endStation.getLat() + setOrRemoveMapMaker(true, SweeperConst.SWEEPER_END_MAP_MAKER, endStation.getLat() , endStation.getLon(),R.raw.end_marker); } else if (currentStation == stationList.size() - 1) {// 是否到达终点 isArriveEndStation = true; nextStationName = "--"; - mNextTag.setText(getResources().getString(R.string.sweepers_arrive_to_end_end)); + mNextTag.setText(getResources().getString(R.string.sweeper_arrive_to_end_end)); - setOrRemoveMapMaker(false, SweepersConst.SWEEPERS_START_MAP_MAKER, startStation.getLat() + setOrRemoveMapMaker(false, SweeperConst.SWEEPER_START_MAP_MAKER, startStation.getLat() , startStation.getLon(),R.raw.star_marker); if (isArrived) { - setOrRemoveMapMaker(false, SweepersConst.SWEEPERS_END_MAP_MAKER, endStation.getLat() + setOrRemoveMapMaker(false, SweeperConst.SWEEPER_END_MAP_MAKER, endStation.getLat() , endStation.getLon(),R.raw.end_marker); } else { - setOrRemoveMapMaker(true, SweepersConst.SWEEPERS_END_MAP_MAKER, endStation.getLat() + setOrRemoveMapMaker(true, SweeperConst.SWEEPER_END_MAP_MAKER, endStation.getLat() , endStation.getLon(),R.raw.end_marker); } } @@ -207,9 +207,9 @@ public class SweepersFragment extends BaseSweepersTabFragment() { + SweeperServiceManager.getInstance().queryBusRoutes(mContext, new ISweeperServiceCallback() { @Override - public void onSuccess(SweepersRoutesResponse data) { + public void onSuccess(SweeperRoutesResponse data) { if ( data == null || data.getResult() == null || data.getResult().getSites() == null @@ -387,10 +378,10 @@ public class SweepersOrderModel { */ public void debugResetStationStatus() { CallerLogger.INSTANCE.d( M_BUS + TAG, "测试、重置站点状态"); - SweepersServiceManager.getInstance().resetStationStatus(mContext, currentLineId - , new ISweepersServiceCallback() { + SweeperServiceManager.getInstance().resetStationStatus(mContext, currentLineId + , new ISweeperServiceCallback() { @Override - public void onSuccess(SweepersRoutesResponse o) { + public void onSuccess(SweeperRoutesResponse o) { CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + o); isGoingToNextStation = false; if (o.getResult() == null || o.getResult().getSites() == null || o.getResult().getSites().isEmpty()) { @@ -413,10 +404,10 @@ public class SweepersOrderModel { */ public void leaveStation(boolean isOneWayOver,boolean isRestart){ CallerLogger.INSTANCE.d(M_BUS + TAG,"leaveStation-backgroundCurrentStationIndex = "+backgroundCurrentStationIndex); - SweepersServiceManager.getInstance().leaveStation(mContext, stationList.get(backgroundCurrentStationIndex).getSeq() - , stationList.get(backgroundCurrentStationIndex).getSiteId(), new ISweepersServiceCallback() { + SweeperServiceManager.getInstance().leaveStation(mContext, stationList.get(backgroundCurrentStationIndex).getSeq() + , stationList.get(backgroundCurrentStationIndex).getSiteId(), new ISweeperServiceCallback() { @Override - public void onSuccess(SweepersRoutesResponse o) { + public void onSuccess(SweeperRoutesResponse o) { if ( o.getResult() == null || o.getResult().getSites() == null || o.getResult().getSites().isEmpty() ) { return; } @@ -430,7 +421,7 @@ public class SweepersOrderModel { isGoingToNextStation = false; backgroundCurrentStationIndex = 0; CallerAutoPilotManager.INSTANCE.cancelAutoPilot(); - querySweepersRoutes(); + querySweeperRoutes(); } } @Override @@ -457,7 +448,7 @@ public class SweepersOrderModel { paramIndexes = {0}, clientPkFileName = "sn" ) - private void leaveStationSuccess(SweepersRoutesResult result, boolean isRestart) { + private void leaveStationSuccess(SweeperRoutesResult result, boolean isRestart) { renderBusStationsStatus(result); if (slidePannelHideCallback != null) { slidePannelHideCallback.hideSlidePanel(); @@ -481,8 +472,8 @@ public class SweepersOrderModel { triggerStartServiceEvent(isRestart, false); isArrivedStation = false; - SweepersStationBean currentStation = stationList.get( backgroundCurrentStationIndex); - SweepersStationBean nextStation = stationList.get( backgroundCurrentStationIndex + 1); + SweeperStationBean currentStation = stationList.get( backgroundCurrentStationIndex); + SweeperStationBean nextStation = stationList.get( backgroundCurrentStationIndex + 1); // if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE // == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { @@ -490,8 +481,8 @@ public class SweepersOrderModel { // } AutopilotControlParameters parameters = new AutopilotControlParameters(); parameters.isSpeakVoice = !isRestart; - parameters.routeID = sweepersRoutesResult.getLineId(); - parameters.routeName = sweepersRoutesResult.getName(); + parameters.routeID = sweeperRoutesResult.getLineId(); + parameters.routeName = sweeperRoutesResult.getName(); parameters.startName = PinYinUtil.getPinYinHeadChar(currentStation.getName()); parameters.endName = PinYinUtil.getPinYinHeadChar(nextStation.getName()); parameters.startLatLon = new AutopilotControlParameters @@ -501,13 +492,13 @@ public class SweepersOrderModel { parameters.vehicleType = VEHICLE_TYPE; if (parameters.autoPilotLine == null) { parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine( - sweepersRoutesResult.getLineId(), - sweepersRoutesResult.csvFileUrl, sweepersRoutesResult.csvFileMd5, - sweepersRoutesResult.txtFileUrl, sweepersRoutesResult.txtFileMd5, - sweepersRoutesResult.contrailSaveTime, sweepersRoutesResult.carModel, - sweepersRoutesResult.csvFileUrlDPQP, sweepersRoutesResult.csvFileMd5DPQP, - sweepersRoutesResult.txtFileUrlDPQP, sweepersRoutesResult.txtFileMd5DPQP, - sweepersRoutesResult.contrailSaveTimeDPQP); + sweeperRoutesResult.getLineId(), + sweeperRoutesResult.csvFileUrl, sweeperRoutesResult.csvFileMd5, + sweeperRoutesResult.txtFileUrl, sweeperRoutesResult.txtFileMd5, + sweeperRoutesResult.contrailSaveTime, sweeperRoutesResult.carModel, + sweeperRoutesResult.csvFileUrlDPQP, sweeperRoutesResult.csvFileMd5DPQP, + sweeperRoutesResult.txtFileUrlDPQP, sweeperRoutesResult.txtFileMd5DPQP, + sweeperRoutesResult.contrailSaveTimeDPQP); } CallerLogger.INSTANCE.d( M_BUS + TAG, "开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) +" startLatLon="+currentStation.getName()+"，endLatLon="+nextStation.getName()); @@ -532,9 +523,9 @@ public class SweepersOrderModel { } CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation-currentStationIndex = "+ arrivedStationIndex); - SweepersServiceManager.getInstance().arriveSiteStation(mContext + SweeperServiceManager.getInstance().arriveSiteStation(mContext , stationList.get(arrivedStationIndex).getSeq(), stationList.get(arrivedStationIndex).getSiteId() - , new ISweepersServiceCallback() { + , new ISweeperServiceCallback() { @Override public void onSuccess(BaseData o) { CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation success"); @@ -556,11 +547,11 @@ public class SweepersOrderModel { } private void renderArriveBusStation() { - List site = sweepersRoutesResult.getSites(); + List site = sweeperRoutesResult.getSites(); if (site != null && site.size() > 0){ backgroundCurrentStationIndex ++; if (refreshBusStationsCallback != null){ - refreshBusStationsCallback.refreshBusStations(sweepersRoutesResult.getName(),stationList, backgroundCurrentStationIndex + refreshBusStationsCallback.refreshBusStations(sweeperRoutesResult.getName(),stationList, backgroundCurrentStationIndex , getNextStopStation(),true); } } @@ -570,14 +561,14 @@ public class SweepersOrderModel { * 收车 */ public void stopTakeOrder(){ - SweepersServiceManager.getInstance().stopTakeOrder(mContext, new ISweepersServiceCallback() { + SweeperServiceManager.getInstance().stopTakeOrder(mContext, new ISweeperServiceCallback() { @Override public void onSuccess(BaseData o) { mIsWorking = !mIsWorking; closeBeautificationMode(); carOperationStatusCallback.changeOperationStatus(isWorking()); startOrStopOrderLoop(mIsWorking); - SweepersTrajectoryManager.getInstance().stopTrajReqLoop(); + SweeperTrajectoryManager.getInstance().stopTrajReqLoop(); } @Override public void onFail(String failMsg) { @@ -605,7 +596,7 @@ public class SweepersOrderModel { * 出车 */ public void startTakeOrder(){ - SweepersServiceManager.getInstance().startTakeOrder(mContext, new ISweepersServiceCallback() { + SweeperServiceManager.getInstance().startTakeOrder(mContext, new ISweeperServiceCallback() { @Override public void onSuccess(BaseData o) { mIsWorking = !mIsWorking; @@ -615,7 +606,7 @@ public class SweepersOrderModel { + stationList.get( backgroundCurrentStationIndex ).getName() + "站点" ); } carOperationStatusCallback.changeOperationStatus(isWorking()); - querySweepersRoutes(); + querySweeperRoutes(); } @Override public void onFail(String failMsg) { @@ -633,10 +624,10 @@ public class SweepersOrderModel { */ public void queryOperationStatus() { CallerLogger.INSTANCE.d( M_BUS + TAG, "查询运营状态"); - SweepersServiceManager.getInstance().queryOperationStatus(mContext - , new ISweepersServiceCallback() { + SweeperServiceManager.getInstance().queryOperationStatus(mContext + , new ISweeperServiceCallback() { @Override - public void onSuccess(SweepersOperationStatusResponse o) { + public void onSuccess(SweeperOperationStatusResponse o) { if ( o.data != null ) { mIsWorking = o.data.serviceStatus == 1; CallerLogger.INSTANCE.d( M_BUS + TAG, "查询运营状态 result.status: " + o.data.serviceStatus); @@ -674,15 +665,15 @@ public class SweepersOrderModel { * 车机端展示 离开站为当前站点，前往站为下一站， 下一站到站后在置为当前站 * @param result */ - private void renderBusStationsStatus(SweepersRoutesResult result) { + private void renderBusStationsStatus(SweeperRoutesResult result) { if (result == null) return; - sweepersRoutesResult = result; - List site = result.getSites(); + sweeperRoutesResult = result; + List site = result.getSites(); currentLineId = result.getLineId(); stationList.clear(); stationList.addAll( site ); for ( int i = 0; i < stationList.size(); i++ ) { - SweepersStationBean s = stationList.get( i ); + SweeperStationBean s = stationList.get( i ); CallerLogger.INSTANCE.d( M_BUS + "renderBusStationsStatus--", "Index="+ i+" ,name = "+s.getName()+" ,"+s.isLeaving()+","+s.getDrivingStatus()); @@ -698,7 +689,7 @@ public class SweepersOrderModel { } } - SweepersStationBean currentStation = stationList.get(backgroundCurrentStationIndex); + SweeperStationBean currentStation = stationList.get(backgroundCurrentStationIndex); CallerLogger.INSTANCE.d( M_BUS + TAG, "渲染站点信息服务端currentStationIndex="+backgroundCurrentStationIndex @@ -729,7 +720,7 @@ public class SweepersOrderModel { } //需放在currentStationIndex赋值之后 - SweepersTrajectoryManager.getInstance().syncTrajectoryInfo(); + SweeperTrajectoryManager.getInstance().syncTrajectoryInfo(); } /** @@ -870,8 +861,8 @@ public class SweepersOrderModel { // 车机端上传心跳数据（只在出车状态时上传） public void runCarHeartbeat() { - SweepersServiceManager.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude, - new ISweepersServiceCallback() { + SweeperServiceManager.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude, + new ISweeperServiceCallback() { @Override public void onSuccess(BaseData data) { @@ -887,9 +878,9 @@ public class SweepersOrderModel { private void startOrStopOrderLoop(boolean start) { CallerLogger.INSTANCE.d(M_BUS + TAG, "startOrStopOrderLoop() " + start); if (start) { - SweepersModelLoopManager.getInstance().startHeartbeatLoop(); + SweeperModelLoopManager.getInstance().startHeartbeatLoop(); } else { - SweepersModelLoopManager.getInstance().stopHeartbeatLoop(); + SweeperModelLoopManager.getInstance().stopHeartbeatLoop(); } } @@ -897,14 +888,14 @@ public class SweepersOrderModel { if (stationList == null || backgroundCurrentStationIndex >= stationList.size()-1) { return; } - SweepersStationBean currentStation = stationList.get( backgroundCurrentStationIndex); - SweepersStationBean nextStation = stationList.get( backgroundCurrentStationIndex +1); - SweepersAnalyticsManager.getInstance().triggerStartAutopilotEvent(isRestart, send, + SweeperStationBean currentStation = stationList.get( backgroundCurrentStationIndex); + SweeperStationBean nextStation = stationList.get( backgroundCurrentStationIndex +1); + SweeperAnalyticsManager.getInstance().triggerStartAutopilotEvent(isRestart, send, currentStation.getName(), nextStation.getName(), currentLineId); } - public SweepersRoutesResult getBusRoutesResult() { - return sweepersRoutesResult; + public SweeperRoutesResult getBusRoutesResult() { + return sweeperRoutesResult; } public int getCurrentStationIndex() { diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/ISweepersApiService.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java similarity index 61% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/ISweepersApiService.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java index 8a79909d6d..db8c6b3264 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/ISweepersApiService.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java @@ -1,17 +1,14 @@ -package com.mogo.och.sweepers.net; +package com.mogo.och.sweeper.net; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.sweepers.bean.SweepersOperationStatusRequest; -import com.mogo.och.sweepers.bean.SweepersOrdersResponse; -import com.mogo.och.sweepers.bean.SweepersQueryLinesResponse; -import com.mogo.och.sweepers.bean.SweepersRoutePlanningUpdateReqBean; -import com.mogo.och.sweepers.bean.SweepersRoutesResponse; -import com.mogo.och.sweepers.bean.CarHeartbeatReqBean; -import com.mogo.och.sweepers.bean.SweepersQueryLineStationsRequest; -import com.mogo.och.sweepers.bean.SweepersOperationStatusResponse; -import com.mogo.och.sweepers.bean.QueryLeaveAwayPassengersRequest; -import com.mogo.och.sweepers.bean.QueryLeaveAwayPassengersResponse; -import com.mogo.och.sweepers.bean.SweepersResetDrivingLineRequest; -import com.mogo.och.sweepers.bean.SweepersUpdateSiteStatusRequest; +import com.mogo.och.sweeper.bean.SweeperOperationStatusRequest; +import com.mogo.och.sweeper.bean.SweeperQueryLinesResponse; +import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean; +import com.mogo.och.sweeper.bean.SweeperRoutesResponse; +import com.mogo.och.sweeper.bean.CarHeartbeatReqBean; +import com.mogo.och.sweeper.bean.SweeperQueryLineStationsRequest; +import com.mogo.och.sweeper.bean.SweeperOperationStatusResponse; +import com.mogo.och.sweeper.bean.SweeperResetDrivingLineRequest; +import com.mogo.och.sweeper.bean.SweeperUpdateSiteStatusRequest; import io.reactivex.Observable; import retrofit2.http.Body; @@ -28,7 +25,7 @@ import retrofit2.http.Query; *

* wiki: http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48970072 */ -public interface ISweepersApiService { +public interface ISweeperApiService { /** * 根据车机坐标获取所在区域全部站点信息 * @@ -37,7 +34,7 @@ public interface ISweepersApiService { */ @Headers( {"Content-Type:application/json;charset=UTF-8"} ) @POST( "/autopilot-car-hailing/line/v2/driver/bus/lineDataWithDriver/query" ) - Observable querySiteByCoordinate(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweepersQueryLineStationsRequest request); + Observable querySiteByCoordinate(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweeperQueryLineStationsRequest request); /** * 重置巴士路线： 点击小巴车tab 或者出车后会使用 @@ -47,7 +44,7 @@ public interface ISweepersApiService { */ @Headers( {"Content-Type:application/json;charset=UTF-8"} ) @POST( "/autopilot-car-hailing/car/v2/driver/bus/drivingLine/reset" ) - Observable resetStationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweepersResetDrivingLineRequest request); + Observable resetStationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweeperResetDrivingLineRequest request); /** * 离站，通知服务器 @@ -56,7 +53,7 @@ public interface ISweepersApiService { */ @Headers({"Content-Type:application/json;charset=UTF-8"}) @POST("/autopilot-car-hailing/car/v2/driver/bus/driving/away") - Observable leaveStation(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweepersUpdateSiteStatusRequest request); + Observable leaveStation(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweeperUpdateSiteStatusRequest request); /** * 到站 更新到站信息 @@ -65,7 +62,7 @@ public interface ISweepersApiService { */ @Headers({"Content-type:application/json;charset=UTF-8"}) @POST("/autopilot-car-hailing/order/v2/driver/bus/driving/attachSite") - Observable< BaseData > arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body SweepersUpdateSiteStatusRequest request); + Observable< BaseData > arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body SweeperUpdateSiteStatusRequest request); /** * 出车 @@ -74,7 +71,7 @@ public interface ISweepersApiService { */ @Headers( {"Content-type:application/json;charset=UTF-8"} ) @POST("/autopilot-car-hailing/car/v2/driver/bus/startTakeOrder") - Observable startTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body SweepersOperationStatusRequest request); + Observable startTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body SweeperOperationStatusRequest request); /** * 收车 @@ -83,7 +80,7 @@ public interface ISweepersApiService { */ @Headers({"Content-type:application/json;charset=UTF-8"}) @POST("/autopilot-car-hailing/car/v2/driver/bus/stopTakeOrder") - Observable stopTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body SweepersOperationStatusRequest request); + Observable stopTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body SweeperOperationStatusRequest request); /** * 查询小巴出车/收车状态 @@ -92,7 +89,7 @@ public interface ISweepersApiService { */ @Headers({"Content-type:application/json;charset=UTF-8"}) @GET("/autopilot-car-hailing/car/v2/driver/bus/takeOrderStatus/query") - Observable queryOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + Observable queryOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); /** * 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度 @@ -111,10 +108,10 @@ public interface ISweepersApiService { * @return */ @GET("/autopilot-car-hailing/line/v2/driver/bus/bindLine/query") - Observable queryBusLines(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + Observable queryBusLines(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); @Headers( {"Content-type:application/json;charset=UTF-8"} ) @POST( "/autopilot-car-hailing/location/v2/driver/bus/saveLineCoordinate" ) - Observable updateOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweepersRoutePlanningUpdateReqBean data); + Observable updateOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Body SweeperRoutePlanningUpdateReqBean data); } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/ISweepersServiceCallback.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperServiceCallback.java similarity index 64% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/ISweepersServiceCallback.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperServiceCallback.java index 900fae43ae..0a57b49d1e 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/ISweepersServiceCallback.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperServiceCallback.java @@ -1,10 +1,10 @@ -package com.mogo.och.sweepers.net; +package com.mogo.och.sweeper.net; /** * @author: wangmingjun * @date: 2021/10/20 */ -public interface ISweepersServiceCallback< T >{ +public interface ISweeperServiceCallback< T >{ void onSuccess(T o); void onFail(String failMsg); diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/SweepersServiceManager.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.java similarity index 67% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/SweepersServiceManager.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.java index 34c478ec3d..f6cd975dbd 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/net/SweepersServiceManager.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.net; +package com.mogo.och.sweeper.net; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; import android.content.Context; @@ -9,20 +9,17 @@ import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.RequestOptions; import com.mogo.eagle.core.network.SubscribeImpl; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.sweepers.bean.SweepersQueryLinesResponse; -import com.mogo.och.sweepers.bean.SweepersRoutePlanningUpdateReqBean; -import com.mogo.och.sweepers.bean.SweepersRoutesResponse; -import com.mogo.och.sweepers.bean.CarHeartbeatReqBean; -import com.mogo.och.sweepers.bean.SweepersOperationStatusRequest; -import com.mogo.och.sweepers.bean.SweepersOperationStatusResponse; -import com.mogo.och.sweepers.bean.SweepersOrdersResponse; -import com.mogo.och.sweepers.bean.SweepersQueryLineStationsRequest; -import com.mogo.och.sweepers.bean.SweepersResetDrivingLineRequest; -import com.mogo.och.sweepers.bean.SweepersUpdateSiteStatusRequest; -import com.mogo.och.sweepers.bean.QueryLeaveAwayPassengersRequest; -import com.mogo.och.sweepers.bean.QueryLeaveAwayPassengersResponse; -import com.mogo.och.sweepers.constant.SweepersConst; -import com.mogo.och.sweepers.model.SweepersOrderModel; +import com.mogo.och.sweeper.bean.SweeperQueryLinesResponse; +import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean; +import com.mogo.och.sweeper.bean.SweeperRoutesResponse; +import com.mogo.och.sweeper.bean.CarHeartbeatReqBean; +import com.mogo.och.sweeper.bean.SweeperOperationStatusRequest; +import com.mogo.och.sweeper.bean.SweeperOperationStatusResponse; +import com.mogo.och.sweeper.bean.SweeperQueryLineStationsRequest; +import com.mogo.och.sweeper.bean.SweeperResetDrivingLineRequest; +import com.mogo.och.sweeper.bean.SweeperUpdateSiteStatusRequest; +import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.model.SweeperOrderModel; import java.util.List; @@ -33,22 +30,22 @@ import io.reactivex.schedulers.Schedulers; * @author: wangmingjun * @date: 2021/10/20 */ -public class SweepersServiceManager { +public class SweeperServiceManager { - private static final String TAG = SweepersServiceManager.class.getSimpleName(); + private static final String TAG = SweeperServiceManager.class.getSimpleName(); - private final ISweepersApiService mService; + private final ISweeperApiService mService; private static final class SingletonHolder { - private static final SweepersServiceManager INSTANCE = new SweepersServiceManager(); + private static final SweeperServiceManager INSTANCE = new SweeperServiceManager(); } - public static SweepersServiceManager getInstance(){ + public static SweeperServiceManager getInstance(){ return SingletonHolder.INSTANCE; } - private SweepersServiceManager(){ - mService = MoGoRetrofitFactory.getInstance(SweepersConst.getBaseUrl()).create(ISweepersApiService.class); + private SweeperServiceManager(){ + mService = MoGoRetrofitFactory.getInstance(SweeperConst.getBaseUrl()).create(ISweeperApiService.class); } /** @@ -56,13 +53,13 @@ public class SweepersServiceManager { * @param context * @param callback */ - public void queryBusRoutes(Context context, ISweepersServiceCallback callback) { + public void queryBusRoutes(Context context, ISweeperServiceCallback callback) { //获取当前高德坐标 mService.querySiteByCoordinate(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - , new SweepersQueryLineStationsRequest(SweepersOrderModel.getInstance().mLongitude - , SweepersOrderModel.getInstance().mLatitude,true)) + , new SweeperQueryLineStationsRequest(SweeperOrderModel.getInstance().mLongitude + , SweeperOrderModel.getInstance().mLatitude,true)) .subscribeOn( Schedulers.io() ).observeOn( AndroidSchedulers.mainThread() ) .subscribe( getSubscribeImpl(context,callback,"querySiteByCoordinate")); } @@ -73,9 +70,9 @@ public class SweepersServiceManager { * @param lineId * @param callback */ - public void resetStationStatus(Context context, int lineId, ISweepersServiceCallback callback){ + public void resetStationStatus(Context context, int lineId, ISweeperServiceCallback callback){ mService.resetStationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() - ,MoGoAiCloudClientConfig.getInstance().getToken(),new SweepersResetDrivingLineRequest(lineId)) + ,MoGoAiCloudClientConfig.getInstance().getToken(),new SweeperResetDrivingLineRequest(lineId)) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) .subscribe(getSubscribeImpl(context,callback,"debugResetStationStatus")); } @@ -87,11 +84,11 @@ public class SweepersServiceManager { * @param siteId * @param callback */ - public void leaveStation(Context context, int seq, int siteId, ISweepersServiceCallback callback){ + public void leaveStation(Context context, int seq, int siteId, ISweeperServiceCallback callback){ mService.leaveStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new SweepersUpdateSiteStatusRequest(seq,siteId, SweepersOrderModel.getInstance().mLongitude - , SweepersOrderModel.getInstance().mLatitude)) + ,new SweeperUpdateSiteStatusRequest(seq,siteId, SweeperOrderModel.getInstance().mLongitude + , SweeperOrderModel.getInstance().mLatitude)) .subscribeOn( Schedulers.io() ) .observeOn( AndroidSchedulers.mainThread() ) .subscribe(getSubscribeImpl(context,callback,"leaveStation")); @@ -104,11 +101,11 @@ public class SweepersServiceManager { * @param siteId * @param callback */ - public void arriveSiteStation(Context context, int seq, int siteId, ISweepersServiceCallback callback){ + public void arriveSiteStation(Context context, int seq, int siteId, ISweeperServiceCallback callback){ mService.arriveSiteStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new SweepersUpdateSiteStatusRequest(seq,siteId - , SweepersOrderModel.getInstance().mLongitude, SweepersOrderModel.getInstance().mLatitude)) + ,new SweeperUpdateSiteStatusRequest(seq,siteId + , SweeperOrderModel.getInstance().mLongitude, SweeperOrderModel.getInstance().mLatitude)) .subscribeOn( Schedulers.io() ) .observeOn( AndroidSchedulers.mainThread() ) .subscribe(getSubscribeImpl(context,callback,"leaveStation")); @@ -119,11 +116,11 @@ public class SweepersServiceManager { * @param context * @param callback */ - public void stopTakeOrder(Context context, ISweepersServiceCallback callback){ + public void stopTakeOrder(Context context, ISweeperServiceCallback callback){ mService.stopTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new SweepersOperationStatusRequest(SweepersOrderModel.getInstance().mLongitude - , SweepersOrderModel.getInstance().mLatitude)) + ,new SweeperOperationStatusRequest(SweeperOrderModel.getInstance().mLongitude + , SweeperOrderModel.getInstance().mLatitude)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(getSubscribeImpl(context,callback,"stopTakeOrder")); @@ -134,11 +131,11 @@ public class SweepersServiceManager { * @param context * @param callback */ - public void startTakeOrder(Context context, ISweepersServiceCallback callback){ + public void startTakeOrder(Context context, ISweeperServiceCallback callback){ mService.startTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new SweepersOperationStatusRequest(SweepersOrderModel.getInstance().mLongitude - , SweepersOrderModel.getInstance().mLatitude)) + ,new SweeperOperationStatusRequest(SweeperOrderModel.getInstance().mLongitude + , SweeperOrderModel.getInstance().mLatitude)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(getSubscribeImpl(context,callback,"startTakeOrder")); @@ -149,7 +146,7 @@ public class SweepersServiceManager { * @param context * @param callback */ - public void queryOperationStatus(Context context, ISweepersServiceCallback callback){ + public void queryOperationStatus(Context context, ISweeperServiceCallback callback){ mService.queryOperationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn( Schedulers.io() ) @@ -158,7 +155,7 @@ public class SweepersServiceManager { } - public void queryBusLines(Context context, ISweepersServiceCallback callback){ + public void queryBusLines(Context context, ISweeperServiceCallback callback){ mService.queryBusLines(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) @@ -167,11 +164,11 @@ public class SweepersServiceManager { } public void updateOrderRoute(Context context,int lineId, int startSiteId, int endSiteId - , List< SweepersRoutePlanningUpdateReqBean.Result > points - , ISweepersServiceCallback callback){ + , List< SweeperRoutePlanningUpdateReqBean.Result > points + , ISweeperServiceCallback callback){ mService.updateOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() - ,new SweepersRoutePlanningUpdateReqBean(MoGoAiCloudClientConfig.getInstance().getSn() + ,new SweeperRoutePlanningUpdateReqBean(MoGoAiCloudClientConfig.getInstance().getSn() ,lineId,startSiteId,endSiteId, points)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -186,7 +183,7 @@ public class SweepersServiceManager { * @param callback */ public void runCarHeartbeat(Context context, double lon, double lat, - ISweepersServiceCallback callback) { + ISweeperServiceCallback callback) { mService.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new CarHeartbeatReqBean( MoGoAiCloudClientConfig.getInstance().getSn(), lon, lat)) @@ -195,7 +192,7 @@ public class SweepersServiceManager { .subscribe(getSubscribeImpl(context, callback, "runCarHeartbeat")); } - private SubscribeImpl getSubscribeImpl(Context context, ISweepersServiceCallback callback, String apiName){ + private SubscribeImpl getSubscribeImpl(Context context, ISweeperServiceCallback callback, String apiName){ return new SubscribeImpl(RequestOptions.create(context)){ @Override public void onSuccess(T o) { diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersLinePresenter.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperLinePresenter.java similarity index 55% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersLinePresenter.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperLinePresenter.java index 378b5835bb..5cfb5b80f2 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersLinePresenter.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperLinePresenter.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.presenter; +package com.mogo.och.sweeper.presenter; import android.os.Looper; @@ -7,22 +7,22 @@ import androidx.lifecycle.LifecycleOwner; import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.sweepers.bean.SweepersQueryLinesResponse; -import com.mogo.och.sweepers.callback.ISweepersLinesCallback; -import com.mogo.och.sweepers.model.SweepersLineModel; -import com.mogo.och.sweepers.model.SweepersOrderModel; -import com.mogo.och.sweepers.ui.SweepersSwitchLineView; +import com.mogo.och.sweeper.bean.SweeperQueryLinesResponse; +import com.mogo.och.sweeper.callback.ISweeperLinesCallback; +import com.mogo.och.sweeper.model.SweeperLineModel; +import com.mogo.och.sweeper.model.SweeperOrderModel; +import com.mogo.och.sweeper.ui.SweeperSwitchLineView; /** * @author: wangmingjun * @date: 2022/2/9 */ -public class SweepersLinePresenter extends Presenter implements ISweepersLinesCallback { +public class SweeperLinePresenter extends Presenter implements ISweeperLinesCallback { - public SweepersLinePresenter(SweepersSwitchLineView view) { + public SweeperLinePresenter(SweeperSwitchLineView view) { super(view); - SweepersLineModel.getInstance().init(); - SweepersOrderModel.getInstance().init(); + SweeperLineModel.getInstance().init(); + SweeperOrderModel.getInstance().init(); } @Override @@ -32,7 +32,7 @@ public class SweepersLinePresenter extends Presenter imp } private void initListener() { - SweepersLineModel.getInstance().setBusLinesCallback(this); + SweeperLineModel.getInstance().setBusLinesCallback(this); } private void runOnUIThread( Runnable executor ) { @@ -47,7 +47,7 @@ public class SweepersLinePresenter extends Presenter imp } @Override - public void onBusLinesChange(SweepersQueryLinesResponse lines) { + public void onBusLinesChange(SweeperQueryLinesResponse lines) { runOnUIThread(() -> mView.onBusLinesChange(lines)); } @@ -57,19 +57,19 @@ public class SweepersLinePresenter extends Presenter imp } public void queryBusLines(){ - SweepersLineModel.getInstance().queryBusLines(); + SweeperLineModel.getInstance().queryBusLines(); } public void commitSwitchLineId(int lineId){ - SweepersLineModel.getInstance().commitSwitchLineId(lineId); + SweeperLineModel.getInstance().commitSwitchLineId(lineId); } public void removeListener(){ - SweepersLineModel.getInstance().setBusLinesCallback(null); + SweeperLineModel.getInstance().setBusLinesCallback(null); } public void queryBusRoutes(){ - SweepersOrderModel.getInstance().querySweepersRoutes(); + SweeperOrderModel.getInstance().querySweeperRoutes(); } @Override diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersModelLoopManager.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperModelLoopManager.java similarity index 65% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersModelLoopManager.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperModelLoopManager.java index 2d4740919f..ac03cc4800 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersModelLoopManager.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperModelLoopManager.java @@ -1,10 +1,10 @@ -package com.mogo.och.sweepers.presenter; +package com.mogo.och.sweeper.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.sweepers.constant.SweepersConst; -import com.mogo.och.sweepers.model.SweepersOrderModel; +import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.model.SweeperOrderModel; import java.util.concurrent.TimeUnit; @@ -18,15 +18,15 @@ import io.reactivex.schedulers.Schedulers; * * 管理轮询逻辑（订单轮询、新单轮询、新单抢单结果轮询等等） */ -public class SweepersModelLoopManager { +public class SweeperModelLoopManager { - private static final String TAG = SweepersModelLoopManager.class.getSimpleName(); + private static final String TAG = SweeperModelLoopManager.class.getSimpleName(); private static final class SingletonHolder { - private static final SweepersModelLoopManager INSTANCE = new SweepersModelLoopManager(); + private static final SweeperModelLoopManager INSTANCE = new SweeperModelLoopManager(); } - public static SweepersModelLoopManager getInstance() { + public static SweeperModelLoopManager getInstance() { return SingletonHolder.INSTANCE; } @@ -37,12 +37,12 @@ public class SweepersModelLoopManager { return; } CallerLogger.INSTANCE.i(M_BUS + TAG, "startHeartbeatLoop()"); - mHeartbeatDisposable = Observable.interval(SweepersConst.LOOP_DELAY, - SweepersConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) + mHeartbeatDisposable = Observable.interval(SweeperConst.LOOP_DELAY, + SweeperConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> SweepersOrderModel.getInstance().runCarHeartbeat()); + .subscribe(aLong -> SweeperOrderModel.getInstance().runCarHeartbeat()); } public void stopHeartbeatLoop() { diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersPresenter.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java similarity index 75% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersPresenter.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index 83d0c932e2..8852460f55 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/presenter/SweepersPresenter.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.presenter; +package com.mogo.och.sweeper.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; @@ -16,14 +16,14 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.sweepers.bean.SweepersStationBean; -import com.mogo.och.sweepers.callback.ICarOperationStatusCallback; -import com.mogo.och.sweepers.callback.ISweepersControllerStatusCallback; -import com.mogo.och.sweepers.callback.IRefreshSweepersStationsCallback; -import com.mogo.och.sweepers.callback.ISlidePannelHideCallback; -import com.mogo.och.sweepers.fragment.SweepersFragment; -import com.mogo.och.sweepers.model.SweepersOrderModel; -import com.mogo.och.sweepers.util.SweepersTrajectoryManager; +import com.mogo.och.sweeper.bean.SweeperStationBean; +import com.mogo.och.sweeper.callback.ICarOperationStatusCallback; +import com.mogo.och.sweeper.callback.ISweeperControllerStatusCallback; +import com.mogo.och.sweeper.callback.IRefreshSweeperStationsCallback; +import com.mogo.och.sweeper.callback.ISlidePannelHideCallback; +import com.mogo.och.sweeper.fragment.SweeperFragment; +import com.mogo.och.sweeper.model.SweeperOrderModel; +import com.mogo.och.sweeper.util.SweeperTrajectoryManager; import org.jetbrains.annotations.NotNull; @@ -39,77 +39,77 @@ import system_master.SystemStatusInfo; * * @author tongchenfei */ -public class SweepersPresenter extends Presenter - implements ICarOperationStatusCallback, IRefreshSweepersStationsCallback, ISlidePannelHideCallback - , IMoGoAutopilotStatusListener, ISweepersControllerStatusCallback { +public class SweeperPresenter extends Presenter + implements ICarOperationStatusCallback, IRefreshSweeperStationsCallback, ISlidePannelHideCallback + , IMoGoAutopilotStatusListener, ISweeperControllerStatusCallback { private static final String TAG = "BusPresenter"; private int currentAutopilotStatus = -1; - private List mStationList = new ArrayList<>(); + private List mStationList = new ArrayList<>(); private int mCurrentStation = 0; private boolean isRestartAutopilot = false; - public SweepersPresenter(SweepersFragment view) { + public SweeperPresenter(SweeperFragment view) { super(view); //2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口 CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this); - SweepersOrderModel.getInstance().init(); + SweeperOrderModel.getInstance().init(); } @Override public void onCreate(@NonNull LifecycleOwner owner) { super.onCreate(owner); - SweepersOrderModel.getInstance().queryOperationStatus(); - SweepersOrderModel.getInstance().querySweepersRoutes(); + SweeperOrderModel.getInstance().queryOperationStatus(); + SweeperOrderModel.getInstance().querySweeperRoutes(); initModelListener(); } @Override public void onDestroy(@NonNull LifecycleOwner owner) { super.onDestroy(owner); - SweepersOrderModel.getInstance().release(); + SweeperOrderModel.getInstance().release(); releaseListener(); } public void initModelListener() { - SweepersOrderModel.getInstance().setCarOperationStatusCallback(this); - SweepersOrderModel.getInstance().setRefreshBusStationsCallback(this); - SweepersOrderModel.getInstance().setSlidePannelHideCallback(this); - SweepersOrderModel.getInstance().setControllerStatusCallback(this); + SweeperOrderModel.getInstance().setCarOperationStatusCallback(this); + SweeperOrderModel.getInstance().setRefreshBusStationsCallback(this); + SweeperOrderModel.getInstance().setSlidePannelHideCallback(this); + SweeperOrderModel.getInstance().setControllerStatusCallback(this); } public void releaseListener() { - SweepersOrderModel.getInstance().setCarOperationStatusCallback(null); - SweepersOrderModel.getInstance().setRefreshBusStationsCallback(null); - SweepersOrderModel.getInstance().setSlidePannelHideCallback(null); - SweepersOrderModel.getInstance().setControllerStatusCallback(null); + SweeperOrderModel.getInstance().setCarOperationStatusCallback(null); + SweeperOrderModel.getInstance().setRefreshBusStationsCallback(null); + SweeperOrderModel.getInstance().setSlidePannelHideCallback(null); + SweeperOrderModel.getInstance().setControllerStatusCallback(null); } public void querySweepersRoutes() { - SweepersOrderModel.getInstance().querySweepersRoutes(); + SweeperOrderModel.getInstance().querySweeperRoutes(); } public void debugResetStationStatus() { - SweepersOrderModel.getInstance().debugResetStationStatus(); + SweeperOrderModel.getInstance().debugResetStationStatus(); } public void autoDriveToNextStation(boolean isRestart) { currentAutopilotStatus = -1; - SweepersOrderModel.getInstance().autoDriveToNextStation(isRestart); + SweeperOrderModel.getInstance().autoDriveToNextStation(isRestart); isRestartAutopilot = false; } public void restartAutopilot() { - if (SweepersOrderModel.getInstance().isGoingToNextStation()){ + if (SweeperOrderModel.getInstance().isGoingToNextStation()){ currentAutopilotStatus = -1; - SweepersOrderModel.getInstance().restartAutopilot(); + SweeperOrderModel.getInstance().restartAutopilot(); isRestartAutopilot = true; } } public void onChangeOperationStatus() { - SweepersOrderModel.getInstance().onChangeOperationStatus(); + SweeperOrderModel.getInstance().onChangeOperationStatus(); } @Override @@ -120,7 +120,7 @@ public class SweepersPresenter extends Presenter } @Override - public void refreshBusStations(String lineName,List stationList + public void refreshBusStations(String lineName,List stationList , int currentStation, int nextStation, boolean isArrived) { mStationList.clear(); mStationList.addAll(stationList); @@ -128,7 +128,7 @@ public class SweepersPresenter extends Presenter // functionDemoModeChange(); CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); if (mView != null) { - runOnUIThread(() -> mView.refreshSweepersStations(lineName, + runOnUIThread(() -> mView.refreshSweeperStations(lineName, stationList, currentStation, nextStation, isArrived)); } } @@ -138,7 +138,7 @@ public class SweepersPresenter extends Presenter if (FunctionBuildConfig.isDemoMode && ((mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1) || ((mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1) - && SweepersOrderModel.getInstance().isGoingToNextStation()))) { + && SweeperOrderModel.getInstance().isGoingToNextStation()))) { runOnUIThread(() -> mView.onAutopilotStatusChanged( IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING)); } @@ -153,7 +153,7 @@ public class SweepersPresenter extends Presenter @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) { - SweepersOrderModel.getInstance().onArriveAt(arrivalNotification); + SweeperOrderModel.getInstance().onArriveAt(arrivalNotification); } @Override @@ -175,7 +175,7 @@ public class SweepersPresenter extends Presenter currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE; // 设置UI【自动驾驶】按钮是否展示 runOnUIThread(() -> mView.onAutopilotEnableChange(true)); - if (SweepersOrderModel.getInstance().isGoingToNextStation()) { + if (SweeperOrderModel.getInstance().isGoingToNextStation()) { runOnUIThread(() -> mView.hideSlidePanel()); } if (FunctionBuildConfig.isDemoMode @@ -183,7 +183,7 @@ public class SweepersPresenter extends Presenter (mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1) || ( (mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1) - && SweepersOrderModel.getInstance().isGoingToNextStation() + && SweeperOrderModel.getInstance().isGoingToNextStation() ) ) ) { @@ -199,7 +199,7 @@ public class SweepersPresenter extends Presenter currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING; // 改变UI自动驾驶状态 runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); - SweepersOrderModel.getInstance().triggerStartServiceEvent( + SweeperOrderModel.getInstance().triggerStartServiceEvent( isRestartAutopilot, true); } break; @@ -214,7 +214,7 @@ public class SweepersPresenter extends Presenter (mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1) || ( (mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1) - && SweepersOrderModel.getInstance().isGoingToNextStation() + && SweeperOrderModel.getInstance().isGoingToNextStation() ) ) ) { @@ -274,7 +274,7 @@ public class SweepersPresenter extends Presenter @Override public void onAutopilotGuardian(MogoReportMsg.MogoReportMessage guardianInfo) { - SweepersTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo); + SweeperTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo); } @Override diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/receiver/TestSweepersBroadcastReceiver.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java similarity index 75% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/receiver/TestSweepersBroadcastReceiver.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java index 0dead1c6f3..b2ef6bcadd 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/receiver/TestSweepersBroadcastReceiver.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.receiver; +package com.mogo.och.sweeper.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.sweepers.constant.SweepersConst; +import com.mogo.och.sweeper.constant.SweeperConst; /** * 测试小巴车的场景 @@ -15,7 +15,7 @@ import com.mogo.och.sweepers.constant.SweepersConst; * @author donghongyu * @date 4/26/21 12:08 PM */ -public class TestSweepersBroadcastReceiver extends BroadcastReceiver { +public class TestSweeperBroadcastReceiver extends BroadcastReceiver { private static final String TAG = "TestBusBroadcastReceiver"; private Context mContext; @@ -24,7 +24,7 @@ public class TestSweepersBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { try { this.mContext = context; - int sceneType = intent.getIntExtra(SweepersConst.BROADCAST_TEST_SWEEPERS_CONTROL_TYPE_EXTRA_KEY, 0); + int sceneType = intent.getIntExtra(SweeperConst.BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY, 0); CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersSwitchLineActivity.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperSwitchLineActivity.java similarity index 87% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersSwitchLineActivity.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperSwitchLineActivity.java index 0a2824e445..dedd34cb21 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersSwitchLineActivity.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperSwitchLineActivity.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.ui; +package com.mogo.och.sweeper.ui; import android.annotation.SuppressLint; import android.content.Context; @@ -22,9 +22,9 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.mvp.MvpActivity; import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.och.sweepers.R; -import com.mogo.och.sweepers.bean.SweepersQueryLinesResponse; -import com.mogo.och.sweepers.presenter.SweepersLinePresenter; +import com.mogo.och.sweeper.R; +import com.mogo.och.sweeper.bean.SweeperQueryLinesResponse; +import com.mogo.och.sweeper.presenter.SweeperLinePresenter; import java.util.ArrayList; import java.util.List; @@ -33,26 +33,26 @@ import java.util.List; * @author: wangmingjun * @date: 2022/2/8 */ -public class SweepersSwitchLineActivity extends MvpActivity - implements View.OnClickListener, SweepersSwitchLineView { +public class SweeperSwitchLineActivity extends MvpActivity + implements View.OnClickListener, SweeperSwitchLineView { private ImageView mClose; private ConstraintLayout mNoDatasView; private RecyclerView mLinesListView; private TextView mLineCommitBtn; private SwitchLineAdapter mAdapter; - private List mData = new ArrayList<>(); + private List mData = new ArrayList<>(); private int mSelectLineId = -1; @Override protected int getLayoutId() { - return R.layout.activity_sweepers_switch_line; + return R.layout.activity_sweeper_switch_line; } @NonNull @Override - protected SweepersLinePresenter createPresenter() { - return new SweepersLinePresenter(this); + protected SweeperLinePresenter createPresenter() { + return new SweeperLinePresenter(this); } @Override @@ -126,7 +126,7 @@ public class SweepersSwitchLineActivity extends MvpActivity{ private Context mContext; - private List mData; + private List mData; // RecyclerView设置点击事件 private LineItemClickListener mItemClickListener ; private int clickPos = -1; - public SwitchLineAdapter(Context context, List data){ + public SwitchLineAdapter(Context context, List data){ mContext = context; mData = data; } @@ -224,7 +224,7 @@ public class SweepersSwitchLineActivity extends MvpActivity -1){ if (clickPos == position){ - holder.selectIv.setImageResource(R.drawable.sweepers_selected_btn); + holder.selectIv.setImageResource(R.drawable.sweeper_selected_btn); }else { - holder.selectIv.setImageResource(R.drawable.sweepers_unselect_btn); + holder.selectIv.setImageResource(R.drawable.sweeper_unselect_btn); } }else { if (line.choose == 1){//1:绑定 2:未绑定 默认绑定 if (mItemClickListener != null) { mItemClickListener.onItemClick(position); } - holder.selectIv.setImageResource(R.drawable.sweepers_selected_btn); + holder.selectIv.setImageResource(R.drawable.sweeper_selected_btn); }else { - holder.selectIv.setImageResource(R.drawable.sweepers_unselect_btn); + holder.selectIv.setImageResource(R.drawable.sweeper_unselect_btn); } } diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperSwitchLineView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperSwitchLineView.java new file mode 100644 index 0000000000..3cfdb9fdb9 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperSwitchLineView.java @@ -0,0 +1,15 @@ +package com.mogo.och.sweeper.ui; + +import com.mogo.commons.mvp.IView; +import com.mogo.och.sweeper.bean.SweeperQueryLinesResponse; + +/** + * @author: wangmingjun + * @date: 2022/2/10 + */ +public interface SweeperSwitchLineView extends IView { + + void onBusLinesChange(SweeperQueryLinesResponse data); + void onChangeLineIdSuccess(); +} + diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersTrafficLightView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperTrafficLightView.java similarity index 73% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersTrafficLightView.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperTrafficLightView.java index 811f652009..5f99d4836e 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersTrafficLightView.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperTrafficLightView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.ui; +package com.mogo.och.sweeper.ui; import android.content.Context; import android.util.AttributeSet; @@ -7,7 +7,7 @@ import android.widget.ImageView; import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.sweepers.R; +import com.mogo.och.sweeper.R; import com.mogo.och.common.module.wigets.OCHGradientTextView; import org.jetbrains.annotations.Nullable; @@ -17,29 +17,29 @@ import org.jetbrains.annotations.Nullable; * * Created on 2022/3/29 */ -public class SweepersTrafficLightView extends IViewTrafficLight { +public class SweeperTrafficLightView extends IViewTrafficLight { private ImageView mLightIconIV; private OCHGradientTextView mLightTimeTV; private int mCurrentLightId; - public SweepersTrafficLightView(@Nullable Context context) { + public SweeperTrafficLightView(@Nullable Context context) { this(context, null, 0); } - public SweepersTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs) { + public SweeperTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs) { this(context, attrs, 0); } - public SweepersTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + public SweeperTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); init(context); } private void init(Context context) { - LayoutInflater.from(context).inflate(R.layout.sweepers_traffic_light_view, this, true); - mLightIconIV = findViewById(R.id.sweepers_traffic_light_iv); - mLightTimeTV = findViewById(R.id.sweepers_traffic_light_time_tv); + LayoutInflater.from(context).inflate(R.layout.sweeper_traffic_light_view, this, true); + mLightIconIV = findViewById(R.id.sweeper_traffic_light_iv); + mLightTimeTV = findViewById(R.id.sweeper_traffic_light_time_tv); } /** @@ -63,7 +63,7 @@ public class SweepersTrafficLightView extends IViewTrafficLight { super.disableWarningTrafficLight(); UiThreadHandler.post(() -> { mCurrentLightId = 0; - SweepersTrafficLightView.this.setVisibility(GONE); + SweeperTrafficLightView.this.setVisibility(GONE); }); } @@ -99,8 +99,8 @@ public class SweepersTrafficLightView extends IViewTrafficLight { UiThreadHandler.post(() -> { if (redNum > 0) { mLightTimeTV.setVertrial(true); - mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.sweepers_traffic_light_red_color_up), - getResources().getColor(R.color.sweepers_traffic_light_red_color_down)}); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.sweeper_traffic_light_red_color_up), + getResources().getColor(R.color.sweeper_traffic_light_red_color_down)}); mLightTimeTV.setText(String.valueOf(redNum)); } else { mLightTimeTV.setText(""); @@ -114,8 +114,8 @@ public class SweepersTrafficLightView extends IViewTrafficLight { UiThreadHandler.post(() -> { if (greenNum > 0) { mLightTimeTV.setVertrial(true); - mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.sweepers_traffic_light_green_color_up), - getResources().getColor(R.color.sweepers_traffic_light_green_color_down)}); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.sweeper_traffic_light_green_color_up), + getResources().getColor(R.color.sweeper_traffic_light_green_color_down)}); mLightTimeTV.setText(String.valueOf(greenNum)); } else { mLightTimeTV.setText(""); @@ -129,8 +129,8 @@ public class SweepersTrafficLightView extends IViewTrafficLight { UiThreadHandler.post(() -> { if (yellowNum > 0) { mLightTimeTV.setVertrial(true); - mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.sweepers_traffic_light_yellow_color_up), - getResources().getColor(R.color.sweepers_traffic_light_yellow_color_down)}); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.sweeper_traffic_light_yellow_color_up), + getResources().getColor(R.color.sweeper_traffic_light_yellow_color_down)}); mLightTimeTV.setText(String.valueOf(yellowNum)); } else { mLightTimeTV.setText(""); @@ -147,19 +147,19 @@ public class SweepersTrafficLightView extends IViewTrafficLight { UiThreadHandler.post(() -> { switch (lightId) { case 1: - mLightIconIV.setBackgroundResource(R.drawable.sweepers_light_red_nor); - SweepersTrafficLightView.this.setVisibility(VISIBLE); + mLightIconIV.setBackgroundResource(R.drawable.sweeper_light_red_nor); + SweeperTrafficLightView.this.setVisibility(VISIBLE); break; case 2: - mLightIconIV.setBackgroundResource(R.drawable.sweepers_lightyellow_nor); - SweepersTrafficLightView.this.setVisibility(VISIBLE); + mLightIconIV.setBackgroundResource(R.drawable.sweeper_lightyellow_nor); + SweeperTrafficLightView.this.setVisibility(VISIBLE); break; case 3: - mLightIconIV.setBackgroundResource(R.drawable.sweepers_light_green_nor); - SweepersTrafficLightView.this.setVisibility(VISIBLE); + mLightIconIV.setBackgroundResource(R.drawable.sweeper_light_green_nor); + SweeperTrafficLightView.this.setVisibility(VISIBLE); break; default: - SweepersTrafficLightView.this.setVisibility(GONE); + SweeperTrafficLightView.this.setVisibility(GONE); break; } }); diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/BDRouteDataTestUtils.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/BDRouteDataTestUtils.java similarity index 99% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/BDRouteDataTestUtils.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/BDRouteDataTestUtils.java index 65ea11c669..85634178f1 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/BDRouteDataTestUtils.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/BDRouteDataTestUtils.java @@ -1,6 +1,6 @@ -package com.mogo.och.sweepers.util; +package com.mogo.och.sweeper.util; -import com.mogo.och.sweepers.model.SweepersOrderModel; +import com.mogo.och.sweeper.model.SweeperOrderModel; import org.json.JSONArray; import org.json.JSONException; @@ -37,7 +37,7 @@ public class BDRouteDataTestUtils { builder.setLongitude(s.getDouble("lon")); list.add(builder.build()); } - SweepersOrderModel.getInstance().debugUpdateOrderRoute(list); + SweeperOrderModel.getInstance().debugUpdateOrderRoute(list); } catch (JSONException e) { e.printStackTrace(); } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/SweepersAnalyticsManager.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java similarity index 67% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/SweepersAnalyticsManager.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java index 73b7375c6b..76f43e4388 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/SweepersAnalyticsManager.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.util; +package com.mogo.och.sweeper.util; import android.text.TextUtils; @@ -10,23 +10,23 @@ import com.mogo.eagle.core.function.call.analytics.AnalyticsManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.sweepers.constant.SweepersConst; +import com.mogo.och.sweeper.constant.SweeperConst; import java.util.HashMap; /** - * OCH sweepers埋点工具 + * OCH sweeper埋点工具 * * Created on 2022/3/24 */ -public class SweepersAnalyticsManager { +public class SweeperAnalyticsManager { private static final class SingletonHolder { - private static final SweepersAnalyticsManager INSTANCE = new SweepersAnalyticsManager(); + private static final SweeperAnalyticsManager INSTANCE = new SweeperAnalyticsManager(); } - public static SweepersAnalyticsManager getInstance() { - return SweepersAnalyticsManager.SingletonHolder.INSTANCE; + public static SweeperAnalyticsManager getInstance() { + return SweeperAnalyticsManager.SingletonHolder.INSTANCE; } @@ -36,7 +36,7 @@ public class SweepersAnalyticsManager { private Runnable startAutopilotRunnable = () -> { // 15s内未开启，上报失败埋点 - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_START_RESULT + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); @@ -51,20 +51,20 @@ public class SweepersAnalyticsManager { public void triggerStartAutopilotEvent( boolean restart, boolean send, String startName, String endName, int lineId) { mStartAutopilotKey = restart ? - SweepersConst.EVENT_KEY_RESTART_AUTOPILOT : SweepersConst.EVENT_KEY_START_SERVICE; + SweeperConst.EVENT_KEY_RESTART_AUTOPILOT : SweeperConst.EVENT_KEY_START_SERVICE; String sn = MoGoAiCloudClientConfig.getInstance().getSn(); String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); String dateTime = DateTimeUtils.getTimeText( System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_SN, sn); - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_ENV_ONLINE, + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_SN, sn); + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_ENV_ONLINE, DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE ? true : false); - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_TIME, dateTime); - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_START_NAME, startName); - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_END_NAME, endName); - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_LINE_ID, lineId); + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_TIME, dateTime); + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_NAME, startName); + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_END_NAME, endName); + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_LINE_ID, lineId); if (send) { // 开启成功，上报埋点 @@ -72,10 +72,10 @@ public class SweepersAnalyticsManager { UiThreadHandler.getsUiHandler().hasCallbacks(startAutopilotRunnable)) { UiThreadHandler.removeCallbacks(startAutopilotRunnable); } - mStartAutopilotParams.put(SweepersConst.EVENT_PARAM_START_RESULT, true); + mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT, true); AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); } else { - UiThreadHandler.postDelayed(startAutopilotRunnable, SweepersConst.LOOP_PERIOD_15S); + UiThreadHandler.postDelayed(startAutopilotRunnable, SweeperConst.LOOP_PERIOD_15S); } } } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/SweepersTrajectoryManager.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java similarity index 87% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/SweepersTrajectoryManager.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java index 77049df636..8f054bf16a 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/util/SweepersTrajectoryManager.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.util; +package com.mogo.och.sweeper.util; import androidx.annotation.Nullable; @@ -6,10 +6,9 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; -import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.och.sweepers.bean.SweepersRoutesResult; -import com.mogo.och.sweepers.constant.SweepersConst; -import com.mogo.och.sweepers.model.SweepersOrderModel; +import com.mogo.och.sweeper.bean.SweeperRoutesResult; +import com.mogo.och.sweeper.constant.SweeperConst; +import com.mogo.och.sweeper.model.SweeperOrderModel; import java.util.concurrent.TimeUnit; @@ -25,21 +24,21 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS * Bus轨迹管理：给MEC下发用于轨迹下载的信息 * Created on 2022/6/23 */ -public class SweepersTrajectoryManager { - private static final String TAG = SweepersTrajectoryManager.class.getSimpleName(); +public class SweeperTrajectoryManager { + private static final String TAG = SweeperTrajectoryManager.class.getSimpleName(); private static final class SingletonHolder { - private static final SweepersTrajectoryManager INSTANCE = new SweepersTrajectoryManager(); + private static final SweeperTrajectoryManager INSTANCE = new SweeperTrajectoryManager(); } - public static SweepersTrajectoryManager getInstance() { - return SweepersTrajectoryManager.SingletonHolder.INSTANCE; + public static SweeperTrajectoryManager getInstance() { + return SweeperTrajectoryManager.SingletonHolder.INSTANCE; } private AutopilotControlParameters.AutoPilotLine mAutoPilotLine = null; private Disposable mSendReqDisposable = null; - public SweepersTrajectoryManager() { + public SweeperTrajectoryManager() { mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "", "", "", "", 0, "", "", "", "", "", 0); @@ -49,10 +48,10 @@ public class SweepersTrajectoryManager { * 同步Bus路线信息 */ public void syncTrajectoryInfo() { - SweepersRoutesResult routesResult = SweepersOrderModel.getInstance().getBusRoutesResult(); - if (SweepersOrderModel.getInstance().isWorking() && routesResult != null - && SweepersOrderModel.getInstance().getCurrentStationIndex() == 0 - && !SweepersOrderModel.getInstance().isGoingToNextStation()) { + SweeperRoutesResult routesResult = SweeperOrderModel.getInstance().getBusRoutesResult(); + if (SweeperOrderModel.getInstance().isWorking() && routesResult != null + && SweeperOrderModel.getInstance().getCurrentStationIndex() == 0 + && !SweeperOrderModel.getInstance().isGoingToNextStation()) { CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } else { @@ -96,7 +95,7 @@ public class SweepersTrajectoryManager { } private void setupAutoPilotLine() { - SweepersRoutesResult routesResult = SweepersOrderModel.getInstance().getBusRoutesResult(); + SweeperRoutesResult routesResult = SweeperOrderModel.getInstance().getBusRoutesResult(); if (routesResult == null) { CallerLogger.INSTANCE.e(M_BUS + TAG, "setupAutoPilotLine(): routesResult is null."); @@ -149,13 +148,13 @@ public class SweepersTrajectoryManager { } CallerLogger.INSTANCE.d(M_BUS + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); - mSendReqDisposable = Observable.interval(SweepersConst.LOOP_DELAY, - SweepersConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) + mSendReqDisposable = Observable.interval(SweeperConst.LOOP_DELAY, + SweeperConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(aLong -> { - if (aLong > SweepersConst.LOOP_SEND_TRAJ_TIMES) { + if (aLong > SweeperConst.LOOP_SEND_TRAJ_TIMES) { stopTrajReqLoop(); return; } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/BusArcView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java similarity index 96% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/BusArcView.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java index 70d1079e97..d559214b15 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/BusArcView.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.view; +package com.mogo.och.sweeper.view; import android.animation.ValueAnimator; import android.content.Context; @@ -15,7 +15,7 @@ import android.view.View; import androidx.annotation.Nullable; -import com.mogo.och.sweepers.R; +import com.mogo.och.sweeper.R; /** * created by wujifei on 2021/3/24 16:20 @@ -30,7 +30,7 @@ public class BusArcView extends View { //圆弧颜色 private int mArcColor; //圆弧的画笔的宽度 - private float mStrokeWith = getResources().getDimension(R.dimen.sweepers_ext_arcView_stroke_with); + private float mStrokeWith = getResources().getDimension(R.dimen.sweeper_ext_arcView_stroke_with); //文字描述的paint private Paint mTextPaint; @@ -79,7 +79,7 @@ public class BusArcView extends View { mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); //绘制中心文字描述 - mTextPaint.setTextSize(getResources().getDimension(R.dimen.sweepers_ext_arcView_des_text_size)); + 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); } @@ -118,7 +118,7 @@ public class BusArcView extends View { //设置文本的对齐方式 mTextPaint.setTextAlign(Paint.Align.CENTER); //mTextPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_12)); - mTextPaint.setTextSize(getResources().getDimension(R.dimen.sweepers_ext_arcView_center_text_size)); + mTextPaint.setTextSize(getResources().getDimension(R.dimen.sweeper_ext_arcView_center_text_size)); } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/NoTouchConstraintLayout.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java similarity index 96% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/NoTouchConstraintLayout.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java index 94ac357553..6922b9596f 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/NoTouchConstraintLayout.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.view; +package com.mogo.och.sweeper.view; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/SlidePanelView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java similarity index 98% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/SlidePanelView.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java index abd7d82729..f7171bce89 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/SlidePanelView.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.view; +package com.mogo.och.sweeper.view; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -21,7 +21,7 @@ import android.view.animation.DecelerateInterpolator; import androidx.annotation.Nullable; -import com.mogo.och.sweepers.R; +import com.mogo.och.sweeper.R; /** * 滑块滑动面板 @@ -124,7 +124,7 @@ public class SlidePanelView extends View { textPaint.setShader(textGradient); textPaint.getFontMetrics(blockTextMetrics); - bmBlock = BitmapFactory.decodeResource(getResources(), R.drawable.sweepers_base_slide_block); + bmBlock = BitmapFactory.decodeResource(getResources(), R.drawable.sweeper_base_slide_block); blockWidth = bmBlock.getWidth(); } diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/VerticalDashLineView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java similarity index 98% rename from OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/VerticalDashLineView.java rename to OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java index 650269f1a6..875722ea11 100644 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/view/VerticalDashLineView.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers.view; +package com.mogo.och.sweeper.view; import android.content.Context; import android.graphics.Canvas; diff --git a/OCH/mogo-och-sweepers/src/main/res/color/sweepers_autopilot_text_color_selector.xml b/OCH/mogo-och-sweeper/src/main/res/color/sweeper_autopilot_text_color_selector.xml similarity index 62% rename from OCH/mogo-och-sweepers/src/main/res/color/sweepers_autopilot_text_color_selector.xml rename to OCH/mogo-och-sweeper/src/main/res/color/sweeper_autopilot_text_color_selector.xml index 580585c733..afd0b1f78c 100644 --- a/OCH/mogo-och-sweepers/src/main/res/color/sweepers_autopilot_text_color_selector.xml +++ b/OCH/mogo-och-sweeper/src/main/res/color/sweeper_autopilot_text_color_selector.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/press_start_status.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/start_failure.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_failure.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/start_failure.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_failure.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/start_success.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_success.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/start_success.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/start_success.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_base_icon_not_in_autopilot.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_base_icon_not_in_autopilot.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_base_slide_block.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_slide_block.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_base_slide_block.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_base_slide_block.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_disable_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_disable_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_disable_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_icon_arrived_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_icon_arrived_station.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arrived_station.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_icon_arriving_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_icon_arriving_station.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_icon_arriving_station.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_light_green_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_green_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_light_green_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_green_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_light_red_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_red_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_light_red_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_light_red_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_lightyellow_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_lightyellow_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_lightyellow_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_line_panel_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_line_panel_bg.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_line_panel_bg_1.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_line_panel_bg_1.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_line_panel_bg_1.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_loading_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_loading_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_loading_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_och_dot_line.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_och_dot_line.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_och_dot_line.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_och_dot_line.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_right_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_right_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_right_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_selected_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_selected_btn.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_selected_btn.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_selected_btn.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_setting_btn_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_setting_btn_bg.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_setting_btn_bg.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_switch_line_close.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_line_close.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_switch_line_close.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_line_close.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_switch_map_long.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_long.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_switch_map_long.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_long.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_switch_map_medium.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_switch_map_medium.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_switch_map_medium.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_unselect_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_unselect_btn.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_unselect_btn.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_unselect_btn.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_wrong_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1440/sweepers_wrong_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1440/sweeper_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/press_start_status.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/start_failure.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_failure.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/start_failure.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_failure.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/start_success.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_success.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/start_success.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/start_success.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_base_icon_not_in_autopilot.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_base_icon_not_in_autopilot.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_base_slide_block.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_slide_block.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_base_slide_block.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_base_slide_block.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_disable_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_disable_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_disable_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_icon_arrived_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_icon_arrived_station.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arrived_station.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_icon_arriving_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_icon_arriving_station.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_icon_arriving_station.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_light_green_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_green_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_light_green_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_green_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_light_red_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_red_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_light_red_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_light_red_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_lightyellow_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_lightyellow_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_lightyellow_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_line_panel_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_line_panel_bg.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_line_panel_bg_1.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_line_panel_bg_1.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_line_panel_bg_1.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_loading_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_loading_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_loading_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_och_dot_line.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_och_dot_line.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_och_dot_line.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_och_dot_line.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_right_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_right_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_right_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_selected_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_selected_btn.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_selected_btn.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_selected_btn.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_setting_btn_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_setting_btn_bg.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_setting_btn_bg.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_switch_line_close.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_line_close.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_switch_line_close.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_line_close.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_switch_map_long.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_long.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_switch_map_long.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_long.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_switch_map_medium.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_switch_map_medium.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_switch_map_medium.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_unselect_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_unselect_btn.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_unselect_btn.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_unselect_btn.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_wrong_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi-2560x1600/sweepers_wrong_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi-2560x1600/sweeper_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/end_maker_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/end_maker_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_ai_normal.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_ai_select.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_ai_select.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_bad_case_normal.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_bad_case_normal.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_bad_case_select.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_bad_case_select.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_station_start_end.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/img_sweepers_status_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/img_sweeper_status_bg.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/img_sweepers_status_bg.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/img_sweeper_status_bg.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_order_data.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/no_order_data.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_order_data.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/press_start_status.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/press_start_status.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/press_start_status.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/start_failure.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/start_failure.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/start_failure.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/start_failure.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/start_maker_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/start_maker_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/start_success.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/start_success.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/start_success.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/start_success.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_icon_in_autopilot.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_icon_in_autopilot.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_icon_not_in_autopilot.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_icon_not_in_autopilot.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_notice_box_bg.9.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_notice_box_bg.9.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_slide_block.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_base_slide_block.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_disable_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_disable_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_disable_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_dot_line.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_dot_line.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_dot_line.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_dot_line.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_ic_autopilot.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_ic_autopilot.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_ic_autopilot.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_icon_arrived_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_icon_arrived_station.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_arrived_station.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_icon_arriving_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_icon_arriving_station.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_arriving_station.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_icon_not_arrive_station.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_icon_not_arrive_station.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_arrive_station.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_light_green_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_light_green_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_light_red_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_light_red_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_lightyellow_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_lightyellow_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_line_panel_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_line_panel_bg.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_line_panel_bg.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_line_panel_bg_1.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_line_panel_bg_1.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_line_panel_bg_1.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_loading_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_loading_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_loading_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_och_dot_line.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_och_dot_line.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_right_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_right_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_right_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_selected_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_selected_btn.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_selected_btn.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_selected_btn.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_setting_btn_bg.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_setting_btn_bg.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_switch_line_close.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_line_close.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_switch_line_close.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_line_close.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_switch_map_long.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_switch_map_long.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_switch_map_medium.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_switch_map_medium.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_unselect_btn.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_unselect_btn.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_wrong_autopilot_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable-xhdpi/sweepers_wrong_autopilot_icon.png rename to OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/ai_collect_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/ai_collect_selector.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/ai_collect_selector.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/ai_collect_selector.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/bad_case_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/bad_case_selector.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/bad_case_selector.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/bad_case_selector.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/bg_sweepers_traffic_light_background.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_traffic_light_background.xml similarity index 70% rename from OCH/mogo-och-sweepers/src/main/res/drawable/bg_sweepers_traffic_light_background.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_traffic_light_background.xml index b70919aa14..a74b1ff75f 100644 --- a/OCH/mogo-och-sweepers/src/main/res/drawable/bg_sweepers_traffic_light_background.xml +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_traffic_light_background.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/img_sweepers_status_bg.9.png b/OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/img_sweepers_status_bg.9.png rename to OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_autopilot_status_bg.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_autopilot_status_bg.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_autopilot_status_bg.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_autopilot_status_bg.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_autopilot_status_bg_check.png b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_autopilot_status_bg_check.png rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_autopilot_status_bg_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_autopilot_status_bg_nor.png rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_base_autopilot_status_icon_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_base_autopilot_status_icon_selector.xml new file mode 100644 index 0000000000..6b646eac98 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_base_autopilot_status_icon_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_checkbox_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_checkbox_selector.xml new file mode 100644 index 0000000000..191827e786 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_checkbox_selector.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_line_dividing_line1_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line1_selector.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_line_dividing_line1_selector.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line1_selector.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_line_dividing_line2_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line2_selector.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_line_dividing_line2_selector.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line2_selector.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_operation_status_bg.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_operation_status_bg.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml new file mode 100755 index 0000000000..996c623455 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_operation_status_select_bg.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_operation_status_select_bg.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_panel_anchor_bkg.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_panel_anchor_bkg.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_panel_bkg.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_bkg.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_panel_bkg.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_bkg.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_setting_tip_red_cir_bg.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_setting_tip_red_cir_bg.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_station_green_dash_line.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml similarity index 80% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_station_green_dash_line.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml index b63e8e58c3..d1fbaeb3b9 100644 --- a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_station_green_dash_line.xml +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml @@ -5,7 +5,7 @@ android:width="6px" android:dashGap="5px" android:dashWidth="5px" - android:color="@color/sweepers_current_station_notice_text_color" /> + android:color="@color/sweeper_current_station_notice_text_color" /> diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_station_v_green_dash.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml similarity index 80% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_station_v_green_dash.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml index 55d0559738..f43c213363 100644 --- a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_station_v_green_dash.xml +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml @@ -4,7 +4,7 @@ android:left="-600dp" android:right="-600dp"> diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_line_btn.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_line_btn.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_line_btn.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_line_btn.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_line_btn_commit.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_line_btn_commit.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_line_btn_commit.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_line_btn_commit.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_line_btn_un_commit.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_line_btn_un_commit.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_line_btn_un_commit.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_line_btn_un_commit.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_map_bg.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml similarity index 52% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_map_bg.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml index 2744ded87b..943ebcac05 100644 --- a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_switch_map_bg.xml +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml @@ -2,8 +2,8 @@ - + - + \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_yi_biao_pan_bg_nor.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_nor.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_yi_biao_pan_bg_nor.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_nor.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_yi_biao_pan_bg_speeding.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_speeding.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_yi_biao_pan_bg_speeding.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_speeding.xml diff --git a/OCH/mogo-och-sweepers/src/main/res/layout/activity_sweepers_switch_line.xml b/OCH/mogo-och-sweeper/src/main/res/layout/activity_sweeper_switch_line.xml similarity index 73% rename from OCH/mogo-och-sweepers/src/main/res/layout/activity_sweepers_switch_line.xml rename to OCH/mogo-och-sweeper/src/main/res/layout/activity_sweeper_switch_line.xml index 9c450d0566..83f6208652 100644 --- a/OCH/mogo-och-sweepers/src/main/res/layout/activity_sweepers_switch_line.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/activity_sweeper_switch_line.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/sweepers_switch_line_bg"> + android:background="@color/sweeper_switch_line_bg"> + android:text="@string/sweeper_switch_line_title"/> + android:src="@drawable/sweeper_switch_line_close"/> + android:background="@drawable/sweeper_switch_line_btn_un_commit"/> diff --git a/OCH/mogo-och-sweepers/src/main/res/layout/fragment_och_sweepers.xml b/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml similarity index 76% rename from OCH/mogo-och-sweepers/src/main/res/layout/fragment_och_sweepers.xml rename to OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml index 4f3bba01d7..31e2ba482f 100644 --- a/OCH/mogo-och-sweepers/src/main/res/layout/fragment_och_sweepers.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml @@ -2,16 +2,16 @@ + app:layout_constraintTop_toTopOf="@id/module_och_sweeper_line_name" /> + app:layout_constraintTop_toBottomOf="@+id/module_och_sweeper_tag" /> + app:layout_constraintTop_toBottomOf="@+id/module_och_sweeper_current_station_anchor" /> + app:layout_constraintLeft_toLeftOf="@+id/module_och_sweeper_current_station" + app:layout_constraintTop_toBottomOf="@+id/module_och_sweeper_current_station" /> + android:src="@drawable/sweeper_icon_arrived_station" + app:layout_constraintBottom_toBottomOf="@+id/module_och_sweeper_current_station" + app:layout_constraintLeft_toLeftOf="@+id/module_och_sweeper_line_name" + app:layout_constraintTop_toTopOf="@+id/module_och_sweeper_current_station" /> + app:layout_constraintTop_toTopOf="@+id/module_och_sweeper_order_end_station" /> diff --git a/OCH/mogo-och-sweepers/src/main/res/layout/item_och_sweepers_station.xml b/OCH/mogo-och-sweeper/src/main/res/layout/item_och_sweeper_station.xml similarity index 64% rename from OCH/mogo-och-sweepers/src/main/res/layout/item_och_sweepers_station.xml rename to OCH/mogo-och-sweeper/src/main/res/layout/item_och_sweeper_station.xml index d11497572e..ddcc6f38d7 100644 --- a/OCH/mogo-och-sweepers/src/main/res/layout/item_och_sweepers_station.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/item_och_sweeper_station.xml @@ -4,55 +4,55 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_sweeper_station_icon" + app:layout_constraintRight_toRightOf="@id/module_mogo_och_sweeper_station_icon" /> + app:layout_constraintTop_toTopOf="@id/module_mogo_och_sweeper_station_name" /> + app:layout_constraintTop_toTopOf="@id/module_mogo_och_sweeper_station_name" /> \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_base_fragment.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml similarity index 87% rename from OCH/mogo-och-sweepers/src/main/res/layout/sweepers_base_fragment.xml rename to OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml index 1a3b6ac94b..db9054dc42 100644 --- a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_base_fragment.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml @@ -16,7 +16,7 @@ app:layout_constraintTop_toTopOf="parent"> @@ -26,28 +26,28 @@ android:layout_width="@dimen/module_mogo_och_autopilot_status_bg_width" android:layout_height="@dimen/module_mogo_och_autopilot_status_bg_height" app:layout_constraintTop_toBottomOf="@+id/fl_speed" - android:background="@drawable/sweepers_autopilot_status_bg" + android:background="@drawable/sweeper_autopilot_status_bg" app:layout_constraintLeft_toLeftOf="parent" android:layout_marginLeft="@dimen/dp_13" android:gravity="center" tools:visibility="visible" > + android:src="@drawable/sweeper_ic_autopilot" /> @@ -64,10 +64,10 @@ tools:visibility="visible" /> @@ -96,12 +96,12 @@ android:id="@+id/module_mogo_och_operation_status" android:layout_width="@dimen/module_mogo_och_operation_status_bg_width" android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" - android:background="@drawable/sweepers_operation_status_bg" + android:background="@drawable/sweeper_operation_status_bg" android:elevation="@dimen/dp_10" android:gravity="center" android:text="出车" android:textAlignment="center" - android:textColor="@color/sweepers_autopilot_text_color_selector" + android:textColor="@color/sweeper_autopilot_text_color_selector" android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" android:textStyle="bold" android:layout_marginLeft="@dimen/module_mogo_och_margin_left" @@ -115,16 +115,16 @@ android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" android:layout_marginLeft="@dimen/module_mogo_och_margin_left" android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom" - android:background="@drawable/sweepers_operation_status_bg" + android:background="@drawable/sweeper_operation_status_bg" android:elevation="@dimen/dp_10" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toRightOf="@id/sweepers_switch_model_layout"> + app:layout_constraintLeft_toRightOf="@id/sweeper_switch_model_layout"> + android:background="@drawable/sweeper_setting_btn_bg" /> @@ -152,7 +152,7 @@ android:layout_marginLeft="@dimen/module_mogo_och_margin_left" android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom" android:elevation="@dimen/dp_10" - android:background="@drawable/sweepers_operation_status_bg_selector" + android:background="@drawable/sweeper_operation_status_bg_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl"> @@ -164,7 +164,7 @@ android:src="@drawable/ai_collect_selector" /> - + android:text="@string/sweeper_no_line_tip"/> \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_switch_line_list_item.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_switch_line_list_item.xml similarity index 89% rename from OCH/mogo-och-sweepers/src/main/res/layout/sweepers_switch_line_list_item.xml rename to OCH/mogo-och-sweeper/src/main/res/layout/sweeper_switch_line_list_item.xml index 4bddc9f263..0474a2543d 100644 --- a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_switch_line_list_item.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_switch_line_list_item.xml @@ -9,7 +9,7 @@ android:id="@+id/switch_line_item_select_iv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/sweepers_checkbox_selector" + android:background="@drawable/sweeper_checkbox_selector" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent"/> @@ -25,7 +25,7 @@ android:ellipsize="end" android:textStyle="bold" android:textColor="@android:color/white" - android:text="@string/sweepers_switch_line_name" + android:text="@string/sweeper_switch_line_name" android:textSize="@dimen/dp_42" /> @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="0px" android:scaleType="fitXY" - android:src="@drawable/sweepers_och_dot_line" + android:src="@drawable/sweeper_och_dot_line" app:layout_constraintBottom_toTopOf="@+id/switch_line_end_blueDot" app:layout_constraintLeft_toLeftOf="@+id/switch_line_start_greenDot" app:layout_constraintRight_toRightOf="@+id/switch_line_start_greenDot" @@ -67,7 +67,7 @@ android:id="@+id/switch_line_end_blueDot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/sweepers_icon_arriving_station" + android:src="@drawable/sweeper_icon_arriving_station" app:layout_constraintBottom_toBottomOf="@+id/switch_line_end_station" app:layout_constraintLeft_toLeftOf="@+id/switch_line_name" app:layout_constraintTop_toTopOf="@+id/switch_line_end_station" /> @@ -80,7 +80,7 @@ android:layout_marginTop="@dimen/dp_30" android:ellipsize="end" android:maxLines="2" - android:text="@string/sweepers_switch_line_end" + android:text="@string/sweeper_switch_line_end" android:textColor="#B9C3E9" android:textSize="@dimen/dp_36" app:layout_constraintRight_toRightOf="parent" diff --git a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_test_bar_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_test_bar_view.xml similarity index 76% rename from OCH/mogo-och-sweepers/src/main/res/layout/sweepers_test_bar_view.xml rename to OCH/mogo-och-sweeper/src/main/res/layout/sweeper_test_bar_view.xml index 34938872eb..4322fdf328 100644 --- a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_test_bar_view.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_test_bar_view.xml @@ -5,31 +5,31 @@ android:orientation="vertical"> diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml new file mode 100644 index 0000000000..947eb46197 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml @@ -0,0 +1,35 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/raw/end_marker.nt3d b/OCH/mogo-och-sweeper/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/raw/end_marker.nt3d rename to OCH/mogo-och-sweeper/src/main/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-sweepers/src/main/res/raw/star_marker.nt3d b/OCH/mogo-och-sweeper/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/raw/star_marker.nt3d rename to OCH/mogo-och-sweeper/src/main/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-sweepers/src/main/res/raw/sweepers_away_passengers.json b/OCH/mogo-och-sweeper/src/main/res/raw/sweeper_away_passengers.json similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/raw/sweepers_away_passengers.json rename to OCH/mogo-och-sweeper/src/main/res/raw/sweeper_away_passengers.json diff --git a/OCH/mogo-och-sweepers/src/main/res/raw/sweepers_order_1.json b/OCH/mogo-och-sweeper/src/main/res/raw/sweeper_order_1.json similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/raw/sweepers_order_1.json rename to OCH/mogo-och-sweeper/src/main/res/raw/sweeper_order_1.json diff --git a/OCH/mogo-och-sweepers/src/main/res/raw/sweepers_station_list1.json b/OCH/mogo-och-sweeper/src/main/res/raw/sweeper_station_list1.json similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/raw/sweepers_station_list1.json rename to OCH/mogo-och-sweeper/src/main/res/raw/sweeper_station_list1.json diff --git a/OCH/mogo-och-sweepers/src/main/res/raw/sweepers_station_list2.json b/OCH/mogo-och-sweeper/src/main/res/raw/sweeper_station_list2.json similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/raw/sweepers_station_list2.json rename to OCH/mogo-och-sweeper/src/main/res/raw/sweeper_station_list2.json diff --git a/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1440/dimens.xml new file mode 100644 index 0000000000..40a71f82e2 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -0,0 +1,140 @@ + + + + 300px + 348px + 211px + 276px + + + 220px + 98px + 159px + + 32px + 20px + 40px + 42px + + 15px + + 20px + 36px + 28px + 36px + + 3px + 3px + 17px + 17px + + + 300px + 270px + 30px + 24px + 24px + 1px + 30px + 23px + 30px + 146px + 20px + 23px + 30px + 23px + 26px + 34px + 20px + 80px + 3px + 34px + 20px + 28px + 27px + + + 28px + 20px + 20px + 64px + 16px + + 40px + 40px + 46px + 24px + + 530px + 492px + + 20px + 20px + 70px + 130px + 93px + 150px + 70px + + 24px + 616px + 180px + + 112px + 112px + + 92px + + 30px + 616px + 754px + + + 40px + 13px + 12px + 350px + + 460px + 30px + + 110px + 40px + 320px + 20px + 40px + 320px + 320px + 70px + 616px + 130px + 30px + 279px + 112px + 22px + 36px + 50px + 60px + + + 46px + 700px + 120px + 560px + 116px + + 20px + + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1600/dimens.xml new file mode 100644 index 0000000000..85035d4a73 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -0,0 +1,138 @@ + + + + 300px + 348px + 211px + 276px + + + 220px + 98px + 159px + + 32px + 20px + 40px + 42px + + 15px + + 20px + 36px + 28px + 36px + + 3px + 3px + 17px + 17px + + + 300px + 270px + 30px + 24px + 24px + 1px + 30px + 23px + 30px + 146px + 20px + 23px + 30px + 23px + 26px + 34px + 20px + 80px + 3px + 34px + 20px + 28px + 27px + + + 25.6px + 20px + 20px + 64px + 16px + + 40px + 40px + 46px + 24px + + 530px + 492px + + 20px + 20px + 70px + 130px + 93px + 150px + 70px + + 24px + 616px + 180px + + 112px + 112px + + 92px + + 30px + 616px + 754px + + + 40px + 13px + 12px + 350px + + 460px + 30px + + 110px + 40px + 320px + 20px + 40px + 320px + 460px + 70px + 460px + 130px + 30px + 276px + 112px + 22px + 36px + 50px + 60px + + 46px + 700px + 120px + 560px + 116px + 50px + + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px + \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/values/attrs.xml b/OCH/mogo-och-sweeper/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/values/attrs.xml rename to OCH/mogo-och-sweeper/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml new file mode 100644 index 0000000000..4ff9efb121 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml @@ -0,0 +1,47 @@ + + + #FF1FA7FF + #FFFFFFFF + #FFFFFFFF + #FF51649D + #7F8299EB + + #51649D + #427d8e + #1FA7FF + #3FC281 + #427d8e + #3FC281 + + #FFFFFF + #99FFFFFF + #FF52BBFF + + #BF30334C + #fff + #f1f1f1 + + #7DE261 + #FF2B2B + #E3BC59 + #FFF + #256BFF + #FFFFFF + + #DB3137 + #3E77F6 + #323C6F + + #2966EC + #F0151D41 + + #19FFFFFF + #FFFFFF + + #FFFFA28B + #FFDA1100 + #FF60FFD3 + #FF006D43 + #FFFFE198 + #FFFF9B00 + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml b/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..d3aedccd5e --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml @@ -0,0 +1,154 @@ + + + + 300px + 348px + 211px + 276px + + + 220px + 98px + 159px + + 32px + 20px + 26px + 20px + + 15px + + 20px + 36px + 28px + 36px + + 3px + 3px + 17px + 17px + + + 300px + 270px + 30px + 24px + 24px + 1px + 30px + 23px + 30px + 146px + 20px + 23px + 30px + 23px + 26px + 20px + 20px + 80px + 3px + 27px + 20px + 28px + 27px + + 16px + 16px + 16px + 16px + 16px + + 40px + 40px + 46px + 24px + + 345px + 492px + + 15px + 15px + 40px + 50px + 50px + 70px + 40px + + 24px + 300px + 100px + + 100px + 100px + + 35px + + 15px + 300px + 270px + + 30px + 13px + 12px + 288px + + 460px + 30px + + 80px + 28px + 200px + 10px + 40px + 200px + 300px + 60px + 300px + 110px + 20px + + #FFFFFF + #4DFFFFFF + #FFFFFF + #323C6F + 10px + 20px + 200px + 52px + 65px + 20px + 50px + 20px + 38px + 33px + 368px + 76px + 38px + 190px + 76px + 16px + 24px + 35px + 822px + + 30px + 450px + 72px + 280px + 58px + 20px + + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/values/strings.xml b/OCH/mogo-och-sweeper/src/main/res/values/strings.xml new file mode 100644 index 0000000000..b2d7412445 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/values/strings.xml @@ -0,0 +1,27 @@ + + 近距视角 + 远距视角 + 启动中… + 启动成功 + 启动失败 + 自动驾驶 + 路线列表 + 路线: + 起点: + 终点: + 确认 + 切换路线 + 自动驾驶中，不可切换路线 + 当前行程未完成，不可切换路线 + 当前车辆无路线\n请联系运营人员绑定 + 起点: + 终点: + 更换路线成功 + 更换路线失败 + + 起点： + 终点： + 当前站点： + 下一站： + 自动驾驶状态为0不可用 + diff --git a/OCH/mogo-och-sweepers/src/main/res/values/style.xml b/OCH/mogo-och-sweeper/src/main/res/values/style.xml similarity index 100% rename from OCH/mogo-och-sweepers/src/main/res/values/style.xml rename to OCH/mogo-och-sweeper/src/main/res/values/style.xml diff --git a/OCH/mogo-och-sweepers/src/test/java/com/mogo/och/sweepers/ExampleUnitTest.kt b/OCH/mogo-och-sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt similarity index 91% rename from OCH/mogo-och-sweepers/src/test/java/com/mogo/och/sweepers/ExampleUnitTest.kt rename to OCH/mogo-och-sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt index a0b7afb9d8..1afdb5acad 100644 --- a/OCH/mogo-och-sweepers/src/test/java/com/mogo/och/sweepers/ExampleUnitTest.kt +++ b/OCH/mogo-och-sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.mogo.och.sweepers +package com.mogo.och.sweeper import org.junit.Test diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/IRefreshSweepersStationsCallback.java b/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/IRefreshSweepersStationsCallback.java deleted file mode 100644 index 975dc0c674..0000000000 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/IRefreshSweepersStationsCallback.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.och.sweepers.callback; - -import com.mogo.och.sweepers.bean.SweepersStationBean; - -import java.util.List; - -/** - * @author: wangmingjun - * @date: 2021/10/22 - */ -public interface IRefreshSweepersStationsCallback { - void refreshBusStations(String lineName, List stationList, int currentStation, int nextStation, boolean isArrived); -} diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISweepersLinesCallback.java b/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISweepersLinesCallback.java deleted file mode 100644 index ab33f73188..0000000000 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/callback/ISweepersLinesCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mogo.och.sweepers.callback; - -import com.mogo.och.sweepers.bean.SweepersQueryLinesResponse; - -/** - * @author: wangmingjun - * @date: 2022/2/9 - */ -public interface ISweepersLinesCallback { - void onBusLinesChange(SweepersQueryLinesResponse lines); - void onChangeLineIdSuccess(); -} diff --git a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersSwitchLineView.java b/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersSwitchLineView.java deleted file mode 100644 index 8721387680..0000000000 --- a/OCH/mogo-och-sweepers/src/main/java/com/mogo/och/sweepers/ui/SweepersSwitchLineView.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.och.sweepers.ui; - -import com.mogo.commons.mvp.IView; -import com.mogo.och.sweepers.bean.SweepersQueryLinesResponse; - -/** - * @author: wangmingjun - * @date: 2022/2/10 - */ -public interface SweepersSwitchLineView extends IView { - - void onBusLinesChange(SweepersQueryLinesResponse data); - void onChangeLineIdSuccess(); -} - diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_base_autopilot_status_icon_selector.xml b/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_base_autopilot_status_icon_selector.xml deleted file mode 100644 index 4853d04af7..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_base_autopilot_status_icon_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_checkbox_selector.xml b/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_checkbox_selector.xml deleted file mode 100644 index e6bdc7e101..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_checkbox_selector.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_operation_status_bg_selector.xml b/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_operation_status_bg_selector.xml deleted file mode 100755 index 9e69b082e4..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/drawable/sweepers_operation_status_bg_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_traffic_light_view.xml b/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_traffic_light_view.xml deleted file mode 100644 index 37fb6b204d..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/layout/sweepers_traffic_light_view.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-sweepers/src/main/res/values-xhdpi-2560x1440/dimens.xml deleted file mode 100644 index 55047b8e26..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - 300px - 348px - 211px - 276px - - - 220px - 98px - 159px - - 32px - 20px - 40px - 42px - - 15px - - 20px - 36px - 28px - 36px - - 3px - 3px - 17px - 17px - - - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 34px - 20px - 80px - 3px - 34px - 20px - 28px - 27px - - - 28px - 20px - 20px - 64px - 16px - - 40px - 40px - 46px - 24px - - 530px - 492px - - 20px - 20px - 70px - 130px - 93px - 150px - 70px - - 24px - 616px - 180px - - 112px - 112px - - 92px - - 30px - 616px - 754px - - - 40px - 13px - 12px - 350px - - 460px - 30px - - 110px - 40px - 320px - 20px - 40px - 320px - 320px - 70px - 616px - 130px - 30px - 279px - 112px - 22px - 36px - 50px - 60px - - - 46px - 700px - 120px - 560px - 116px - - 20px - - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-sweepers/src/main/res/values-xhdpi-2560x1600/dimens.xml deleted file mode 100644 index 574bf7d3e1..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - 300px - 348px - 211px - 276px - - - 220px - 98px - 159px - - 32px - 20px - 40px - 42px - - 15px - - 20px - 36px - 28px - 36px - - 3px - 3px - 17px - 17px - - - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 34px - 20px - 80px - 3px - 34px - 20px - 28px - 27px - - - 25.6px - 20px - 20px - 64px - 16px - - 40px - 40px - 46px - 24px - - 530px - 492px - - 20px - 20px - 70px - 130px - 93px - 150px - 70px - - 24px - 616px - 180px - - 112px - 112px - - 92px - - 30px - 616px - 754px - - - 40px - 13px - 12px - 350px - - 460px - 30px - - 110px - 40px - 320px - 20px - 40px - 320px - 460px - 70px - 460px - 130px - 30px - 276px - 112px - 22px - 36px - 50px - 60px - - 46px - 700px - 120px - 560px - 116px - 50px - - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/values/colors.xml b/OCH/mogo-och-sweepers/src/main/res/values/colors.xml deleted file mode 100644 index 10164ca28b..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/values/colors.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - #FF1FA7FF - #FFFFFFFF - #FFFFFFFF - #FF51649D - #7F8299EB - - #51649D - #427d8e - #1FA7FF - #3FC281 - #427d8e - #3FC281 - - #FFFFFF - #99FFFFFF - #FF52BBFF - - #BF30334C - #fff - #f1f1f1 - - #7DE261 - #FF2B2B - #E3BC59 - #FFF - #256BFF - #FFFFFF - - #DB3137 - #3E77F6 - #323C6F - - #2966EC - #F0151D41 - - #19FFFFFF - #FFFFFF - - #FFFFA28B - #FFDA1100 - #FF60FFD3 - #FF006D43 - #FFFFE198 - #FFFF9B00 - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/values/dimens.xml b/OCH/mogo-och-sweepers/src/main/res/values/dimens.xml deleted file mode 100644 index 1f68fc1165..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/values/dimens.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - 300px - 348px - 211px - 276px - - - 220px - 98px - 159px - - 32px - 20px - 26px - 20px - - 15px - - 20px - 36px - 28px - 36px - - 3px - 3px - 17px - 17px - - - 300px - 270px - 30px - 24px - 24px - 1px - 30px - 23px - 30px - 146px - 20px - 23px - 30px - 23px - 26px - 20px - 20px - 80px - 3px - 27px - 20px - 28px - 27px - - 16px - 16px - 16px - 16px - 16px - - 40px - 40px - 46px - 24px - - 345px - 492px - - 15px - 15px - 40px - 50px - 50px - 70px - 40px - - 24px - 300px - 100px - - 100px - 100px - - 35px - - 15px - 300px - 270px - - 30px - 13px - 12px - 288px - - 460px - 30px - - 80px - 28px - 200px - 10px - 40px - 200px - 300px - 60px - 300px - 110px - 20px - - #FFFFFF - #4DFFFFFF - #FFFFFF - #323C6F - 10px - 20px - 200px - 52px - 65px - 20px - 50px - 20px - 38px - 33px - 368px - 76px - 38px - 190px - 76px - 16px - 24px - 35px - 822px - - 30px - 450px - 72px - 280px - 58px - 20px - - 225px - 154px - 60px - 40px - 23px - 210px - 120px - 15px - 17px - 154px - 130px - 60px - \ No newline at end of file diff --git a/OCH/mogo-och-sweepers/src/main/res/values/strings.xml b/OCH/mogo-och-sweepers/src/main/res/values/strings.xml deleted file mode 100644 index 35b9a13191..0000000000 --- a/OCH/mogo-och-sweepers/src/main/res/values/strings.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 近距视角 - 远距视角 - 启动中… - 启动成功 - 启动失败 - 自动驾驶 - 路线列表 - 路线: - 起点: - 终点: - 确认 - 切换路线 - 自动驾驶中，不可切换路线 - 当前行程未完成，不可切换路线 - 当前车辆无路线\n请联系运营人员绑定 - 起点: - 终点: - 更换路线成功 - 更换路线失败 - - 起点： - 终点： - 当前站点： - 下一站： - 自动驾驶状态为0不可用 - diff --git a/app/build.gradle b/app/build.gradle index 93e370dac2..b0aa684b8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -206,7 +206,7 @@ android { apply from: "./productFlavors/fPadLenovoOchTaxi.gradle" apply from: "./productFlavors/fPadLenovoOchBusPassenger.gradle" apply from: "./productFlavors/fPadLenovoOchTaxiPassenger.gradle" - apply from: "./productFlavors/fPadLenovoOchSweepers.gradle" + apply from: "./productFlavors/fPadLenovoOchSweeper.gradle" packagingOptions { exclude 'META-INF/io.netty.versions.properties' diff --git a/app/functions/och.gradle b/app/functions/och.gradle index 4d1d43e395..6a3e9f0776 100644 --- a/app/functions/och.gradle +++ b/app/functions/och.gradle @@ -8,8 +8,8 @@ project.dependencies { exclude group: 'com.mogo.eagle.core.function' //by group } - // sweepers清扫车 - fPadLenovoOchSweepersImplementation(rootProject.ext.dependencies.mogoochsweepers) { + // sweeper清扫车 + fPadLenovoOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper) { exclude group: 'com.mogo.commons' //by group exclude group: 'com.mogo.module' //by group exclude group: 'com.mogo.map' //by group @@ -59,8 +59,8 @@ project.dependencies { exclude group: 'com.mogo.eagle.core' //by group exclude group: 'com.mogo.eagle.core.function' //by group } - // sweepers 清扫车 - fPadLenovoOchSweepersImplementation (project(':OCH:mogo-och-sweepers')) { + // sweeper 清扫车 + fPadLenovoOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) { exclude group: 'com.mogo.commons' //by group exclude group: 'com.mogo.module' //by group exclude group: 'com.mogo.map' //by group diff --git a/app/productFlavors/fPadLenovoOchSweepers.gradle b/app/productFlavors/fPadLenovoOchSweeper.gradle similarity index 96% rename from app/productFlavors/fPadLenovoOchSweepers.gradle rename to app/productFlavors/fPadLenovoOchSweeper.gradle index 7fea1d9412..97db194a24 100644 --- a/app/productFlavors/fPadLenovoOchSweepers.gradle +++ b/app/productFlavors/fPadLenovoOchSweeper.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 - fPadLenovoOchSweepers { + fPadLenovoOchSweeper { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -18,7 +18,7 @@ project.android.productFlavors { // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchSweepers",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchSweeper",ACTIVITY_ROOT:true] // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' diff --git a/app/regroup.gradle b/app/regroup.gradle index 2e75286609..56c7128a4f 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -1,7 +1,7 @@ // 将 install 和 assemble 任务按功能分组 afterEvaluate { - def launcher = [ "fPadLenovo","fPadLenovoOchSweepers", "fPadLenovoOchTaxi", "fPadLenovoOchBus", "fPadLenovoOchBusPassenger", "fPadLenovoOchTaxiPassenger"] + def launcher = [ "fPadLenovo","fPadLenovoOchSweeper", "fPadLenovoOchTaxi", "fPadLenovoOchBus", "fPadLenovoOchBusPassenger", "fPadLenovoOchTaxiPassenger"] it.getTasks().iterator().forEachRemaining { def task = it diff --git a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt index bf8a3bde79..a654875d4a 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt @@ -71,7 +71,7 @@ class ConfigStartUp : AndroidStartup() { if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchBus" || DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger" || DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger" - || DebugConfig.getProductFlavor() == "fPadLenovoOchSweepers") { + || DebugConfig.getProductFlavor() == "fPadLenovoOchSweeper") { //控制HMI展示元素 将不用手动调用setXXXXXViewVisibility HmiBuildConfig.isShowSpeedView = false HmiBuildConfig.isShowAutopilotStatusView = false @@ -84,7 +84,7 @@ class ConfigStartUp : AndroidStartup() { if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger") { HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche } else if (DebugConfig.getProductFlavor() == "fPadLenovoOchBus" || DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger" - || DebugConfig.getProductFlavor() == "fPadLenovoOchSweepers") { + || DebugConfig.getProductFlavor() == "fPadLenovoOchSweeper") { HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache HmiBuildConfig.isShowBrakeLightView = false HmiBuildConfig.isShowTurnLightView = false diff --git a/settings.gradle b/settings.gradle index a4936a9efa..d79503e013 100644 --- a/settings.gradle +++ b/settings.gradle @@ -86,4 +86,4 @@ include ':OCH:mogo-och-taxi' include ':OCH:mogo-och-taxi-passenger' include ':OCH:mogo-och-noop' include(':OCH:mogo-och-common-module') -include ':OCH:mogo-och-sweepers' +include ':OCH:mogo-och-sweeper'