diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt index bba7a7f340..5bfebc913f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt @@ -11,9 +11,11 @@ import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.autopilot.AutopilotSummaryInfo import com.mogo.eagle.core.data.notice.AutoExplorationEntity import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.ThreadUtils /** @@ -31,9 +33,11 @@ class AutomaticExplorationView @JvmOverloads constructor( private var ivScan: ImageView ?= null //扫描视图 private var rvExplorationList: RecyclerView ?= null private var automaticExplorationAdapter: AutomaticExplorationAdapter ?= null + private var rotationAnim: ObjectAnimator ?= null companion object { private const val TAG = "AutomaticExplorationView" + private const val EXPLORATION_SHOW_TIME = 10000L //自动探查弹窗展示时间 } init { @@ -53,21 +57,35 @@ class AutomaticExplorationView @JvmOverloads constructor( initData() } + fun showAutoExploration(){ + //倒计时 + + //语音播放 + AIAssist.getInstance(context).speakTTSVoice("道路畅通一切正常蘑菇行车助手将持续守候您的出行") + + //隐藏自动探查视图 + ThreadUtils.runOnUiThread { + this@AutomaticExplorationView.visibility = View.GONE + } + + } + private fun initEvent(){ ivClose = findViewById(R.id.ivClose) ivScan = findViewById(R.id.ivScan) //隐藏自动探索视图 ivClose?.setOnClickListener { + rotationAnim?.cancel() this.visibility = View.GONE } //启动扫描 ivScan?.let { - val rotationAnim = ObjectAnimator.ofFloat(it, "rotation", 0f, 360f) - rotationAnim.repeatCount = ValueAnimator.INFINITE - rotationAnim.repeatMode = ValueAnimator.RESTART - rotationAnim.duration = 2000 - rotationAnim.interpolator = LinearInterpolator() - rotationAnim.start() + rotationAnim = ObjectAnimator.ofFloat(it, "rotation", 0f, 360f) + rotationAnim?.repeatCount = ValueAnimator.INFINITE + rotationAnim?.repeatMode = ValueAnimator.RESTART + rotationAnim?.duration = 2000 + rotationAnim?.interpolator = LinearInterpolator() + rotationAnim?.start() } rvExplorationList = findViewById(R.id.rvExplorationList) val linearLayoutManager = LinearLayoutManager(context) @@ -79,13 +97,13 @@ class AutomaticExplorationView @JvmOverloads constructor( private fun initData() { val dataList = ArrayList() - dataList.add(AutoExplorationEntity("当前道路事件分析",5000L)) - dataList.add(AutoExplorationEntity("前方车辆",6000L)) - dataList.add(AutoExplorationEntity("两侧车辆",7000L)) + dataList.add(AutoExplorationEntity("当前道路事件分析",2000L)) + dataList.add(AutoExplorationEntity("前方车辆",2000L)) + dataList.add(AutoExplorationEntity("两侧车辆",3000L)) dataList.add(AutoExplorationEntity("后方车辆",3000L)) - dataList.add(AutoExplorationEntity("前方路口车辆流速分析",5000L)) - dataList.add(AutoExplorationEntity("前方路口行人/非机动车分析",6000L)) - dataList.add(AutoExplorationEntity("路侧视频分析",8000L)) + dataList.add(AutoExplorationEntity("前方路口车辆流速分析",4000L)) + dataList.add(AutoExplorationEntity("前方路口行人/非机动车分析",4000L)) + dataList.add(AutoExplorationEntity("路侧视频分析",5000L)) automaticExplorationAdapter?.setData(dataList) //每出现一次自动探查，增加相应的服务次数 @@ -103,7 +121,6 @@ class AutomaticExplorationView @JvmOverloads constructor( override fun onDetachedFromWindow() { super.onDetachedFromWindow() - } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration.xml index 391a77d460..0b719337af 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration.xml @@ -9,8 +9,8 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration_p.xml index 1220778189..f375ec5539 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration_p.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration_p.xml @@ -1,15 +1,17 @@ + android:layout_marginTop="@dimen/dp_12" + android:layout_marginBottom="@dimen/dp_12" + tools:ignore="UseCompoundDrawables"> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml index 0cccd76263..223c663fc4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml @@ -31,13 +31,13 @@ android:id="@+id/tvExplorationTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintTop_toTopOf="@id/ivScan" - app:layout_constraintBottom_toBottomOf="@id/ivScan" - app:layout_constraintStart_toEndOf="@id/ivScan" - android:textSize="@dimen/sp_32" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + android:layout_marginTop="@dimen/dp_31" + android:layout_marginLeft="@dimen/dp_146" + android:textSize="@dimen/sp_30" android:textColor="@color/white" android:text="@string/exploration_title" - android:layout_marginStart="@dimen/dp_30" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration_p.xml index 8ea703c520..bf85992a84 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration_p.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration_p.xml @@ -1,7 +1,7 @@ @@ -36,7 +36,7 @@ android:textSize="@dimen/sp_32" android:textColor="@color/color_131415" android:text="@string/exploration_title" - android:layout_marginStart="@dimen/dp_30" + android:layout_marginStart="@dimen/dp_23" /> \ No newline at end of file