diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index f62dfa7645..70e1074285 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -89,7 +89,7 @@ class MainService : Service() { params?.let { shareType = it.eventType fromType = it.fromType - mainInfoId = it.parentId.toLong() + mainInfoId = it.parentId mLongitude = it.lon mLatitude = it.lat Log.d(TAG, "onStartCommand shareType = $shareType --fromType = $fromType --mainInfoId = $mainInfoId -- mLongitude = $mLongitude --mLatitude = $mLatitude --it.duration = ${it.duration} ") diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt index 75797e8bda..9852af4659 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt @@ -4,12 +4,12 @@ import android.os.Parcel import android.os.Parcelable import com.mogo.map.MogoLatLng -class UploadParams(val eventType: String, val fromType: String, val duration: Int, val parentId: String, val lat: Double, val lon: Double) : Parcelable { +class UploadParams(val eventType: String, val fromType: String, val duration: Int, val parentId: Long, val lat: Double, val lon: Double) : Parcelable { constructor(parcel: Parcel) : this( parcel.readString()!!, parcel.readString()!!, parcel.readInt(), - parcel.readString()!!, + parcel.readLong(), parcel.readDouble(), parcel.readDouble() ) @@ -18,7 +18,7 @@ class UploadParams(val eventType: String, val fromType: String, val duration: In parcel.writeString(eventType) parcel.writeString(fromType) parcel.writeInt(duration) - parcel.writeString(parentId) + parcel.writeLong(parentId) parcel.writeDouble(lat) parcel.writeDouble(lon) } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt index 98779716f9..330c56f8cf 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt @@ -6,6 +6,6 @@ data class AccidentStrategyPushWrapper( */ val type: Int, /** - * 触发点的poiType + * 触发点的事件id */ - val id: String, val lat: Double, val lon: Double) + val id: Long, val lat: Double, val lon: Double) diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java index 7cee36b5de..e63f637d79 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java @@ -27,7 +27,7 @@ public class TanluUploadParams { /** * 针对策略上报新增字段,用于车辆经过事故事件上报时,记录经过的事故事件id */ - private String parentId = ""; + private long parentId = 0; /** * 针对策略上报新增字段,用于车辆经过事故事件上报时,记录触发围栏时的经纬度坐标 */ @@ -55,7 +55,7 @@ public class TanluUploadParams { * @param parentId 经过事件id * @param location 触发围栏的坐标 */ - public TanluUploadParams(String eventType, String fromType, String parentId, + public TanluUploadParams(String eventType, String fromType, long parentId, MogoLatLng location) { this.eventType = eventType; this.fromType = fromType; @@ -87,11 +87,11 @@ public class TanluUploadParams { this.duration = duration; } - public String getParentId() { + public long getParentId() { return parentId; } - public void setParentId(String parentId) { + public void setParentId(long parentId) { this.parentId = parentId; }