diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MarkerResourceManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MarkerResourceManager.java deleted file mode 100644 index 6c7aa6cf2b..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MarkerResourceManager.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.mogo.module.common.drawer.marker; - -import com.mogo.commons.AbsMogoApplication; -import com.mogo.module.common.R; -import com.mogo.module.common.constants.AdasRecognizedType; -import com.mogo.module.common.constants.CarModelType; -import com.mogo.module.common.constants.SafeType; -import com.mogo.module.common.constants.VisionMode; -import com.mogo.utils.logger.Logger; - -public -/** - * @author congtaowang - * @since 2020/10/29 - *

- * 描述 按照命名规则,用字符串拼接成资源名称的方式拿到图片的id,避免枚举 - */ -class MarkerResourceManager { - - private static final String TAG = "MarkerResourceManager"; - - /** - * @param mode - * @param adasRecognizedType - * @param type - * @return - */ - public static int getMarkerDrawableResId( VisionMode mode, - AdasRecognizedType adasRecognizedType, - CarModelType type, - SafeType safeType ) { - if ( mode == null ) { - mode = VisionMode.User; - } - if ( adasRecognizedType == null ) { - adasRecognizedType = AdasRecognizedType.classIdCar; - } - if ( type == null ) { - type = CarModelType.Other; - } - - if ( safeType == null ) { - safeType = SafeType.Normal; - } - - StringBuilder builder = new StringBuilder(); - builder.append( "module_commons" ) - .append( "_" ).append( mode.getRes() ) - .append( "_" ).append( adasRecognizedType.getRes() ) - .append( "_" ).append( type.getRes() ) - .append( "_" ).append( safeType.getRes() ); - - Logger.d( TAG, "res name = %s", builder.toString() ); - - int id = AbsMogoApplication.getApp().getResources().getIdentifier( - builder.toString(), - "drawable", - AbsMogoApplication.getApp().getPackageName() ); - - if ( id == 0 ) { - if ( mode == VisionMode.User ) { - return R.drawable.module_commons_user_car_other_normal; - } else { - return R.drawable.module_commons_machine_car_other_normal; - } - } - return id; - } -} diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_left.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_left.png deleted file mode 100644 index 702a793d5a..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_left.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_machine_middle.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_machine_middle.png deleted file mode 100755 index 2387d22689..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_machine_middle.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_middle.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_middle.png deleted file mode 100644 index 3bfa172f98..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_middle.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_reverse.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_reverse.png deleted file mode 100644 index e034294816..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_reverse.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_right.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_right.png deleted file mode 100644 index 43a86c955d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_online_car_vr_right.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_left_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_left_normal.png deleted file mode 100755 index b92447c45e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_left_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_left_reverse_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_left_reverse_normal.png deleted file mode 100755 index b92447c45e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_left_reverse_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_normal.png deleted file mode 100755 index 8278fb5fe6..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_reverse_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_reverse_normal.png deleted file mode 100755 index 8278fb5fe6..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_reverse_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_right_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_right_normal.png deleted file mode 100755 index 56081c308c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_right_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_right_reverse_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_right_reverse_normal.png deleted file mode 100755 index 56081c308c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_machine_car_other_right_reverse_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_dangerous.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_dangerous.png deleted file mode 100644 index 07e90599a9..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_dangerous.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_normal.png deleted file mode 100644 index 702a793d5a..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_normal_dangerous.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_normal_dangerous.png deleted file mode 100644 index 862d30edd7..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_normal_dangerous.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_reverse_dangerous.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_reverse_dangerous.png deleted file mode 100644 index 7a770fac99..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_reverse_dangerous.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_reverse_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_reverse_normal.png deleted file mode 100644 index cb3cff9072..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_left_reverse_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_normal.png deleted file mode 100644 index 177c63460b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_reverse_dangerous.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_reverse_dangerous.png deleted file mode 100644 index ecd5fdef07..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_reverse_dangerous.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_reverse_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_reverse_normal.png deleted file mode 100644 index 0a07332644..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_reverse_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_dangerous.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_dangerous.png deleted file mode 100644 index f6486f2e3f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_dangerous.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_normal.png deleted file mode 100644 index 43a86c955d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_reverse_dangerous.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_reverse_dangerous.png deleted file mode 100644 index a6db05eea4..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_reverse_dangerous.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_reverse_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_reverse_normal.png deleted file mode 100644 index 0ed7caad5b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_other_right_reverse_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self.png deleted file mode 100644 index dc22ac57a1..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self_left.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self_left.png deleted file mode 100644 index 0e1c9b511a..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self_left.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self_right.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self_right.png deleted file mode 100644 index aa50ae2ce5..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_commons_user_car_self_right.png and /dev/null differ