修复了M500事件经纬度写死的问题

lib/protocol/report/EventReport_protocol.py

@@ -45,10 +45,6 @@ class EventReport_protocol(ProtocolBase):
             self.securityData = securityData
             event = data["event"]
             self.event = event
-            timeStamp = time.time() - 8 * 3600
-            timeArray = time.localtime(timeStamp)
-            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
-            gpsInfo["UTCTime"] = curTime
             self.GPSPkg = GPSReport_protocol(1,self.WATER_CODE,self.DEV_ID,gpsInfo["UTCTime"],gpsInfo["latitude"],gpsInfo["longitude"]  \
                           ,gpsInfo["speed"],gpsInfo["directionAngle"],gpsInfo["elevation"],gpsInfo["positionStar"],gpsInfo["Pdop"]  \
                           ,gpsInfo["Hdop"],gpsInfo["Vdop"],gpsInfo["statusBit"],gpsInfo["valtage"],gpsInfo["OBDSpeed"],gpsInfo["engineSpeed"]  \

views/protocolTools/M_carSimulater_process.py

@@ -494,6 +494,14 @@ def sendInsertAlarmEvent():
                                   "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249},
                  "event": {"0001": {}}}
         jdata["DEV_ID"] = params["carId"]
+        lng = service.getLongitude()
+        lat = service.getLatitude()
+        jdata["gpsInfo"]["latitude"] = lng
+        jdata["gpsInfo"]["longitude"] = lat
+        timeStamp = time.time() - 8 * 3600
+        timeArray = time.localtime(timeStamp)
+        curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+        jdata["gpsInfo"]["UTCTime"] = curTime
         obj = EventReport_protocol(data=jdata)
         gpsData = service.genGPSData2()
         obj.setGPSPkg(gpsData)
@@ -536,6 +544,14 @@ def sendPulloutAlarmEvent():
                                   "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249},
                  "event": {"0002": {}}}
         jdata["DEV_ID"] = params["carId"]
+        lng = service.getLongitude()
+        lat = service.getLatitude()
+        jdata["gpsInfo"]["latitude"] = lng
+        jdata["gpsInfo"]["longitude"] = lat
+        timeStamp = time.time() - 8 * 3600
+        timeArray = time.localtime(timeStamp)
+        curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+        jdata["gpsInfo"]["UTCTime"] = curTime
         obj = EventReport_protocol(data=jdata)
         gpsData = service.genGPSData2()
         obj.setGPSPkg(gpsData)
@@ -578,6 +594,14 @@ def sendLowVoltageEvent():
                                   "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249},
                  "event": {"0003": {}}}
         jdata["DEV_ID"] = params["carId"]
+        lng = service.getLongitude()
+        lat = service.getLatitude()
+        jdata["gpsInfo"]["latitude"] = lng
+        jdata["gpsInfo"]["longitude"] = lat
+        timeStamp = time.time() - 8 * 3600
+        timeArray = time.localtime(timeStamp)
+        curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+        jdata["gpsInfo"]["UTCTime"] = curTime
         obj = EventReport_protocol(data=jdata)
         gpsData = service.genGPSData2()
         obj.setGPSPkg(gpsData)
@@ -620,6 +644,14 @@ def sendPowerOffEvent():
                                   "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249},
                  "event": {"0004": {}}}
         jdata["DEV_ID"] = params["carId"]
+        lng = service.getLongitude()
+        lat = service.getLatitude()
+        jdata["gpsInfo"]["latitude"] = lng
+        jdata["gpsInfo"]["longitude"] = lat
+        timeStamp = time.time() - 8 * 3600
+        timeArray = time.localtime(timeStamp)
+        curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+        jdata["gpsInfo"]["UTCTime"] = curTime
         obj = EventReport_protocol(data=jdata)
         gpsData = service.genGPSData2()
         obj.setGPSPkg(gpsData)
@@ -674,6 +706,14 @@ def sendRapidlyAccelerateEvent():
             jdata["event"]["0020"]["allSharpSlowdownCount"] = carData["event"]["threeRapid"]["totalSharpSlowdown"]
             jdata["event"]["0020"]["allSharpTurn"] = carData["event"]["threeRapid"]["totalSharpTurn"]
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -728,6 +768,14 @@ def sendSharpSlowdownEvent():
             jdata["event"]["0021"]["allSharpSlowdownCount"] = carData["event"]["threeRapid"]["totalSharpSlowdown"]
             jdata["event"]["0021"]["allSharpTurn"] = carData["event"]["threeRapid"]["totalSharpTurn"]
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -782,6 +830,14 @@ def sendSharpTurnEvent():
             jdata["event"]["0022"]["allSharpSlowdownCount"] = carData["event"]["threeRapid"]["totalSharpSlowdown"]
             jdata["event"]["0022"]["allSharpTurn"] = carData["event"]["threeRapid"]["totalSharpTurn"]
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -829,6 +885,14 @@ def sendCollisionAlarmEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0023": {"totalCount": "5", "dataProperty": "1"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -876,6 +940,14 @@ def sendSetUpDefencesEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0012": {}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -923,6 +995,14 @@ def sendSetDownDefencesEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0013": {}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -970,6 +1050,14 @@ def sendLowGearHighSpeedEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0036": {"alarmType": "1", "durationTime": "10"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -1017,6 +1105,14 @@ def sendHighGearLowSpeedEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0037": {"alarmType": "1", "durationTime": "10"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -1064,6 +1160,14 @@ def sendSurplusOilAlarmEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "004A": {"surplusOilType": "0", "value": "30"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -1111,6 +1215,14 @@ def sendOverSpeedAlarmEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0027": {"alarmType": "1", "durationTime": "360"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -1158,6 +1270,14 @@ def sendTiredDrivingAlarmEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0028": {"alarmType": "1", "durationTime": "1100"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -1205,6 +1325,14 @@ def sendIdlingOverTimeEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0032": {"alarmType": "1", "durationTime": "300","oilExpend":"300"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -1252,6 +1380,14 @@ def sendIdlingOverTimeOverEvent():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "0032": {"alarmType": "0", "durationTime": "500","oilExpend":"500"}}}
             jdata["DEV_ID"] = params["carId"]
+            lng = service.getLongitude()
+            lat = service.getLatitude()
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             gpsData = service.genGPSData2()
             obj.setGPSPkg(gpsData)
@@ -1299,6 +1435,10 @@ def sendRapidChangeLeftLanes():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "002A": {"nums":1,"direction":1,"lng":106.54041,"lat":29.40268}}}
             jdata["DEV_ID"] = params["carId"]
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             lng = service.getLongitude()
             lat = service.getLatitude()
             jdata["event"]["002A"]["lng"] = lng
@@ -1348,10 +1488,20 @@ def sendRapidChangeRightLanes():
                                       "lightStatus": 0, "onoffStatusA": 0, "onoffStatusB": 112, "dataByte": 249}, "event": {
                         "002A": {"nums":1,"direction":0,"lng":106.54041,"lat":29.40268}}}
             jdata["DEV_ID"] = params["carId"]
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             lng = service.getLongitude()
             lat = service.getLatitude()
             jdata["event"]["002A"]["lng"] = lng
             jdata["event"]["002A"]["lat"] = lat
+            jdata["gpsInfo"]["latitude"] = lng
+            jdata["gpsInfo"]["longitude"] = lat
+            timeStamp = time.time() - 8 * 3600
+            timeArray = time.localtime(timeStamp)
+            curTime = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+            jdata["gpsInfo"]["UTCTime"] = curTime
             obj = EventReport_protocol(data=jdata)
             obj.setEventType("002A")
             msg = obj.generateEventMsg()