Merge branch 'dev_robotaxi-d_240912_6.7.2_local' into 6.7.4_shanghai

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt

@@ -7,12 +7,14 @@ enum class Carmodel(val serverName:String,@RawRes val rawValue: Int, val resId:
     T1("E70", R.raw.chuzuche, R.drawable.icon_car_t1),
     T2("H9", R.raw.hq_h9, R.drawable.icon_car_t2),
     B1("B1", R.raw.xiaoba, R.drawable.icon_car_b1),
-    B2("B2", R.raw.m2, R.drawable.icon_car_b2),
+    CommonB2("B2", R.raw.m2, R.drawable.icon_car_b2),
+    DeQingB2("B2", R.raw.deqing_m2, R.drawable.icon_car_b2),
+    YiXinB2("B2", R.raw.yixin_m2, R.drawable.icon_car_b2),
     M1("M1", R.raw.m1, R.drawable.icon_car_m1),
     C1("C1", R.raw.huanwei, R.drawable.icon_car_c1),;
 
     companion object{
-        fun getCarModelFromServerName(serverName:String?): Carmodel {
+        fun getCarModelFromServerName(serverName:String?,tenantId:Long): Carmodel {
             return when (serverName) {
                 "E70" -> {
                     T1
@@ -29,11 +31,20 @@ enum class Carmodel(val serverName:String,@RawRes val rawValue: Int, val resId:
                 "NJL6450ICEV" -> {
                     B1
                 }
-                "B2" -> {
-                    B2
-                }
-                "M2" -> {
-                    B2
+                "B2","M2" -> {
+                    when (tenantId) {
+                        344633089273626654,337596266395467809 -> {
+                            //德清
+                            DeQingB2
+                        }
+                        346499501671841863,337197925358633123 -> {
+                            //易鑫
+                            YiXinB2
+                        }
+                        else -> {
+                            CommonB2
+                        }
+                    }
                 }
                 "M1" -> {
                     M1

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt

@@ -36,7 +36,7 @@ object CallerChassisLocationGCJ02ListenerManager : CallerBase<IMoGoChassisLocati
     }
 
     fun getChassisLocationGCJ02(): MogoLocation {
-        return mGnssInfo.clone()
+        return runCatching { MogoLocation().copy(mGnssInfo, mGnssInfo.longitude, mGnssInfo.latitude) }.getOrNull() ?: MogoLocation()
     }
 
     /**