diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index 6cb6aab617..ac55c90a4e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt @@ -24,38 +24,38 @@ enum class TrafficTypeEnum( TYPE_TRAFFIC_ID_PEOPLE( 1, "人", - R.raw.people, - R.raw.people + R.raw.traffic_people, + R.raw.traffic_people ), TYPE_TRAFFIC_ID_BICYCLE( 2, "自行车", - R.raw.zixingche, - R.raw.zixingche + R.raw.traffic_zixingche, + R.raw.traffic_zixingche ), TYPE_TRAFFIC_ID_TA_CHE( 3, "他车", - R.raw.othercar, - R.raw.othercar + R.raw.traffic_tachexiaoche, + R.raw.traffic_tachexiaoche ), TYPE_TRAFFIC_ID_MOTO( 4, "摩托", - R.raw.motuoche, - R.raw.motuoche + R.raw.traffic_motuoche, + R.raw.traffic_motuoche ), TYPE_TRAFFIC_ID_BUS( 6, "大巴", - R.raw.daba, - R.raw.daba + R.raw.traffic_daba, + R.raw.traffic_daba ), TYPE_TRAFFIC_ID_TRUCK( 8, "卡车", - R.raw.daba, - R.raw.daba + R.raw.traffic_daba, + R.raw.traffic_daba ), TYPE_TRAFFIC_ID_CAMERA( 9, diff --git a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d old mode 100644 new mode 100755 index 7a08e7beb7..8729e44609 Binary files a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d and b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/daba.nt3d b/core/mogo-core-res/src/main/res/raw/daba.nt3d deleted file mode 100644 index 67f8e4f290..0000000000 Binary files a/core/mogo-core-res/src/main/res/raw/daba.nt3d and /dev/null differ diff --git a/core/mogo-core-res/src/main/res/raw/motuoche.nt3d b/core/mogo-core-res/src/main/res/raw/motuoche.nt3d deleted file mode 100644 index da9492887c..0000000000 Binary files a/core/mogo-core-res/src/main/res/raw/motuoche.nt3d and /dev/null differ diff --git a/core/mogo-core-res/src/main/res/raw/othercar.nt3d b/core/mogo-core-res/src/main/res/raw/othercar.nt3d deleted file mode 100644 index 710d65ed56..0000000000 Binary files a/core/mogo-core-res/src/main/res/raw/othercar.nt3d and /dev/null differ diff --git a/core/mogo-core-res/src/main/res/raw/people.nt3d b/core/mogo-core-res/src/main/res/raw/people.nt3d deleted file mode 100644 index 5866095c00..0000000000 Binary files a/core/mogo-core-res/src/main/res/raw/people.nt3d and /dev/null differ diff --git a/core/mogo-core-res/src/main/res/raw/tachexiaoche.nt3d b/core/mogo-core-res/src/main/res/raw/tachexiaoche.nt3d deleted file mode 100644 index b1112e8c02..0000000000 Binary files a/core/mogo-core-res/src/main/res/raw/tachexiaoche.nt3d and /dev/null differ diff --git a/core/mogo-core-res/src/main/res/raw/traffic_daba.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_daba.nt3d new file mode 100755 index 0000000000..dc4fefff36 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/traffic_daba.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/kache.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_kache.nt3d similarity index 100% rename from core/mogo-core-res/src/main/res/raw/kache.nt3d rename to core/mogo-core-res/src/main/res/raw/traffic_kache.nt3d diff --git a/core/mogo-core-res/src/main/res/raw/traffic_motuoche.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_motuoche.nt3d new file mode 100644 index 0000000000..b4876d7a22 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/traffic_motuoche.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/traffic_people.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_people.nt3d new file mode 100644 index 0000000000..63af94dde3 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/traffic_people.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/traffic_tachexiaoche.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_tachexiaoche.nt3d new file mode 100755 index 0000000000..b1c67aa25f Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/traffic_tachexiaoche.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/traffic_zixingche.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_zixingche.nt3d new file mode 100644 index 0000000000..ef9de6d841 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/traffic_zixingche.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/zixingche.nt3d b/core/mogo-core-res/src/main/res/raw/zixingche.nt3d deleted file mode 100644 index ac39128ad7..0000000000 Binary files a/core/mogo-core-res/src/main/res/raw/zixingche.nt3d and /dev/null differ diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 7282137d08..ce3f66ac04 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -95,11 +95,11 @@ public class BaseDrawer { public int getModelRes(int type) { AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type); if (recognizedType == AdasRecognizedType.classIdCar) { - return R.raw.special_vehicle; + return R.raw.traffic_tachexiaoche; } else if (recognizedType == AdasRecognizedType.classIdTrafficBus) { - return R.raw.daba; + return R.raw.traffic_daba; } else if (recognizedType == AdasRecognizedType.classIdMoto) { - return R.raw.motuoche; + return R.raw.traffic_motuoche; } else if (recognizedType == AdasRecognizedType.classIdStopLine) { return R.raw.stopline; } else if (recognizedType == AdasRecognizedType.classIdWarningArrows) { @@ -107,11 +107,11 @@ public class BaseDrawer { } else if (recognizedType == AdasRecognizedType.classIdUnKnow) { return R.raw.special_vehicle; } else if (recognizedType == AdasRecognizedType.classIdBicycle) { - return R.raw.zixingche; + return R.raw.traffic_zixingche; } else if (recognizedType == AdasRecognizedType.classIdTrafficTruck) { - return R.raw.daba; + return R.raw.traffic_daba; } else if (recognizedType == AdasRecognizedType.classIdPerson) { - return R.raw.people; + return R.raw.traffic_people; } return R.raw.special_vehicle; }