From 826b3c540cbaa9d21cc1910f86bf92b948778348 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 28 Jun 2022 17:37:27 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=A1=A3=E4=BD=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89view=E6=B7=BB=E5=8A=A0=E8=89=B2=E5=80=BC=E5=B1=9E?= =?UTF-8?q?=E6=80=A7,=E9=80=9F=E5=BA=A6=E9=A2=84=E8=AD=A6=E5=91=88?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseBusTabFragment.java | 14 +- .../src/main/res/layout/bus_base_fragment.xml | 16 +- .../hmi/ui/widget/SteeringWheelView.java | 2 +- .../hmi/ui/widget/TapPositionView.java | 180 ++++-------------- .../hmi/ui/widget/TrafficDataView.java | 18 +- .../traffic_data_speed_warning.png | Bin 0 -> 42479 bytes .../res/layout/hmi_steering_wheel_bus.xml | 2 + .../res/layout/hmi_steering_wheel_taxi.xml | 2 + .../src/main/res/layout/hmi_tap_position.xml | 8 +- .../src/main/res/layout/hmi_traffic_data.xml | 4 +- .../main/res/values-xhdpi-2560x1440/color.xml | 2 +- .../src/main/res/values/color.xml | 7 +- .../core/function/smp/AMapCustomView.java | 5 +- .../custtexture_no.png | Bin 0 -> 159 bytes 14 files changed, 88 insertions(+), 172 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_speed_warning.png create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_no.png diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 2a672ce3b3..f4b65292b4 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -73,8 +73,8 @@ public abstract class BaseBusTabFragment private FrameLayout flStationPanelContainer; private Group groupTestPanel; private FrameLayout flSpeed; - private BusArcView mouduleArc; - private TrafficDataView dataView; +// private BusArcView mouduleArc; + private TrafficDataView mouduleArc; private ImageView mUpgradeTipIv; // private BusTrafficLightView mTrafficLightView; @@ -120,7 +120,7 @@ public abstract class BaseBusTabFragment tvOperationStatus = findViewById(R.id.module_mogo_och_operation_status); flSpeed = (FrameLayout) findViewById(R.id.fl_speed); - mouduleArc = (BusArcView) findViewById(R.id.bus_arc); + mouduleArc = (TrafficDataView) findViewById(R.id.bus_arc); panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer); slidePanelView.setOnSlidePanelMoveToEndListener(onSlideToEndListener); @@ -480,11 +480,11 @@ public abstract class BaseBusTabFragment */ public void updateSpeedView(float newSpeed) { int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值 -// dataView.showWithSpeedValue(speed); + mouduleArc.showWithSpeedValue(speed); - mouduleArc.setArcColor(Color.parseColor(speed > 60 ? "#DB3137" : "#3E77F6")); - mouduleArc.setValues(speed); - flSpeed.setBackgroundResource(speed > 60 ? R.drawable.bus_yi_biao_pan_bg_speeding : R.drawable.bus_yi_biao_pan_bg_nor); +// mouduleArc.setArcColor(Color.parseColor(speed > 60 ? "#DB3137" : "#3E77F6")); +// mouduleArc.setValues(speed); +// flSpeed.setBackgroundResource(speed > 60 ? R.drawable.bus_yi_biao_pan_bg_speeding : R.drawable.bus_yi_biao_pan_bg_nor); } @Override diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 6cd385a177..87e3d95737 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml @@ -17,16 +17,16 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"> - - + - - + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index f82b4e3db7..4e4f7402fc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -218,7 +218,7 @@ public class SteeringWheelView extends ConstraintLayout { ThreadUtils.runOnUiThread(new Runnable() { @Override public void run() { - Log.d(TAG, "档位" + gear.toString()); + Log.d(TAG, "乘客屏档位" + gear.toString()); if (tapPositionView != null) { tapPositionView.updateWithGear(gear); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java index 26f625e0d4..d5560f4139 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java @@ -32,160 +32,56 @@ public class TapPositionView extends ConstraintLayout { private TextView tabN; private TextView tabD; private TypedArray typedArray; + public TapPositionView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - Log.d(TAG, "2"); LayoutInflater.from(context).inflate(R.layout.hmi_tap_position, this); tabP = findViewById(R.id.tap_p); tabR = findViewById(R.id.tap_r); tabN = findViewById(R.id.tap_n); tabD = findViewById(R.id.tap_d); - typedArray = context.obtainStyledAttributes(attrs, R.styleable.CircularProgressView); - + typedArray = context.obtainStyledAttributes(attrs, R.styleable.TapPositionView); } public void updateWithGear(@NotNull Chassis.GearPosition gear) { if (tabP != null && tabR != null && tabN != null && tabD != null) { - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { - taxiGear(gear); - } else { - busGear(gear); + int defaultColor = typedArray.getColor(R.styleable.TapPositionView_defaultColor, -1); + int selectColor = typedArray.getColor(R.styleable.TapPositionView_selectColor, -1); + Log.d(TAG, "gear:" + gear); + switch (gear) { + case GEAR_NONE: + tabP.setTextColor(defaultColor); + tabR.setTextColor(defaultColor); + tabN.setTextColor(defaultColor); + tabD.setTextColor(defaultColor); + break; + case GEAR_P: + tabP.setTextColor(selectColor); + tabR.setTextColor(defaultColor); + tabN.setTextColor(defaultColor); + tabD.setTextColor(defaultColor); + break; + case GEAR_R: + tabR.setTextColor(selectColor); + tabP.setTextColor(defaultColor); + tabN.setTextColor(defaultColor); + tabD.setTextColor(defaultColor); + break; + case GEAR_N: + tabN.setTextColor(selectColor); + tabR.setTextColor(defaultColor); + tabP.setTextColor(defaultColor); + tabD.setTextColor(defaultColor); + break; + case GEAR_D: + tabD.setTextColor(selectColor); + tabN.setTextColor(defaultColor); + tabR.setTextColor(defaultColor); + tabP.setTextColor(defaultColor); + break; + default: + break; } } } - - private void busGear(@NotNull Chassis.GearPosition gear) { - switch (gear) { - case GEAR_NONE: - tabP.setTextColor(Color.parseColor("#6E8EC9")); - tabR.setTextColor(Color.parseColor("#6E8EC9")); - tabN.setTextColor(Color.parseColor("#6E8EC9")); - tabD.setTextColor(Color.parseColor("#6E8EC9")); - break; - case GEAR_P: - tabP.setTextColor(Color.parseColor("#0043FF")); - tabR.setTextColor(Color.parseColor("#6E8EC9")); - tabN.setTextColor(Color.parseColor("#6E8EC9")); - tabD.setTextColor(Color.parseColor("#6E8EC9")); - break; - case GEAR_R: - tabR.setTextColor(Color.parseColor("#0043FF")); - tabP.setTextColor(Color.parseColor("#6E8EC9")); - tabN.setTextColor(Color.parseColor("#6E8EC9")); - tabD.setTextColor(Color.parseColor("#6E8EC9")); - break; - case GEAR_N: - tabN.setTextColor(Color.parseColor("#0043FF")); - tabR.setTextColor(Color.parseColor("#6E8EC9")); - tabP.setTextColor(Color.parseColor("#6E8EC9")); - tabD.setTextColor(Color.parseColor("#6E8EC9")); - break; - case GEAR_D: - tabD.setTextColor(Color.parseColor("#0043FF")); - tabN.setTextColor(Color.parseColor("#6E8EC9")); - tabR.setTextColor(Color.parseColor("#6E8EC9")); - tabP.setTextColor(Color.parseColor("#6E8EC9")); - break; - default: - break; - } - } - - - private void taxiGear(@NotNull Chassis.GearPosition gear) { - switch (gear) { - case GEAR_NONE: - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_P: - tabP.setTextColor(Color.parseColor("#FFFFFFFF")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_R: - tabR.setTextColor(Color.parseColor("#FFFFFFFF")); - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_N: - tabN.setTextColor(Color.parseColor("#FFFFFFFF")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_D: - tabD.setTextColor(Color.parseColor("#FFFFFFFF")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - default: - break; - } - } - - /** - * 司机屏档位信息 - */ - public void updateWithGearForDriverPanel(@NotNull Chassis.GearPosition gear) { - if (tabP != null && tabR != null && tabN != null && tabD != null) { - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { - busDriverPanel(gear); - } else { - busDriverPanel(gear); - } - } - } - - private void busDriverPanel(@NotNull Chassis.GearPosition gear) { - Log.d(TAG, "gear" + gear.toString()); - tabP.setTextSize(36f); - tabR.setTextSize(36f); - tabN.setTextSize(36f); - tabD.setTextSize(36f); - int defaultColor = typedArray.getColor(R.styleable.TapPositionView_defaultColor, -1); - int selectColor = typedArray.getColor(R.styleable.TapPositionView_selectColor, -1); - - switch (gear) { - case GEAR_NONE: - tabP.setTextColor(Color.parseColor("#FFF")); - tabR.setTextColor(Color.parseColor("#FFF")); - tabN.setTextColor(Color.parseColor("#FFF")); - tabD.setTextColor(Color.parseColor("#FFF")); - break; - case GEAR_P: - tabP.setTextColor(Color.parseColor("#343c63")); - tabR.setTextColor(Color.parseColor("#FFF")); - tabN.setTextColor(Color.parseColor("#FFF")); - tabD.setTextColor(Color.parseColor("#FFF")); - break; - case GEAR_R: - tabR.setTextColor(Color.parseColor("#343c63")); - tabP.setTextColor(Color.parseColor("#FFF")); - tabN.setTextColor(Color.parseColor("#FFF")); - tabD.setTextColor(Color.parseColor("#FFF")); - break; - case GEAR_N: - tabN.setTextColor(Color.parseColor("#343c63")); - tabR.setTextColor(Color.parseColor("#FFF")); - tabP.setTextColor(Color.parseColor("#FFF")); - tabD.setTextColor(Color.parseColor("#FFF")); - break; - case GEAR_D: - tabD.setTextColor(selectColor); - tabN.setTextColor(defaultColor); - tabR.setTextColor(defaultColor); - tabP.setTextColor(defaultColor); - break; - default: - break; - } - } - - } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java index 5e68d0b30b..f63f0f3a3b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java @@ -5,6 +5,8 @@ import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -29,6 +31,9 @@ import chassis.Chassis; public class TrafficDataView extends ConstraintLayout { private static final String TAG = "TrafficDataView"; private TapPositionView tapPositionView; + private TextView speedTextView; + private TextView accTextView; + private ImageView speedImage; //圆弧颜色 private int mArcColor; @@ -52,15 +57,17 @@ public class TrafficDataView extends ConstraintLayout { private void initView(@NonNull Context context) { if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - LayoutInflater.from(context).inflate(R.layout.hmi_traffic_data, this); +// LayoutInflater.from(context).inflate(R.layout.hmi_traffic_data, this); } else { } LayoutInflater.from(context).inflate(R.layout.hmi_traffic_data, this); tapPositionView = findViewById(R.id.traffic_position); + speedImage = findViewById(R.id.speedImage); + speedTextView = findViewById(R.id.speedTextView); + accTextView = findViewById(R.id.speedAccTextView); } private final IMoGoAutopilotVehicleStateListener mIMoGoAutopilotVehicleStateListener = new IMoGoAutopilotVehicleStateListener() { - /** * 车辆转向灯 * @param lightSwitch @@ -110,7 +117,7 @@ public class TrafficDataView extends ConstraintLayout { public void run() { Log.d(TAG, "司机屏档位" + gear.toString()); if (tapPositionView != null) { - tapPositionView.updateWithGearForDriverPanel(gear); + tapPositionView.updateWithGear(gear); } } }); @@ -144,8 +151,9 @@ public class TrafficDataView extends ConstraintLayout { /** * 车速过快 */ - public void showWithSpeedValue(int newSpeed){ - + public void showWithSpeedValue(int newSpeed) { + speedTextView.setText(newSpeed); + speedImage.setBackgroundResource(newSpeed > 60 ? R.drawable.traffic_data_speed_warning : R.drawable.traffic_data_speed); } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_speed_warning.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_speed_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..487b0fde2a0c90cc29ee1ee2013cf188b9fa8e04 GIT binary patch literal 42479 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 Bu=)T1 literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml index 3ca69fddfc..08ae8a038d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml @@ -87,6 +87,8 @@ android:layout_width="@dimen/dp_390" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_42" + app:defaultColor = "@color/bus_p_default_txt_color" + app:selectColor="@color/bus_p_select_txt_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index 9fe0f33c09..84eda5f572 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -88,6 +88,8 @@ android:layout_width="@dimen/dp_272" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_30" + app:defaultColor="@color/taxi_p_default_txt_color" + app:selectColor="@color/dark_mode_select_txt_color" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/steering_circular_alpha" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml index 5ed8d38be7..9d1d739a87 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml @@ -12,7 +12,7 @@ android:gravity="center" android:text="P" android:textAlignment="center" - android:textColor="#6E8EC9" + android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -27,7 +27,7 @@ android:gravity="center" android:text="R" android:textAlignment="center" - android:textColor="#6E8EC9" + android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -42,7 +42,7 @@ android:gravity="center" android:text="N" android:textAlignment="center" - android:textColor="#6E8EC9" + android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -57,7 +57,7 @@ android:gravity="center" android:text="D" android:textAlignment="center" - android:textColor="#0043FF" + android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml index 7ab9138996..f1d4760c56 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml @@ -46,8 +46,8 @@ #E63B4577 #555C7E #3B4577 - #FF343C63 + #FF343C63 \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 0987758510..7c78ee5f7e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -60,5 +60,10 @@ #D945D3FF #D93261B6 #00FFFFFF - #FF343C63 + #FF343C63 + #0043FF + #6E8EC9 + #FF6E8EC9 + #FFFFFFFF + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java index f271a51d52..74e949014f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java @@ -282,7 +282,7 @@ public class AMapCustomView //导航全程光柱 options.setTrafficBarEnabled(false); //指南针 - options.setCompassEnabled(false); +// options.setCompassEnabled(false); options.setTilt((int) tilt); //自车车标 options.setCarBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_view_my_location_logo)); @@ -295,7 +295,10 @@ public class AMapCustomView //路线纹理自定义 RouteOverlayOptions routeOverlayOptions = new RouteOverlayOptions(); routeOverlayOptions.setTurnArrowIs3D(false); + routeOverlayOptions.setUnknownTraffic(BitmapFactory.decodeResource(getResources(),R.drawable.custtexture_no));//未知路段 routeOverlayOptions.setSmoothTraffic(BitmapFactory.decodeResource(getResources(), R.drawable.amap_custom_smooth_route)); + routeOverlayOptions.setJamTraffic(BitmapFactory.decodeResource(getResources(), R.drawable.custtexture_bad));//拥堵路段 + routeOverlayOptions.setVeryJamTraffic(BitmapFactory.decodeResource(getResources(), R.drawable.custtexture_grayred));//超级拥堵路段 routeOverlayOptions.setPassRoute(BitmapFactory.decodeResource(getResources(), R.drawable.custtexture_slow));//走过的路段 options.setRouteOverlayOptions(routeOverlayOptions); mAMapNaviView.setViewOptions(options); diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_no.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_no.png new file mode 100644 index 0000000000000000000000000000000000000000..40521d0788b14f479bec9009bedc6d2ff1a92dc7 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJG*1`DkcwMx&uQ~D7zngH+$(vV zRYm;3XAQnt3L9L-xHBW~&f*gJsV=!W>AA3`NA|Z>W@by?UQ_mYKDD%9-}Lp1n+|TfFE!By8ix!%I3L(^cPYbO+okpKp9(GZ-YqP%0Lgp0`njxgN@xNA13ff~ literal 0 HcmV?d00001