[8.4.0] 无人化 增加B4相关模型视频等，增加无人化自动登录功能

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartAgainWindow.kt

@@ -46,9 +46,14 @@ class ColdStartAgainWindow constructor(activity: Activity){
         val videoUrl:String = if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) {
             svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_taxi_start)
             SkinResources.getInstance().getRawMp4FilePath(R.raw.video_biz_login_taxi_bg)
-        }else{
-            svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_bus_start)
-            SkinResources.getInstance().getRawMp4FilePath(R.raw.video_biz_login_bus_bg)
+        } else {
+            if (AppIdentityModeUtils.isB4(FunctionBuildConfig.appIdentityMode)) {
+                svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_bus_b4_start)
+                SkinResources.getInstance().getRawMp4FilePath(R.raw.video_biz_login_bus_b4_bg)
+            } else {
+                svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_bus_start)
+                SkinResources.getInstance().getRawMp4FilePath(R.raw.video_biz_login_bus_bg)
+            }
         }
         svpColdStart.setIsTouchWiget(false)
         svpColdStart.setIsTouchWigetFull(false)
@@ -67,7 +72,11 @@ class ColdStartAgainWindow constructor(activity: Activity){
                         if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) {
                             svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_taxi_end)
                         }else{
-                            svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_bus_end)
+                            if (AppIdentityModeUtils.isB4(FunctionBuildConfig.appIdentityMode)) {
+                                svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_bus_b4_end)
+                            } else {
+                                svpColdStart.setBackgroundResource(R.drawable.biz_login_bg_bus_end)
+                            }
                         }
                         this@ColdStartAgainWindow.hideFloatWindow()
                     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt

@@ -24,6 +24,8 @@ 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.CallerColdStartStateListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.mogo.CockpitType
 import com.mogo.eagle.core.utilcode.util.ResourceUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
@@ -35,6 +37,7 @@ import com.zhjt.mogo_core_function_devatools.coldstart.ColdStartFaultAdapter
 import com.zhjt.mogo_core_function_devatools.coldstart.ColdStartNodeAdapter
 import com.zhjt.mogo_core_function_devatools.ota.OTAUpgradeConfig
 import kotlinx.android.synthetic.main.view_cold_start.view.ivColdStartNow
+import kotlinx.android.synthetic.main.view_cold_start.view.tvColdStartTip
 import kotlinx.android.synthetic.main.view_cold_start.view.ivColdStartStatus
 import kotlinx.android.synthetic.main.view_cold_start.view.ivFaultIcon
 import kotlinx.android.synthetic.main.view_cold_start.view.ivIpcConnectStatus
@@ -140,6 +143,30 @@ class ColdStartView @JvmOverloads constructor(
             //保存点击时间
             ColdStartConfig.setColdStartNowState(System.currentTimeMillis())
         }
+        initUseNowBtnView()
+    }
+    private fun initUseNowBtnView() {
+        val cockpitType = AppIdentityModeUtils.getCockpitType()
+        if (cockpitType != CockpitType.NONE) {
+            ThreadUtils.runOnUiThread {
+                if (cockpitType == CockpitType.UNMANNED) {
+                    tvColdStartTip.setText(R.string.cold_start_now_tip_unmanned)
+                    tvColdStartNow.visibility = View.GONE
+                    ivColdStartNow.visibility = View.GONE
+                    tvColdStartTip.visibility = View.GONE
+                } else {
+                    tvColdStartTip.setText(R.string.cold_start_now_tip)
+                    tvColdStartNow.visibility = View.VISIBLE
+                    ivColdStartNow.visibility = View.VISIBLE
+                    tvColdStartTip.visibility = View.VISIBLE
+                }
+            }
+        }
+    }
+
+    override fun onCockpitTypeChange() {
+        super.onCockpitTypeChange()
+        initUseNowBtnView()
     }
 
     override fun onAttachedToWindow() {
@@ -879,6 +906,11 @@ class ColdStartView @JvmOverloads constructor(
         tvColdStartContent.text = resources.getString(R.string.cold_start_fail_content)
         tvColdStartContent.setTextColor(ContextCompat.getColor(context, R.color.cold_start_fail))
         coldStartResultListener?.coldStartFail()
+        ThreadUtils.runOnUiThread {
+            tvColdStartNow.visibility = View.VISIBLE
+            ivColdStartNow.visibility = View.VISIBLE
+            tvColdStartTip.visibility = View.VISIBLE
+        }
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml

@@ -215,6 +215,7 @@
         android:textSize="@dimen/sp_28"
         android:textColor="#82FFFFFF"
         android:layout_marginBottom="@dimen/dp_124"
+        android:visibility="gone"
         />
 
     <TextView
@@ -228,6 +229,7 @@
         android:textColor="@color/white"
         android:gravity="center"
         android:layout_marginBottom="@dimen/dp_16"
+        android:visibility="gone"
         />
 
     <ImageView
@@ -241,6 +243,7 @@
         android:layout_marginStart="@dimen/dp_15"
         android:contentDescription="@string/cold_start_now"
         android:layout_marginTop="@dimen/dp_4"
+        android:visibility="gone"
         />
 
 

core/function-impl/mogo-core-function-hmi/src/main/res/values-en/strings.xml

@@ -256,6 +256,7 @@
     <string name="cold_start_fault_icon">Cold Start HW Fault Icon</string>
     <string name="cold_start_now">Use Now</string>
     <string name="cold_start_now_tip">Skipping may disable autonomous mode</string>
+    <string name="cold_start_now_tip_unmanned">Startup failed. Features like Automated Driving will be unavailable.</string>
 
     <string name="cold_start_process">Cold Start Progress</string>
 

core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml

@@ -257,6 +257,7 @@
     <string name="cold_start_fault_icon">冷启动软件硬件故障图标</string>
     <string name="cold_start_now">立即用车</string>
     <string name="cold_start_now_tip">跳过流程或启动失败，均可能会导致自动驾驶等功能无法使用</string>
+    <string name="cold_start_now_tip_unmanned">启动失败，会导致自动驾驶等功能无法使用</string>
 
     <string name="cold_start_process">冷启动进度条</string>