diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/LoadingViewBig.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/loading/LoadingViewBig.kt similarity index 79% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/LoadingViewBig.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/loading/LoadingViewBig.kt index 5f1f12f2d2..d1e1667324 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/LoadingViewBig.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/loading/LoadingViewBig.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.view +package com.mogo.och.common.module.wigets.loading import android.animation.ObjectAnimator import android.content.Context @@ -9,9 +9,9 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.map.listener.IMogoMapListener -import com.mogo.och.shuttle.weaknet.R -import kotlinx.android.synthetic.main.shuttle_weak_loading_view.view.actv_loading_text -import kotlinx.android.synthetic.main.shuttle_weak_loading_view.view.loading_view +import com.mogo.och.common.module.R +import kotlinx.android.synthetic.main.common_loading_view_big.view.actv_loading_text_big +import kotlinx.android.synthetic.main.common_loading_view_big.view.loading_view_big class LoadingViewBig @JvmOverloads constructor( context: Context, @@ -25,14 +25,14 @@ class LoadingViewBig @JvmOverloads constructor( private var autopilotLoadingAnimator: ObjectAnimator? = null init { - LayoutInflater.from(context).inflate(R.layout.shuttle_weak_loading_view, this, true) + LayoutInflater.from(context).inflate(R.layout.common_loading_view_big, this, true) } override fun onAttachedToWindow() { super.onAttachedToWindow() CallerLogger.d(TAG,"onAttachedToWindow") if (autopilotLoadingAnimator == null) { - autopilotLoadingAnimator = ObjectAnimator.ofFloat(loading_view, "rotation", 0f, 360f) + autopilotLoadingAnimator = ObjectAnimator.ofFloat(loading_view_big, "rotation", 0f, 360f) autopilotLoadingAnimator?.setInterpolator(LinearInterpolator()) autopilotLoadingAnimator?.setRepeatCount(-1) //无限循环 autopilotLoadingAnimator?.setDuration(1000) //设置持续时间 @@ -50,10 +50,10 @@ class LoadingViewBig @JvmOverloads constructor( fun setEmptyText(text:CharSequence){ if (ThreadUtils.isMainThread()) { - actv_loading_text.text = text + actv_loading_text_big.text = text }else{ ThreadUtils.runOnUiThread( { - actv_loading_text.text = text + actv_loading_text_big.text = text },ThreadUtils.MODE.QUEUE) } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/LoadingViewSmall.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/loading/LoadingViewSmall.kt similarity index 85% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/LoadingViewSmall.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/loading/LoadingViewSmall.kt index 2a73441215..8f4580ec60 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/LoadingViewSmall.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/loading/LoadingViewSmall.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.view +package com.mogo.och.common.module.wigets.loading import android.animation.ObjectAnimator import android.content.Context @@ -8,8 +8,8 @@ import android.view.animation.LinearInterpolator import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.map.listener.IMogoMapListener -import com.mogo.och.shuttle.weaknet.R -import kotlinx.android.synthetic.main.shuttle_weak_loading_view_samll.view.loading_view_samll +import com.mogo.och.common.module.R +import kotlinx.android.synthetic.main.common_loading_view_samll.view.loading_view_samll class LoadingViewSmall @JvmOverloads constructor( context: Context, @@ -23,7 +23,7 @@ class LoadingViewSmall @JvmOverloads constructor( private var autopilotLoadingAnimator: ObjectAnimator? = null init { - LayoutInflater.from(context).inflate(R.layout.shuttle_weak_loading_view_samll, this, true) + LayoutInflater.from(context).inflate(R.layout.common_loading_view_samll, this, true) } override fun onAttachedToWindow() { diff --git a/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_biz_loading_big.png b/OCH/common/common/src/main/res/drawable-nodpi/common_biz_loading_big.png similarity index 100% rename from OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_biz_loading_big.png rename to OCH/common/common/src/main/res/drawable-nodpi/common_biz_loading_big.png diff --git a/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_biz_loading_samll.png b/OCH/common/common/src/main/res/drawable-nodpi/common_biz_loading_samll.png similarity index 100% rename from OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_biz_loading_samll.png rename to OCH/common/common/src/main/res/drawable-nodpi/common_biz_loading_samll.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_loading_map.png b/OCH/common/common/src/main/res/drawable-nodpi/common_loading_map.png index bec43bcdde..668172196a 100755 Binary files a/OCH/common/common/src/main/res/drawable-nodpi/common_loading_map.png and b/OCH/common/common/src/main/res/drawable-nodpi/common_loading_map.png differ diff --git a/OCH/common/common/src/main/res/drawable/common_autopilot_loading.xml b/OCH/common/common/src/main/res/drawable/common_autopilot_loading.xml index 3a98e6cf94..3b719e7e47 100644 --- a/OCH/common/common/src/main/res/drawable/common_autopilot_loading.xml +++ b/OCH/common/common/src/main/res/drawable/common_autopilot_loading.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/layout/common_loading_map.xml b/OCH/common/common/src/main/res/layout/common_loading_map.xml index 7563fbb8b9..4bc90d88d9 100644 --- a/OCH/common/common/src/main/res/layout/common_loading_map.xml +++ b/OCH/common/common/src/main/res/layout/common_loading_map.xml @@ -17,6 +17,6 @@ android:id="@+id/aciv_loading_map" android:layout_gravity="center" android:layout_width="@dimen/dp_136" - android:layout_height="@dimen/dp_125" + android:layout_height="@dimen/dp_136" android:src="@drawable/common_loading_map" /> \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_loading_view.xml b/OCH/common/common/src/main/res/layout/common_loading_view_big.xml similarity index 77% rename from OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_loading_view.xml rename to OCH/common/common/src/main/res/layout/common_loading_view_big.xml index 1267ed89a6..d1157131b7 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_loading_view.xml +++ b/OCH/common/common/src/main/res/layout/common_loading_view_big.xml @@ -6,7 +6,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - tools:background="@color/bus_switch_line_bg" + tools:background="@color/common_f7151d41" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -14,18 +14,18 @@ app:layout_constraintTop_toTopOf="parent"> + android:src="@drawable/common_biz_loading_big" /> \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_loading_view_samll.xml b/OCH/common/common/src/main/res/layout/common_loading_view_samll.xml similarity index 87% rename from OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_loading_view_samll.xml rename to OCH/common/common/src/main/res/layout/common_loading_view_samll.xml index 90cae6970a..5737a0c3fb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_loading_view_samll.xml +++ b/OCH/common/common/src/main/res/layout/common_loading_view_samll.xml @@ -6,4 +6,4 @@ android:layout_width="@dimen/dp_61" android:layout_height="@dimen/dp_60" android:layout_marginBottom="@dimen/dp_16" - android:src="@drawable/bus_switch_biz_loading_samll" /> \ No newline at end of file + android:src="@drawable/common_biz_loading_samll" /> \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index e7f7499410..770f857d92 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -22,7 +22,7 @@ #B8C2D8 #203555 #B3EFF6FF - #384270 + #B3000000 #5F6582 #A0B3DA @@ -33,4 +33,5 @@ #FF4E41 #B3FFFFFF #CCCCCC + #F7151D41 \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/strings.xml b/OCH/common/common/src/main/res/values/strings.xml index 587ebe9d52..e7576fc136 100644 --- a/OCH/common/common/src/main/res/values/strings.xml +++ b/OCH/common/common/src/main/res/values/strings.xml @@ -29,4 +29,6 @@ 自动驾驶已退出，请立即接管，注意周边环境 小心驾驶 平行驾驶已退出，请立即接管，注意周边环境 小心驾驶 + + 加载中…… \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml index 8db4a025cd..6724fa0837 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml @@ -71,9 +71,9 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> - - =0 }?:0 + CallerLogger.d(TAG,"展示任务 lading 展示了 ${dex}毫秒") + + ThreadUtils.runOnUiThreadDelayed({ + loading_biz.visibility = GONE + },dex,ThreadUtils.MODE.QUEUE) + } + + // 展示选择线路页面 + override fun showSwtichLineView() { + val endLoading = System.currentTimeMillis() + val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 + CallerLogger.d(TAG,"展示线路 lading 展示了 ${dex}毫秒") + ThreadUtils.runOnUiThreadDelayed({ + loading_biz.visibility = GONE + },dex,ThreadUtils.MODE.QUEUE) + + } + // 展示正在进行的任务 + override fun loadRunningTask() { + val endLoading = System.currentTimeMillis() + val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 + CallerLogger.d(TAG,"展示运行中任务 lading 展示了 ${dex}毫秒") + ThreadUtils.runOnUiThreadDelayed({ + loading_biz.visibility = GONE + },dex,ThreadUtils.MODE.QUEUE) + } + +} diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt new file mode 100644 index 0000000000..6117199ee5 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt @@ -0,0 +1,34 @@ +package com.mogo.och.unmanned.taxi.ui.bizswitch + +import androidx.lifecycle.ViewModel + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class SwtichBizeModel : ViewModel() { + + private val TAG = SwtichBizeModel::class.java.simpleName + + private var viewCallback: SwtichLineViewCallback? = null + + + override fun onCleared() { + + } + + fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { + this.viewCallback = viewCallback + this.viewCallback?.showLoadingView() + } + + interface SwtichLineViewCallback { + fun showSwtichLineView() + fun showLoadingView() + fun showSwitchTaskInfo() + fun loadLineData() + fun loadRunningTask() + } +} + diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_biz_bg.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_biz_bg.png new file mode 100755 index 0000000000..f92a934e07 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_biz_bg.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_biz_bg_header.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_biz_bg_header.png new file mode 100755 index 0000000000..8cc1c9e36e Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_biz_bg_header.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml new file mode 100644 index 0000000000..106e0b4041 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file