diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml b/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml index 76cd62f84a..b5de2ba236 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml @@ -47,7 +47,7 @@ android:id="@+id/module_och_taxi_order_status_station_2" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" + android:paddingLeft="40dp" android:paddingRight="40dp" app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_server_status_tv"> diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index 0c41cbf42e..a2dc7ddf4f 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -91,7 +91,6 @@ object TaxiPassengerModel { */ fun release() { startOrStopOrderLoop(false) - //startOrStopQueryOrderRemaining(false) releaseListeners() } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index f7123f20e0..dcdd6ebc0b 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -9,8 +9,6 @@ import android.view.View import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.AIAssist -import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -25,7 +23,6 @@ import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter -import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.ui.bar.LeftBarView import com.mogo.och.taxi.passenger.ui.bottom.BottomBar import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView diff --git a/OCH/taxi/passenger/src/main/res/values/colors.xml b/OCH/taxi/passenger/src/main/res/values/colors.xml index f5b78bbda6..301ca6cbd9 100644 --- a/OCH/taxi/passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/passenger/src/main/res/values/colors.xml @@ -34,7 +34,6 @@ - #76D7FF #255BAA #80F8FF #A0B3DA diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt similarity index 94% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt index aa86218a01..96460652e2 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt @@ -16,9 +16,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider -import com.mogo.och.taxi.passenger.R -import kotlinx.android.synthetic.main.taxi_p_right_rear_cam.view.actv_cam_position_group -import kotlinx.android.synthetic.main.taxi_p_right_rear_cam.view.v_video_right_rear +import com.mogo.och.taxi.passenger.common.R +import kotlinx.android.synthetic.main.taxt_p_right_rear_cam.view.actv_cam_position_group +import kotlinx.android.synthetic.main.taxt_p_right_rear_cam.view.v_video_right_rear /** * @@ -43,7 +43,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") - LayoutInflater.from(context).inflate(R.layout.taxi_p_right_rear_cam, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_p_right_rear_cam, this, true) } override fun onAttachedToWindow() { @@ -51,7 +51,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, } override fun onDetachedFromWindow() { - super.onDetachedFromWindow() + super.onDetachedFromWindow() } override fun onVisibilityAggregated(isVisible: Boolean) { @@ -84,7 +84,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, fun resetView(){ actv_cam_position_group.visibility = GONE - v_video_right_rear.setImageResource(R.drawable.taxi_p_right_rear_cam) + v_video_right_rear.setImageResource(R.drawable.taxt_p_right_rear_cam) } override fun onBackCameraVideo(data: ByteArray) { diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_arrived_glide.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_arrived_glide.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_arrived_glide.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_arrived_glide.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_right_rear_cam.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_right_rear_cam.png old mode 100644 new mode 100755 similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_right_rear_cam.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_right_rear_cam.png diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_right_rear_cam.xml b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_right_rear_cam.xml similarity index 91% rename from OCH/taxi/passenger/src/main/res/layout/taxi_p_right_rear_cam.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxt_p_right_rear_cam.xml index d5c147cb67..b9b8986477 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_right_rear_cam.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_right_rear_cam.xml @@ -10,13 +10,13 @@ android:id="@+id/v_video_right_rear" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - android:src="@drawable/taxi_p_right_rear_cam" + android:src="@drawable/taxt_p_right_rear_cam" android:layout_width="@dimen/dp_900" android:layout_height="@dimen/dp_506"/> diff --git a/OCH/taxi/pcommon/src/main/res/values/colors.xml b/OCH/taxi/pcommon/src/main/res/values/colors.xml index e6f45a4f3b..b85af92c35 100644 --- a/OCH/taxi/pcommon/src/main/res/values/colors.xml +++ b/OCH/taxi/pcommon/src/main/res/values/colors.xml @@ -15,5 +15,6 @@ #374968 #131415 #80FFFFFF + #76D7FF \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt deleted file mode 100644 index e56952e288..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt +++ /dev/null @@ -1,172 +0,0 @@ -package com.mogo.och.unmanned.passenger.ui.arrived - -import android.content.Context -import android.graphics.Bitmap -import android.graphics.BitmapFactory -import android.graphics.drawable.BitmapDrawable -import android.util.AttributeSet -import android.view.LayoutInflater -import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.function.api.autopilot.IMoGoBackCameraVideoListener -import com.mogo.eagle.core.function.api.autopilot.IMoGoRoboBusJinlvM1StitchedVideoListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager -import com.mogo.eagle.core.function.call.autopilot.CallerBackCameraVideoListenerManager -import com.mogo.eagle.core.function.call.autopilot.CallerRoboBusJinlvM1StitchedVideoListenerManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider -import com.mogo.och.unmanned.taxi.passenger.R -import kotlinx.android.synthetic.main.taxt_u_p_right_rear_cam.view.actv_cam_position_group -import kotlinx.android.synthetic.main.taxt_u_p_right_rear_cam.view.v_video_right_rear - -/** - * - * 评价View - * Created on 2022/5/16 - */ -class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, - IMoGoRoboBusJinlvM1StitchedVideoListener,Runnable { - - constructor(context: Context) : super(context) - - constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) - - constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) - - constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) - - private var mBitmap: Bitmap? = null - - private var mBitmapOptions: BitmapFactory.Options? = null //Bitmap管理类，可有效减少Bitmap的OOM问题 - - - private fun initView() { - d(SceneConstant.M_TAXI_P + TAG, "initView") - LayoutInflater.from(context).inflate(R.layout.taxt_u_p_right_rear_cam, this, true) - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - } - - override fun onVisibilityAggregated(isVisible: Boolean) { - super.onVisibilityAggregated(isVisible) - if(isVisible){ - d(SceneConstant.M_TAXI_P + TAG, "展示--可见") - CallerAutoPilotControlManager.setIsSubscribeBackCameraVideoVideo(1, true) - CallerBackCameraVideoListenerManager.addListener(TAG, this) - CallerRoboBusJinlvM1StitchedVideoListenerManager.addListener(TAG, this) - }else{ - d(SceneConstant.M_TAXI_P + TAG, "展示--不可见") - CallerAutoPilotControlManager.setIsSubscribeBackCameraVideoVideo(1, false) - CallerBackCameraVideoListenerManager.removeListener(this) - CallerRoboBusJinlvM1StitchedVideoListenerManager.removeListener(this) - } - } - - - companion object { - const val TAG = "RightRearCamView" - } - - init { - try { - initView() - } catch (e: Exception) { - e.printStackTrace() - } - } - - fun resetView(){ - actv_cam_position_group.visibility = GONE - v_video_right_rear.setImageResource(R.drawable.taxt_u_p_right_rear_cam) - } - - override fun onBackCameraVideo(data: ByteArray) { - decodeData(data) - } - - override fun onRoboBusJinlvM1StitchedVideo(data: ByteArray) { - decodeData(data) - } - - var preTime :Long=System.currentTimeMillis() - - @Synchronized - private fun decodeData(data: ByteArray){ - val currentTimeMillis = System.currentTimeMillis() - val dexTime = currentTimeMillis - preTime - preTime = currentTimeMillis - if(dexTime<20){ - return - } - d(SceneConstant.M_TAXI_P + TAG, "图片频率：$dexTime") - if (mBitmapOptions == null) { - val bmp = (v_video_right_rear.drawable as BitmapDrawable).bitmap - val width = bmp.width - val height = bmp.height - val config = bmp.config - mBitmap = Bitmap.createBitmap(width, height, config) - mBitmapOptions = BitmapFactory.Options() - //设置Bitmap内存复用 - mBitmapOptions!!.inBitmap = mBitmap //Bitmap复用内存块，类似对象池，避免不必要的内存分配和回收 - mBitmapOptions!!.inMutable = true //解码时返回可变Bitmap - - val options = BitmapFactory.Options() - options.inJustDecodeBounds = true - BitmapFactory.decodeByteArray(data, 0, data.size, options) - mBitmapOptions!!.inSampleSize = calculateInSampleSize(options, width, height) - } - mBitmapOptions?.let { - try { - val preTime = System.currentTimeMillis() - BitmapFactory.decodeByteArray(data, 0, data.size, mBitmapOptions) - d(SceneConstant.M_TAXI_P + TAG, "decode时间：${System.currentTimeMillis()-preTime}") - UiThreadHandler.post(this) - } catch (e: Exception) { - e.printStackTrace() - } - } - } - - private fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int { - val width = options.outWidth - val height = options.outHeight - d(SceneConstant.M_TAXI_P + TAG, "calculateInSampleSize: out width and height is $width height $height") - var inSampleWidth = 1 - if (height > reqHeight || width > reqWidth) { - val halfHeight = height / 2 - val halfWidth = width / 2 - // 采样率设置为2的指数 - while (halfHeight / inSampleWidth >= reqHeight && halfWidth / inSampleWidth >= reqWidth) { - inSampleWidth *= 2 - } - } - - while (width/inSampleWidth>reqWidth||height/inSampleWidth>reqHeight){ - inSampleWidth++ - } - - return inSampleWidth - } - - - override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { - super.onSizeChanged(w, h, oldw, oldh) - outlineProvider = TextureVideoViewOutlineProvider(36f) - clipToOutline = true - } - - override fun run() { - if(actv_cam_position_group?.visibility == GONE) { - actv_cam_position_group?.visibility = VISIBLE - } - v_video_right_rear?.setImageBitmap(mBitmap) - v_video_right_rear?.scaleX = -1f - } -} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_arrived_glide.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_arrived_glide.png deleted file mode 100644 index adc24a4587..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_arrived_glide.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_right_rear_cam.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_right_rear_cam.png deleted file mode 100755 index cc4cdceca5..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_right_rear_cam.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml index c9c81e493d..fa8a889dc4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml index 0b76883ce1..76d73b23dc 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml @@ -42,7 +42,6 @@ #2CBFFC #1060ff #96a5c2 - #76D7FF #255BAA #80F8FF #464646