3

app/src/main/java/com/sd/cavphmi/bean/ParkLinePlan.kt

@@ -5,7 +5,7 @@ package com.sd.cavphmi.bean
 data class ParkLinePlan(
     val line: List<List<Double>>,
     val linkingLine: String,
-    val spaceCode: Any,
+    val spaceCode: String,
     val taskId: String,
     val vehicleId: String,
     val vehicleInfoId: String,

app/src/main/java/com/sd/cavphmi/bean/V2xStartBean.kt

+package com.sd.cavphmi.bean
+/**V2x 预警开始***/
+class V2xStartBean {
+}
\ No newline at end of file

app/src/main/java/com/sd/cavphmi/bean/VehicleStats.kt

 package com.sd.cavphmi.bean
 
-//联网车辆状态数据
-data class VehicleStats(
-    val vehicleData: List<VehicleData>,
+/***联网车辆状态数据
+ * {"vehicleStats":{"total":1,"avp":1},"vehicleStatusList":[],"wsTime":1750301590009}
+ * **/
+ data class VehicleStats(
+    val vehicleStats: VehicleStatsX,
+    val vehicleStatusList: List<VehicleStatusList>,
     val wsTime: Long
 )
 
-data class VehicleData(
-    val altitude: Double,
-    val brake: Int,
-    val gasPedal: Int,
-    val gear: Int,
-    val heading: Double,
-    val latitude: Double,
-    val longitude: Double,
-    val obuCode: String,
-    val reportTime: Long,
-    val speed: Double,
-    val vehicleId: String,
-    val vehiclePlate: String,
-    val vehiclePurpose: String,
-    val vehiclePurposeName: String,
-    val wheelAngle: Int,
-    val driveMode: Int,
+data class VehicleStatsX(
+    val avp: Int,
+    val total: Int
 )
+data class VehicleStatusList(var driveMode:Int)
\ No newline at end of file

app/src/main/java/com/sd/cavphmi/ui/MainActivity.kt

@@ -115,9 +115,9 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainVm>() {
 
     /**联网车辆状态数据**/
     private fun topicVehicleStatus(bean: VehicleStats) {
-        if ((bean.vehicleData.count()) > 0) {
+//        if ((bean.vehicleData.count()) > 0) {
 
-        }
+//        }
     }
     /**停车位变更**/
     private fun topicvPoints(bean: ParkBean) {

app/src/main/java/com/sd/cavphmi/viewmodels/MainVm.kt

@@ -246,7 +246,7 @@ class MainVm @Inject constructor(
 //                        this.$refs.basisCesium.findPathPlanning(res);
 //                        // 泊车需要高亮车位，召车不高亮
                         if (ifParking) {
-//                            spaceCode = res.spaceCode
+                            spaceCode = result.data.spaceCode
                         } else {
 //                            spaceCode = ''
                         }
@@ -373,7 +373,7 @@ class MainVm @Inject constructor(
                     heading.set(bean.vehicleData.get(0).heading.toInt())
                     speed.set(bean.vehicleData.get(0).speed)
                 }
-//                FileIoUtils.writeToFile(gson.toJson(bean), "carvehicle.txt")
+//                FileIoUtils.writeToFile(res.data, "carvehicle.txt")
             }
         }
 
@@ -382,8 +382,8 @@ class MainVm @Inject constructor(
                 val bean =
                     parseSocketRepo.parseDataBean(res.data, VehicleStats::class.java)
                 println("------联网车辆状态数据 = ${res.data}")
-                if ((bean.vehicleData.count()) > 0) {
-                    val str = when (bean.vehicleData[0].driveMode) {
+                if (bean.vehicleStatusList.isNotEmpty()) {
+                    val str = when (bean.vehicleStatusList[0].driveMode) {
                         0 -> "自动驾驶"
                         1 -> "人工驾驶"
                         2 -> "远程驾驶"
@@ -392,8 +392,7 @@ class MainVm @Inject constructor(
                     driveMode.set(str)
                 }
                 vehicleStat.value = bean
-
-                FileIoUtils.writeToFile(gson.toJson(bean), "vehicleS.txt")
+                FileIoUtils.writeToFile(res.data, "vehicleS.txt")
             }
         }
 
@@ -402,7 +401,7 @@ class MainVm @Inject constructor(
                 var bean = parseSocketRepo.parseDataBean(res.data, PerTarget::class.java)
                 println("-----感知目标物数据 = ${bean}")
                 targetPre.value = bean
-//                FileIoUtils.writeToFile(gson.toJson(bean), "target.txt")
+//                FileIoUtils.writeToFile(res.data, "target.txt")
             }
         }
 
@@ -425,7 +424,7 @@ class MainVm @Inject constructor(
                 println("-----停车位变更 = ${res.data}")
                 var bean = parseSocketRepo.parseDataBean(res.data, ParkBean::class.java)
                 parkBean.value = bean
-                FileIoUtils.writeToFile(gson.toJson(bean), "park.txt")
+                FileIoUtils.writeToFile(res.data, "park.txt")
             }
         }