yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify

Browse Source
This commit is contained in:
aibingbing
2023-11-30 19:30:20 +08:00
parent 997c5769cf ce7e723368
commit 5ae0afeb2c
438 changed files with 461 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt
View File

@@ -20,6 +20,7 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat
import com.mogo.eagle.core.widget.AlignTextView
import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
/**
@@ -209,7 +210,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
//小智语音消息
class BubbleVoiceHolder(itemView: View): RecyclerView.ViewHolder(itemView){
var tvPassengerVoiceContent: TextView = itemView.findViewById(R.id.tvPassengerVoiceContent)
var tvPassengerVoiceContent: AlignTextView = itemView.findViewById(R.id.tvPassengerVoiceContent)
}
}

7
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
View File

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
import com.mogo.eagle.core.data.temp.EventLogout
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
@@ -251,6 +252,12 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
private fun initOchView() {
actvLoginout.onClick {
if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING
|| CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING
) {
ToastUtils.showShort("请稍后退出")
return@onClick
}
EventBus.getDefault().post(EventLogout(EventLogout.LOGOUT_TYPE))
//将消息盒子操作记录还原
MsgBoxConfig.setUserRecord(0)

13
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
View File

@@ -78,6 +78,19 @@ class RomaPassengerView @JvmOverloads constructor(
}
}
/**
* 外部调用visible时进行判断
*/
fun updateVisible(visible: Boolean){
if(visible){
if(CallerMapRomaListener.isRange()){
this.visibility = View.VISIBLE
}
}else{
this.visibility = View.GONE
}
}
override fun romaStatus(status: Boolean) {
ThreadUtils.runOnUiThread {
click = true

9
core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_voice.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="@dimen/dp_600"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#FFCEDCF7"
android:background="#8CF5FAFF"
app:roundLayoutRadius="24dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
@@ -12,13 +12,16 @@
android:paddingEnd="@dimen/dp_20"
>
<TextView
<com.mogo.eagle.core.widget.AlignTextView
android:id="@+id/tvPassengerVoiceContent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_32"
android:textColor="#243959"
android:layout_margin="@dimen/dp_54"
android:layout_marginTop="@dimen/dp_54"
android:layout_marginBottom="@dimen/dp_54"
android:layout_marginStart="@dimen/dp_49"
android:layout_marginEnd="@dimen/dp_49"
android:textStyle="bold"
android:gravity="start"
app:layout_constraintStart_toStartOf="parent"