diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt deleted file mode 100644 index 41622d9785..0000000000 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt +++ /dev/null @@ -1,251 +0,0 @@ -package com.mogo.och.taxi.passenger.ui.video - -import android.annotation.SuppressLint -import android.app.Activity -import android.content.Context -import android.graphics.PixelFormat -import android.os.Build -import android.view.Gravity -import android.view.LayoutInflater -import android.view.View -import android.view.WindowManager -import android.widget.SeekBar -import androidx.appcompat.widget.AppCompatTextView -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.ContextCompat -import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.common.module.wigets.OCHGradientTextView -import com.mogo.och.taxi.passenger.R - -/** - * 视频全屏播放 - * - * @author yangyakun - */ -@SuppressLint("StaticFieldLeak") -object FloatingDistanceInfoUtils { - private const val TAG = "OverlayViewUtils" - private var windowManager: WindowManager? = null - - @Volatile - private var isShowing = false - - private var params:WindowManager.LayoutParams?=null - private var paramsBottom:WindowManager.LayoutParams?=null - - - private var orderInfoView: View?=null - private var processView: SeekBar?=null - - // 距离 - private var actvDistancew: OCHGradientTextView?=null - // 距离单位 - private var actvDistancewUnit: AppCompatTextView?=null - // 剩余时间 - private var actvSurplusTime: OCHGradientTextView?=null - // 到达时间 - private var actvArrivedTime: OCHGradientTextView?=null - - private var actvSpeed: OCHGradientTextView?=null - - - /** - * 添加覆盖View在Activity上面 - */ - @JvmOverloads - fun showOverlayView(context: Activity,ani: Int = -1,sumDis:Int) { - if (isShowing) { - return - } - if (windowManager == null) { - windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager - } - - orderInfoView = LayoutInflater.from(context) - .inflate(R.layout.taxi_p_window_float_distance_info, null) as ConstraintLayout - orderInfoView?.let { view -> - // 设置View显示模式，沉浸式的侵入到状态栏，导航栏 - view.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY - or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_LAYOUT_STABLE - or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) - layoutParams(ani) - actvSpeed = view.findViewById(R.id.actv_speed) - actvDistancew = view.findViewById(R.id.actv_distancew) - actvDistancewUnit = view.findViewById(R.id.actv_distancew_unit) - actvSurplusTime = view.findViewById(R.id.actv_surplus_time) - actvArrivedTime = view.findViewById(R.id.actv_arrived_time) - - val intArrayOf = intArrayOf( - context.resources.getColor(R.color.taxi_p_video_gradient_end), - context.resources.getColor(R.color.taxi_p_video_gradient_start) - ) - - actvSpeed?.setVertrial(true) - actvSpeed?.setmColorList(intArrayOf) - - actvDistancew?.setVertrial(true) - actvDistancew?.setmColorList(intArrayOf) - - actvSurplusTime?.setVertrial(true) - actvSurplusTime?.setmColorList(intArrayOf) - - actvArrivedTime?.setVertrial(true) - actvArrivedTime?.setmColorList(intArrayOf) - - processView = SeekBar(context) - processView?.let { - it.max = sumDis - layoutParamsBottom(-1) - it.setPadding(0,0,0,0) - it.progressDrawable = ContextCompat.getDrawable(context,R.drawable.taxi_video_order_process) - it.thumb = null - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - it.maxHeight = 14 - it.minHeight = 14 - } - } - - - // 如果正在展示中，并且lastOverlayView不为null，先做移除操作，保证覆盖在最上面的View只有一个，防止叠加导致无法移除 - dismissOverlayView() - - try { - windowManager!!.addView(orderInfoView, params) - windowManager!!.addView(processView, paramsBottom) - isShowing = true - } catch (e: Exception) { - e.printStackTrace() - } - } - } - - - private fun layoutParams(ani: Int) { - if(params ==null) { - params = WindowManager.LayoutParams() - } - params = WindowManager.LayoutParams() - params?.let { - it.width = WindowManager.LayoutParams.WRAP_CONTENT - it.height = WindowManager.LayoutParams.WRAP_CONTENT - it.alpha = 1.0f - it.gravity = Gravity.END or Gravity.TOP - it.x = 0 - it.y = 199 - it.format = PixelFormat.RGBA_8888 - // 设置窗口类型为应用子窗口，和PopupWindow同类型 - it.type = WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL - // 没有边界限制，允许窗口扩展到屏幕外 - it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or - WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or - WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or - WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL - if (ani != -1) { - it.windowAnimations = ani - } - } - } - - private fun layoutParamsBottom(ani: Int) { - if(paramsBottom ==null) { - paramsBottom = WindowManager.LayoutParams() - } - paramsBottom = WindowManager.LayoutParams() - paramsBottom?.let { - it.width = WindowManager.LayoutParams.MATCH_PARENT - it.height = WindowManager.LayoutParams.WRAP_CONTENT - it.alpha = 1.0f - it.gravity = Gravity.START or Gravity.BOTTOM - it.x = 0 - it.y = 0 - it.format = PixelFormat.RGBA_8888 - // 设置窗口类型为应用子窗口，和PopupWindow同类型 - it.type = WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL - // 没有边界限制，允许窗口扩展到屏幕外 - it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or - WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or - WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or - WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL - if (ani != -1) { - it.windowAnimations = ani - } - } - } - - fun setSpeed(speed: Float) { - val newSpeed: Int = (Math.abs(speed) * 3.6f).toInt() // 倒车时工控机反馈定位信息中speed为负值 - - UiThreadHandler.post { - actvSpeed?.text = "$newSpeed" - } - } - - fun setDistance(meters:Long,remainDis: String?, disUnit: String, time: Int, arriveTime: String) { - UiThreadHandler.post { - actvDistancew?.text = "$remainDis" - actvDistancewUnit?.text = "距离($disUnit)" - actvSurplusTime?.text = "$time" - actvArrivedTime?.text = arriveTime - - processView?.let { - val process = it.max - meters - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - it.setProgress(process.toInt(), true) - }else{ - it.progress = process.toInt() - } - it.jumpDrawablesToCurrentState() - } - - } - } - - /** - * 移除覆盖View在Activity上面 - */ - fun dismissOverlayView() { - if (!isShowing) { - return - } - try { - if (windowManager != null && orderInfoView != null) { - windowManager!!.removeViewImmediate(orderInfoView) - params = null - } - if (windowManager != null && processView != null) { - windowManager!!.removeViewImmediate(processView) - paramsBottom = null - } - if(windowManager!=null){ - windowManager = null - } - if (orderInfoView!=null) { - orderInfoView = null - } - if(processView!=null){ - processView = null - } - actvDistancew?.let { - actvDistancew = null - } - actvDistancewUnit?.let { - actvDistancewUnit = null - } - actvSurplusTime?.let { - actvSurplusTime = null - } - actvArrivedTime?.let { - actvArrivedTime = null - } - actvSpeed?.let { - actvSpeed = null - } - - isShowing = false - } catch (e: Exception) { - e.printStackTrace() - } - } -} \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png deleted file mode 100644 index cd14bf2760..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info_floating.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info_floating.png deleted file mode 100644 index ebe94ecd52..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info_floating.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png deleted file mode 100644 index 27cb9285d3..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/iv_light_increase_set.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_light_increase_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/iv_light_increase_set.png rename to OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_light_increase_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable/iv_light_set.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_light_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/iv_light_set.png rename to OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_light_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable/iv_voice_increase_set.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_voice_increase_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/iv_voice_increase_set.png rename to OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_voice_increase_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable/iv_voice_set.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_voice_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/iv_voice_set.png rename to OCH/taxi/passenger/src/main/res/drawable-xhdpi/iv_voice_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable/tail_ani_0000.webp b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/tail_ani_0000.webp similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/tail_ani_0000.webp rename to OCH/taxi/passenger/src/main/res/drawable-xhdpi/tail_ani_0000.webp diff --git a/OCH/taxi/passenger/src/main/res/drawable/tail_ani_0090.webp b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/tail_ani_0090.webp similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/tail_ani_0090.webp rename to OCH/taxi/passenger/src/main/res/drawable-xhdpi/tail_ani_0090.webp diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png deleted file mode 100644 index 75c26c3d71..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png deleted file mode 100644 index 927296d690..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png deleted file mode 100644 index 8b4b579b56..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png deleted file mode 100644 index 539e106058..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png deleted file mode 100644 index ef5a5ea880..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png deleted file mode 100644 index 39194f8e55..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png deleted file mode 100644 index 695515a366..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png deleted file mode 100644 index 3347b2bfc2..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png deleted file mode 100644 index a71cf9a4f9..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png deleted file mode 100644 index dd7dc2d6b2..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrive_end_panel_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrive_end_panel_bg.png deleted file mode 100644 index 8c7c04a122..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrive_end_panel_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_end_light.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_end_light.png deleted file mode 100644 index 046f001a37..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_end_light.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrow_nor.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrow_nor.png deleted file mode 100644 index b9d70e5fbb..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_arrow_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_auto_nor.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_auto_nor.png deleted file mode 100644 index c15a11f4e4..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_auto_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png old mode 100644 new mode 100755 index e57ab24b01..b05a7024f3 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png old mode 100644 new mode 100755 index 80a15f7f0b..4b60612ea3 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png deleted file mode 100644 index 46900bd157..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_function_voice_humb.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_function_voice_humb.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/taxi_p_function_voice_humb.png rename to OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_function_voice_humb.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_ic_autopilot_loading.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_ic_autopilot_loading.png deleted file mode 100644 index a71cf9a4f9..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_ic_autopilot_loading.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png old mode 100644 new mode 100755 index 8d08d98530..b5ed8c603b Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_light_green_nor.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_light_green_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_light_red_nor.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_light_red_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_lightyellow_nor.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_lightyellow_nor.png deleted file mode 100644 index bae01408fd..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_lightyellow_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png deleted file mode 100644 index 36ef2e88d3..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png deleted file mode 100644 index baa35592cb..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png old mode 100644 new mode 100755 index 3d4acc9951..ed796603d5 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png deleted file mode 100644 index 56452fe256..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_movies_title_icon.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_movies_title_icon.png deleted file mode 100644 index 72dc087fd4..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_movies_title_icon.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogologo_nor.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogologo_nor.png deleted file mode 100644 index ec1692cdcd..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_mogologo_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png deleted file mode 100644 index 83392d5cc4..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png deleted file mode 100644 index 328da8bc90..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_robot.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_robot.png deleted file mode 100644 index 156a3d1526..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_robot.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star.png deleted file mode 100644 index e172c9e9cf..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star_check.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star_check.png deleted file mode 100644 index 4f7770b502..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star_check.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png old mode 100644 new mode 100755 index f3892d99b1..689770a17d Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_seekbar_point_icon.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_seekbar_point_icon.png deleted file mode 100644 index ab00b6fde3..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_seekbar_point_icon.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png new file mode 100755 index 0000000000..b0338640a1 Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_green_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_green_bg.png deleted file mode 100644 index fda0da73e4..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_green_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_red_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_red_bg.png deleted file mode 100644 index 4fa0e570fa..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_red_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png old mode 100644 new mode 100755 index 9ef3dedd65..32cda5c4ab Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_long.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_long.png deleted file mode 100755 index 4bcb596e68..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_long.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_medium.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_medium.png deleted file mode 100755 index a0b6559ee0..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_medium.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_un_auto_nor.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_un_auto_nor.png deleted file mode 100644 index 08a8e7366a..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_un_auto_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png deleted file mode 100755 index dbfb370906..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png deleted file mode 100644 index 4192d9cbd7..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png deleted file mode 100644 index f9b70e6888..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png old mode 100644 new mode 100755 index 99bfcefc6f..1f839ed568 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png old mode 100644 new mode 100755 index e9f0ea0090..5faf81f617 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png and b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow.png deleted file mode 100644 index b348323df0..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png deleted file mode 100644 index 24a02712f9..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png deleted file mode 100644 index 62942a7a42..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png deleted file mode 100644 index f4ab3deb31..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00000.png b/OCH/taxi/passenger/src/main/res/drawable/image_00000.png old mode 100644 new mode 100755 index 7d887647ed..ad219a6fa0 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00000.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00000.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00001.png b/OCH/taxi/passenger/src/main/res/drawable/image_00001.png old mode 100644 new mode 100755 index 9cf5bda880..91132466c9 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00001.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00001.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00002.png b/OCH/taxi/passenger/src/main/res/drawable/image_00002.png old mode 100644 new mode 100755 index 6077a2c08f..87a2a8d3b5 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00002.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00002.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00003.png b/OCH/taxi/passenger/src/main/res/drawable/image_00003.png old mode 100644 new mode 100755 index 047b3c3d2c..6959f79b9c Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00003.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00003.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00004.png b/OCH/taxi/passenger/src/main/res/drawable/image_00004.png old mode 100644 new mode 100755 index 4f615372d7..083900fed9 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00004.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00004.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00005.png b/OCH/taxi/passenger/src/main/res/drawable/image_00005.png old mode 100644 new mode 100755 index 959dbd6c57..17bc486ffd Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00005.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00005.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00006.png b/OCH/taxi/passenger/src/main/res/drawable/image_00006.png old mode 100644 new mode 100755 index 59aa3aa5a7..6ef37fdb92 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00006.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00006.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00007.png b/OCH/taxi/passenger/src/main/res/drawable/image_00007.png old mode 100644 new mode 100755 index d623763a76..fa72979a0d Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00007.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00007.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00008.png b/OCH/taxi/passenger/src/main/res/drawable/image_00008.png old mode 100644 new mode 100755 index 8f548bfbf0..0b076bc8f1 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00008.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00008.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00009.png b/OCH/taxi/passenger/src/main/res/drawable/image_00009.png old mode 100644 new mode 100755 index 6127862fcd..c62b70195d Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00009.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00009.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00010.png b/OCH/taxi/passenger/src/main/res/drawable/image_00010.png old mode 100644 new mode 100755 index d12a204bd3..73342e7fb9 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00010.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00010.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00011.png b/OCH/taxi/passenger/src/main/res/drawable/image_00011.png old mode 100644 new mode 100755 index ba1ec584d3..1c15329feb Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00011.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00011.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00012.png b/OCH/taxi/passenger/src/main/res/drawable/image_00012.png old mode 100644 new mode 100755 index 9f8ef18110..7e353ecb4f Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00012.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00012.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00013.png b/OCH/taxi/passenger/src/main/res/drawable/image_00013.png old mode 100644 new mode 100755 index a6c4c29ca6..9da325091a Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00013.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00013.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00014.png b/OCH/taxi/passenger/src/main/res/drawable/image_00014.png old mode 100644 new mode 100755 index 4d686d6906..fb152247de Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00014.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00014.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00015.png b/OCH/taxi/passenger/src/main/res/drawable/image_00015.png old mode 100644 new mode 100755 index 229d90ea91..4b35b8379d Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00015.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00015.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00016.png b/OCH/taxi/passenger/src/main/res/drawable/image_00016.png old mode 100644 new mode 100755 index 76566ef4cf..ce0f0f0cfd Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00016.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00016.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00017.png b/OCH/taxi/passenger/src/main/res/drawable/image_00017.png old mode 100644 new mode 100755 index 0c737824f2..ec5b1b9245 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00017.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00017.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00018.png b/OCH/taxi/passenger/src/main/res/drawable/image_00018.png old mode 100644 new mode 100755 index ed21f50463..55cb4ab0f0 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00018.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00018.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00019.png b/OCH/taxi/passenger/src/main/res/drawable/image_00019.png old mode 100644 new mode 100755 index 6c3d2f36d1..a266730cbb Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00019.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00019.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00020.png b/OCH/taxi/passenger/src/main/res/drawable/image_00020.png old mode 100644 new mode 100755 index 79ba9c2d55..d7511c60ec Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00020.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00020.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00021.png b/OCH/taxi/passenger/src/main/res/drawable/image_00021.png old mode 100644 new mode 100755 index 344298c6fa..1d513fa5d3 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00021.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00021.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00022.png b/OCH/taxi/passenger/src/main/res/drawable/image_00022.png old mode 100644 new mode 100755 index d4a3aa37ac..aa0fe8140e Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00022.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00022.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00023.png b/OCH/taxi/passenger/src/main/res/drawable/image_00023.png old mode 100644 new mode 100755 index bf16bc01e3..33cc69dca9 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00023.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00023.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00024.png b/OCH/taxi/passenger/src/main/res/drawable/image_00024.png old mode 100644 new mode 100755 index 4393d89daa..609100cf2a Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00024.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00024.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00025.png b/OCH/taxi/passenger/src/main/res/drawable/image_00025.png old mode 100644 new mode 100755 index 0d806f46f3..0b4da3f947 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00025.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00025.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00026.png b/OCH/taxi/passenger/src/main/res/drawable/image_00026.png old mode 100644 new mode 100755 index 1d66ff5f0f..75aa470952 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00026.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00026.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00027.png b/OCH/taxi/passenger/src/main/res/drawable/image_00027.png old mode 100644 new mode 100755 index 48cb04e811..5cae05bab0 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00027.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00027.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00028.png b/OCH/taxi/passenger/src/main/res/drawable/image_00028.png old mode 100644 new mode 100755 index 346985a730..6466bb2ec7 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00028.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00028.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00029.png b/OCH/taxi/passenger/src/main/res/drawable/image_00029.png old mode 100644 new mode 100755 index fa5570051b..0f480e37b8 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00029.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00029.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00030.png b/OCH/taxi/passenger/src/main/res/drawable/image_00030.png old mode 100644 new mode 100755 index e3a021bcdd..3b077b70d4 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00030.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00030.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00031.png b/OCH/taxi/passenger/src/main/res/drawable/image_00031.png old mode 100644 new mode 100755 index 997acf4628..b4ee1f783b Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00031.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00031.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00032.png b/OCH/taxi/passenger/src/main/res/drawable/image_00032.png old mode 100644 new mode 100755 index c203740591..451ee41777 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00032.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00032.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00033.png b/OCH/taxi/passenger/src/main/res/drawable/image_00033.png old mode 100644 new mode 100755 index 60c9ca07c1..b0f54dfbf4 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00033.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00033.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/image_00034.png b/OCH/taxi/passenger/src/main/res/drawable/image_00034.png old mode 100644 new mode 100755 index c1c8de33df..afb758f6d2 Binary files a/OCH/taxi/passenger/src/main/res/drawable/image_00034.png and b/OCH/taxi/passenger/src/main/res/drawable/image_00034.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00000.png b/OCH/taxi/passenger/src/main/res/drawable/light_00000.png old mode 100644 new mode 100755 index 5aae3fd86e..94cf04741b Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00000.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00000.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00001.png b/OCH/taxi/passenger/src/main/res/drawable/light_00001.png old mode 100644 new mode 100755 index ea026b1519..a33bb182c0 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00001.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00001.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00002.png b/OCH/taxi/passenger/src/main/res/drawable/light_00002.png old mode 100644 new mode 100755 index 0c759d3144..62d06f31f2 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00002.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00002.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00003.png b/OCH/taxi/passenger/src/main/res/drawable/light_00003.png old mode 100644 new mode 100755 index 3ec26bf793..8c48101448 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00003.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00003.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00004.png b/OCH/taxi/passenger/src/main/res/drawable/light_00004.png old mode 100644 new mode 100755 index bbeeaab0e9..c30e868df9 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00004.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00004.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00005.png b/OCH/taxi/passenger/src/main/res/drawable/light_00005.png old mode 100644 new mode 100755 index 4a33f8d9b1..e49896b33a Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00005.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00005.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00006.png b/OCH/taxi/passenger/src/main/res/drawable/light_00006.png old mode 100644 new mode 100755 index 6f4cc5ba4f..01048ba3ec Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00006.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00006.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00007.png b/OCH/taxi/passenger/src/main/res/drawable/light_00007.png old mode 100644 new mode 100755 index 2a8b59e10d..258d79d868 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00007.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00007.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00008.png b/OCH/taxi/passenger/src/main/res/drawable/light_00008.png old mode 100644 new mode 100755 index 0d41d05357..07a8d7d87f Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00008.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00008.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00009.png b/OCH/taxi/passenger/src/main/res/drawable/light_00009.png old mode 100644 new mode 100755 index dbea71933f..835539331b Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00009.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00009.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00010.png b/OCH/taxi/passenger/src/main/res/drawable/light_00010.png old mode 100644 new mode 100755 index 640b30dc9f..aa016c8382 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00010.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00010.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00011.png b/OCH/taxi/passenger/src/main/res/drawable/light_00011.png old mode 100644 new mode 100755 index 2ab41deea3..b8ccfb7cc4 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00011.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00011.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00012.png b/OCH/taxi/passenger/src/main/res/drawable/light_00012.png old mode 100644 new mode 100755 index ba65b3bb1a..9305c86983 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00012.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00012.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/light_00013.png b/OCH/taxi/passenger/src/main/res/drawable/light_00013.png old mode 100644 new mode 100755 index 4a90fbf8e8..9aa4bd5c29 Binary files a/OCH/taxi/passenger/src/main/res/drawable/light_00013.png and b/OCH/taxi/passenger/src/main/res/drawable/light_00013.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml b/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml deleted file mode 100644 index e01265811f..0000000000 --- a/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_status_bg_check.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_status_bg_check.png deleted file mode 100644 index 28857974b5..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_status_bg_check.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_status_bg_nor.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_status_bg_nor.png deleted file mode 100644 index f7d4f92c4b..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_autopilot_status_bg_nor.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml b/OCH/taxi/passenger/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml deleted file mode 100644 index 58aca03b29..0000000000 --- a/OCH/taxi/passenger/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_arrow_arrived.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_map_arrow_arrived.png deleted file mode 100644 index 36ef2e88d3..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_arrow_arrived.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png deleted file mode 100644 index baa35592cb..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_car.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_map_car.png deleted file mode 100644 index dedaf093e9..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_car.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_view_dir_end.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_map_view_dir_end.png deleted file mode 100644 index a81336d4c2..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_view_dir_end.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_view_dir_start.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_map_view_dir_start.png deleted file mode 100644 index 3cee184981..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_map_view_dir_start.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_setting_view_bg.png b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_setting_view_bg.png deleted file mode 100644 index 3b9fadf64c..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_setting_view_bg.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_safety_belt.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_safety_belt.png index 1f44f3d499..f8633367d4 100644 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_safety_belt.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_safety_belt.png differ diff --git a/OCH/taxi/passenger/src/main/res/layout/list_video_item_normal.xml b/OCH/taxi/passenger/src/main/res/layout/list_video_item_normal.xml deleted file mode 100644 index a51634a7c2..0000000000 --- a/OCH/taxi/passenger/src/main/res/layout/list_video_item_normal.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_mogo_movies.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_mogo_movies.xml deleted file mode 100644 index 1eeb201cb5..0000000000 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_mogo_movies.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml deleted file mode 100644 index e95cf77a24..0000000000 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt index ba02fa0954..527fc424a5 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt @@ -13,7 +13,10 @@ import android.view.LayoutInflater import android.view.View import android.widget.LinearLayout import android.widget.TextView +import androidx.lifecycle.ProcessLifecycleOwner +import androidx.lifecycle.lifecycleScope import androidx.localbroadcastmanager.content.LocalBroadcastManager +import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.eagle.core.function.main.MainMoGoApplication import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -43,6 +46,8 @@ import kotlinx.android.synthetic.main.taxi_debug_order.view.orderStartSiteInfo import kotlinx.android.synthetic.main.taxi_debug_order.view.orderStatus import kotlinx.android.synthetic.main.taxi_debug_order.view.taskEndSite import kotlinx.android.synthetic.main.taxi_debug_order.view.taskStartSite +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch public class DebugView @JvmOverloads constructor( @@ -50,20 +55,25 @@ public class DebugView @JvmOverloads constructor( ) : LinearLayout(context, attrs, defStyleAttr, defStyleRes), ITaxiTaskWithOrderCallback { companion object { const val TAG = "DebugView" + private const val ANALYTICS_EVENT_TYPE_DRIVER_UNMANNED_OPERATION_PROCESS_KEY_NODE_LOG = + "och.driver.unmanned.operation.process.key.node.log" const val BROADCAST_ACTION = "com.mogo.och.driver.debugview.show" const val BROADCAST_DATA_SHOW = "isShow" private var logHistoryTextView: TextView? = null fun printInfoMsg(msg: String) { printMsg("Info $msg", MainMoGoApplication.getApp().getColor(R.color.background_info)) + trackEvent("Info", msg) } fun printWarnMsg(msg: String) { printMsg("Warn $msg", MainMoGoApplication.getApp().getColor(R.color.background_warn)) + trackEvent("Warn", msg) } fun printErrorMsg(msg: String) { printMsg("Error $msg", MainMoGoApplication.getApp().getColor(R.color.background_error)) + trackEvent("Error", msg) } private fun printMsg(msg: String, textColor: Int) { @@ -86,6 +96,18 @@ public class DebugView @JvmOverloads constructor( } } + /** + * 上报埋点 + */ + private fun trackEvent(level: String, msg: String) { + ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.IO) { + val map: MutableMap = HashMap() + map["level"] = level + map["msg"] = msg + MogoAnalyticUtils.track(ANALYTICS_EVENT_TYPE_DRIVER_UNMANNED_OPERATION_PROCESS_KEY_NODE_LOG, map) + } + } + private fun currentDateTimeString(): String { return DateTimeUtil.formatCalendarToString( DateTimeUtil.formatLongToCalendar(System.currentTimeMillis()), diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml deleted file mode 100644 index 67843a4b8c..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml deleted file mode 100644 index 4a771923d6..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png old mode 100644 new mode 100755 index e57ab24b01..b05a7024f3 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png old mode 100644 new mode 100755 index 80a15f7f0b..4b60612ea3 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png old mode 100644 new mode 100755 index 8d08d98530..b5ed8c603b Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png old mode 100644 new mode 100755 index 3d4acc9951..ed796603d5 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png deleted file mode 100644 index 56452fe256..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png old mode 100644 new mode 100755 index f3892d99b1..689770a17d Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png old mode 100644 new mode 100755 index 3b9fadf64c..b0338640a1 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png old mode 100644 new mode 100755 index 9ef3dedd65..32cda5c4ab Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png deleted file mode 100644 index 99bfcefc6f..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.webp new file mode 100644 index 0000000000..4e6fbf5740 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.webp differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png deleted file mode 100644 index e9f0ea0090..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.webp new file mode 100644 index 0000000000..563e818e94 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.webp differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/xiaozhi_safety_belt.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/xiaozhi_safety_belt.png deleted file mode 100644 index 1f44f3d499..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/xiaozhi_safety_belt.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000.png old mode 100644 new mode 100755 index 7d887647ed..ad219a6fa0 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00001.png old mode 100644 new mode 100755 index 9cf5bda880..91132466c9 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00001.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00001.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00002.png old mode 100644 new mode 100755 index 6077a2c08f..87a2a8d3b5 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00002.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00002.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00003.png old mode 100644 new mode 100755 index 047b3c3d2c..6959f79b9c Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00003.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00003.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00004.png old mode 100644 new mode 100755 index 4f615372d7..083900fed9 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00004.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00004.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00005.png old mode 100644 new mode 100755 index 959dbd6c57..17bc486ffd Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00005.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00005.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00006.png old mode 100644 new mode 100755 index 59aa3aa5a7..6ef37fdb92 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00006.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00006.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00007.png old mode 100644 new mode 100755 index d623763a76..fa72979a0d Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00007.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00007.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00008.png old mode 100644 new mode 100755 index 8f548bfbf0..0b076bc8f1 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00008.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00008.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00009.png old mode 100644 new mode 100755 index 6127862fcd..c62b70195d Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00009.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00009.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00010.png old mode 100644 new mode 100755 index d12a204bd3..73342e7fb9 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00010.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00010.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00011.png old mode 100644 new mode 100755 index ba1ec584d3..1c15329feb Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00011.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00011.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00012.png old mode 100644 new mode 100755 index 9f8ef18110..7e353ecb4f Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00012.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00012.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00013.png old mode 100644 new mode 100755 index a6c4c29ca6..9da325091a Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00013.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00013.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00014.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00014.png old mode 100644 new mode 100755 index 4d686d6906..fb152247de Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00014.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00014.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00015.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00015.png old mode 100644 new mode 100755 index 229d90ea91..4b35b8379d Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00015.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00015.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00016.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00016.png old mode 100644 new mode 100755 index 76566ef4cf..ce0f0f0cfd Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00016.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00016.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00017.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00017.png old mode 100644 new mode 100755 index 0c737824f2..ec5b1b9245 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00017.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00017.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00018.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00018.png old mode 100644 new mode 100755 index ed21f50463..55cb4ab0f0 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00018.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00018.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00019.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00019.png old mode 100644 new mode 100755 index 6c3d2f36d1..a266730cbb Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00019.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00019.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00020.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00020.png old mode 100644 new mode 100755 index 79ba9c2d55..d7511c60ec Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00020.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00020.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00021.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00021.png old mode 100644 new mode 100755 index 344298c6fa..1d513fa5d3 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00021.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00021.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00022.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00022.png old mode 100644 new mode 100755 index d4a3aa37ac..aa0fe8140e Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00022.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00022.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00023.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00023.png old mode 100644 new mode 100755 index bf16bc01e3..33cc69dca9 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00023.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00023.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00024.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00024.png old mode 100644 new mode 100755 index 4393d89daa..609100cf2a Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00024.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00024.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00025.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00025.png old mode 100644 new mode 100755 index 0d806f46f3..0b4da3f947 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00025.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00025.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00026.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00026.png old mode 100644 new mode 100755 index 1d66ff5f0f..75aa470952 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00026.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00026.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00027.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00027.png old mode 100644 new mode 100755 index 48cb04e811..5cae05bab0 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00027.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00027.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00028.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00028.png old mode 100644 new mode 100755 index 346985a730..6466bb2ec7 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00028.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00028.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00029.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00029.png old mode 100644 new mode 100755 index fa5570051b..0f480e37b8 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00029.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00029.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00030.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00030.png old mode 100644 new mode 100755 index e3a021bcdd..3b077b70d4 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00030.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00030.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00031.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00031.png old mode 100644 new mode 100755 index 997acf4628..b4ee1f783b Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00031.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00031.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00032.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00032.png old mode 100644 new mode 100755 index c203740591..451ee41777 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00032.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00032.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00033.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00033.png old mode 100644 new mode 100755 index 60c9ca07c1..b0f54dfbf4 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00033.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00033.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00034.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00034.png old mode 100644 new mode 100755 index c1c8de33df..afb758f6d2 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00034.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00034.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00000.png old mode 100644 new mode 100755 index 5aae3fd86e..94cf04741b Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00000.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00000.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00001.png old mode 100644 new mode 100755 index ea026b1519..a33bb182c0 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00001.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00001.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00002.png old mode 100644 new mode 100755 index 0c759d3144..62d06f31f2 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00002.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00002.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00003.png old mode 100644 new mode 100755 index 3ec26bf793..8c48101448 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00003.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00003.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00004.png old mode 100644 new mode 100755 index bbeeaab0e9..c30e868df9 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00004.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00004.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00005.png old mode 100644 new mode 100755 index 4a33f8d9b1..e49896b33a Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00005.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00005.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00006.png old mode 100644 new mode 100755 index 6f4cc5ba4f..01048ba3ec Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00006.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00006.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00007.png old mode 100644 new mode 100755 index 2a8b59e10d..258d79d868 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00007.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00007.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00008.png old mode 100644 new mode 100755 index 0d41d05357..07a8d7d87f Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00008.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00008.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00009.png old mode 100644 new mode 100755 index dbea71933f..835539331b Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00009.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00009.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00010.png old mode 100644 new mode 100755 index 640b30dc9f..aa016c8382 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00010.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00010.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00011.png old mode 100644 new mode 100755 index 2ab41deea3..b8ccfb7cc4 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00011.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00011.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00012.png old mode 100644 new mode 100755 index ba65b3bb1a..9305c86983 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00012.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00012.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00013.png old mode 100644 new mode 100755 index 4a90fbf8e8..9aa4bd5c29 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00013.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00013.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_map_arrow_arrived.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_map_arrow_arrived.png deleted file mode 100644 index 36ef2e88d3..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_map_arrow_arrived.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png deleted file mode 100644 index baa35592cb..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_order_process.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_order_process.xml index 36db1355c2..a7557622c9 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_order_process.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_order_process.xml @@ -19,7 +19,7 @@ - + diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml index 30ed19fa3c..e9d7160313 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml @@ -19,7 +19,7 @@ - + diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_safety_belt.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_safety_belt.png new file mode 100755 index 0000000000..8901359bc3 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_safety_belt.png differ