补充了报警事件数据项

lib/protocol/message/Location_msg.py

@@ -96,7 +96,7 @@ class Location_msg(MessageBase):
         #报警事件 ID 数据项列表
         extra_FA = "FA" + self.int2hexStringByBytes(int(len(AlarmEvent_data().generateAlarmEvent_data()) / 2)) + AlarmEvent_data().generateAlarmEvent_data()
 
-        data = extra_01 + extra_02 + extra_31  + extra_EA + extra_EB
+        data = extra_01 + extra_02 + extra_31 + extra_FA
 
         # data = extra_01 + extra_02 + extra_11 + extra_12 + extra_13
         # data = data + extra_2A + extra_30 + extra_31 + extra_EA + extra_EB

lib/protocol/message/data/AlarmEvent_data.py

@@ -16,6 +16,18 @@ class AlarmEvent_data(MessageBase):
     #####################################################
     def generateAlarmEvent_data(self):
         data = ""
+        ignition = "0001" + self.int2hexStringByBytes(1)                    #点火上报
+        flameout = "0002" + self.int2hexStringByBytes(1)                    #熄火上报
+        setUpDefences = "0003" + self.int2hexStringByBytes(1)               #设防上报
+        withdrawGarrision = "0004" + self.int2hexStringByBytes(1)           #撤防上报
+        doorOpen = "0005" + self.int2hexStringByBytes(1)                    #车门打开
+        doorClose = "0006" + self.int2hexStringByBytes(1)                   #车门关闭
+        systemStart = "0007" + self.int2hexStringByBytes(1)                 #系统启动
+        trailCarAlarm = "0101" + self.int2hexStringByBytes(1)               #拖车报警
+        locationTooLong = "0102" + self.int2hexStringByBytes(1)             #定位过长报警
+        terminalPullOut = "0103" + self.int2hexStringByBytes(1)             #终端拔出报警
+        terminalInsert = "0104" + self.int2hexStringByBytes(1)              #终端插入报警
+        lowVoltage = "0105" + self.int2hexStringByBytes(1)                  #低电压报警
         #怠速过长报警	附带信息见 表 C6EXT1
         idlingSpeedOver = "0106" + self.int2hexStringByBytes(9) + self.getIdlingSpeedOver()
         #超速报警	附带信息见 表 C6EXT2
@@ -24,7 +36,24 @@ class AlarmEvent_data(MessageBase):
         fatigueDriving = "0108" + self.int2hexStringByBytes(5) + self.getFatigueDriving()
         #水温报警	附带信息见 表 C6EXT4
         waterTemperatureAlarm = "0109" + self.int2hexStringByBytes(9) + self.getWaterTemperatureAlarm()
-        data = data + idlingSpeedOver + overspeedAlarm + fatigueDriving + waterTemperatureAlarm
+        highSpeedNeutralGear = "010A" + self.int2hexStringByBytes(1)         #高速空档滑行报警
+        oilExpendNotSurport = "010B" +self.int2hexStringByBytes(1)           #油耗不支持报警
+        OBDNotSurport = "010C" + self.int2hexStringByBytes(1)                #OBD 不支持报警
+        lowWaterTemperatureHighSpeed = "010D" +self.int2hexStringByBytes(1)  #低水温高转速
+        buslineNotSleep = "010E" + self.int2hexStringByBytes(1)              #总线不睡眠报警
+        illegalOpenDoor = "010f" + self.int2hexStringByBytes(1)              #非法开门
+        illegalFire = "0110" + self.int2hexStringByBytes(1)                  #非法点火
+        rapidAccelerateAlarm = "0111" + self.int2hexStringByBytes(1)         #急加速报警
+        sharpSlowdownAlarm = "0112" + self.int2hexStringByBytes(1)           #急减速报警
+        sharpBendAlarm = "0113" + self.int2hexStringByBytes(1)               #急拐弯报警
+        crashAlarm = "0114" + self.int2hexStringByBytes(1)                   #碰撞报警
+        rapidChangeLines = "0115" + self.int2hexStringByBytes(1)             #急变道报警
+        data = data + ignition + flameout + setUpDefences + withdrawGarrision + doorOpen
+        data = data + doorClose + systemStart + trailCarAlarm + locationTooLong + terminalPullOut
+        data + data + terminalInsert + lowVoltage + idlingSpeedOver + overspeedAlarm + fatigueDriving
+        data = data + waterTemperatureAlarm + highSpeedNeutralGear + oilExpendNotSurport + OBDNotSurport + lowWaterTemperatureHighSpeed
+        data = data + buslineNotSleep + illegalOpenDoor + illegalFire + rapidAccelerateAlarm + sharpSlowdownAlarm
+        data = data + sharpBendAlarm + crashAlarm + rapidChangeLines
         return data
 
     #####################################################