修改了车安优的版本号

data/m300Tools/carData/M202003060518.json

-{"time": {"dateTime": "2020-06-15 16:35:22", "date": "2020-06-15", "time": "16:35:22"}, "curDayTravel": {"todayTotalMilleage": 2096, "todayTotalOil": 191, "todayTotalTime": 127, "theMilleage": 2096, "theOil": 191, "theTime": 127}, "travelData": {"totalMilleage": 7021, "totalOil": 601, "totalTime": 428}, "event": {"threeRapid": {"totalRapidlyAccelerate": 6, "totalSharpSlowdown": 4, "totalSharpTurn": 0}}}
\ No newline at end of file
+{"time": {"dateTime": "2020-06-16 15:57:51", "date": "2020-06-16", "time": "15:57:51"}, "curDayTravel": {"todayTotalMilleage": 581, "todayTotalOil": 56, "todayTotalTime": 35, "theMilleage": 581, "theOil": 56, "theTime": 35}, "travelData": {"totalMilleage": 7602, "totalOil": 657, "totalTime": 463}, "event": {"threeRapid": {"totalRapidlyAccelerate": 6, "totalSharpSlowdown": 5, "totalSharpTurn": 0}}}
\ No newline at end of file

data/messageTools/carData/012201500010.json

-{"time": {"dateTime": "2020-06-16 09:52:28", "date": "2020-06-16", "time": "09:52:28"}, "curDayTravel": {"todayTotalMilleage": 13350, "todayTotalOil": 1215, "todayTotalTime": 809, "theMilleage": 4785, "theOil": 435, "theTime": 290}, "travelData": {"totalMilleage": 90056, "totalOil": 8109, "totalTime": 5534}}
\ No newline at end of file
+{"time": {"dateTime": "2020-06-16 09:52:28", "date": "2020-06-16", "time": "09:52:28"}, "curDayTravel": {"todayTotalMilleage": 15591, "todayTotalOil": 1431, "todayTotalTime": 944, "theMilleage": 2241, "theOil": 216, "theTime": 135}, "travelData": {"totalMilleage": 92297, "totalOil": 8325, "totalTime": 5669}}
\ No newline at end of file

data/protocolTools/carData/M202003060520.json

-{"time": {"dateTime": "2020-06-16 13:13:58", "date": "2020-06-16", "time": "13:13:58"}, "curDayTravel": {"todayTotalMilleage": 7802, "todayTotalOil": 752, "todayTotalTime": 470, "theMilleage": 7802, "theOil": 752, "theTime": 470}, "travelData": {"totalMilleage": 387499, "totalOil": 36289, "totalTime": 23070}, "event": {"threeRapid": {"totalRapidlyAccelerate": 23, "totalSharpSlowdown": 20, "totalSharpTurn": 21}}}
\ No newline at end of file
+{"time": {"dateTime": "2020-06-16 13:13:58", "date": "2020-06-16", "time": "13:13:58"}, "curDayTravel": {"todayTotalMilleage": 11869, "todayTotalOil": 1144, "todayTotalTime": 715, "theMilleage": 3403, "theOil": 328, "theTime": 205}, "travelData": {"totalMilleage": 391566, "totalOil": 36681, "totalTime": 23315}, "event": {"threeRapid": {"totalRapidlyAccelerate": 24, "totalSharpSlowdown": 20, "totalSharpTurn": 21}}}
\ No newline at end of file

lib/protocol/message/TerminalVersionInfo_msg.py

@@ -28,7 +28,7 @@ class TerminalVersionInfo_msg(MessageBase):
 
     # 生成一条完整的消息，针对图形界面，可传递参数
     def generateMsg_GUI(self,msgID="0205",phoneNum="13146201119",msgWaterCode=1,encryptionType=0,subPkg=0, \
-                    softwareVersion="KZP200_V201001", softwareVersionDate="2020-02-10", CPUId="CPU-12345678",GMSType="GMS-TYPE-123456", \
+                    softwareVersion="L200AB01020002", softwareVersionDate="2020-02-10", CPUId="CPU-12345678",GMSType="GMS-TYPE-123456", \
                     GMS_IMEI="GMS_IMEI_123456", SIM_IMSI="SIM_13146201119", SIM_ICCID="SIM_ICCID13146201119",carType=22, VIN="VIN_1234567891234", \
                     totalMileage=389000, totalOilExpend=420000,displacement=1500,oilDensity=80,OBDSerial=257,oilCalculateType="01"):
         msg = ""
@@ -82,7 +82,7 @@ class TerminalVersionInfo_msg(MessageBase):
     #######################################################
     def getMsgBody(self):
         msg = ""
-        softwareVersion = self.GBKString2Hex("KZP200_V201001")                     #软件版本号
+        softwareVersion = self.GBKString2Hex("L200AB01020002")                     #软件版本号
         softwareVersionDate = self.GBKString2Hex("2020-02-10")                     #终端版本日期
         CPUId = self.str2Hex("CPU-12345678")                                       #cpuId
         GSMType = self.GBKString2Hex("GSM-TYPE-123456")                            #GSM型号
@@ -105,7 +105,7 @@ class TerminalVersionInfo_msg(MessageBase):
         return msg
 
     # 生成一条完整的消息，针对图形界面，可传递参数
-    def getMsgBody_GUI(self,softwareVersion="KZP200_V201001",softwareVersionDate="2020-02-10",CPUId="CPU-12345678",GMSType="GMS-TYPE-123456",\
+    def getMsgBody_GUI(self,softwareVersion="L200AB01020002",softwareVersionDate="2020-02-10",CPUId="CPU-12345678",GMSType="GMS-TYPE-123456",\
                    GMS_IMEI="GMS_IMEI_123456",SIM_IMSI="SIM_13146201119",SIM_ICCID="SIM_ICCID13146201119",carType=22,VIN="VIN_1234567891234",\
                    totalMileage=389000,totalOilExpend=420000,displacement=1500,oilDensity=92,OBDSerial=257,oilCalculateType="01"):
         msg = ""

templates/messageTools/message/M_simulater_page.html

@@ -71,7 +71,7 @@
                     </ul>
                     <h5><b>版本报文：</b></h5>
                     <ul class="protocol_content" style="padding:0px;">
-                        <li><label style="word-break:break-all;font-size:12px;">软件版本号：</label><input id="softwareVersion" type="text" class="form-control" value="KZP200_V201001"></li>
+                        <li><label style="word-break:break-all;font-size:12px;">软件版本号：</label><input id="softwareVersion" type="text" class="form-control" value="L200AB01020002"></li>
                         <li><label style="word-break:break-all;font-size:12px;">终端版本日期：</label><input id="softwareVersionDate" type="text" class="form-control" value="2020-02-10"></li>
                         <li><label>cpuId：</label><input id="CPUId" type="text" class="form-control" value="CPU-12345678"></li>
                         <li><label>GMS型号：</label><input id="GMSType" type="text" class="form-control" value="GMS-TYPE-123456"></li>

templates/messageTools/message/terminalVersionInfoUpload_msg_page.html

@@ -19,7 +19,7 @@
     </div>
     <H3 style="border-bottom: 1px solid #eee;">设置终端注册消息内容：</H3>
     <ul class="protocol_content" style="padding:0px;">
-        <li><label style="word-break:break-all;font-size:12px;">软件版本号：</label><input id="softwareVersion" type="text" class="form-control" value="KZP200_V201001"></li>
+        <li><label style="word-break:break-all;font-size:12px;">软件版本号：</label><input id="softwareVersion" type="text" class="form-control" value="L200AB01020002"></li>
         <li><label style="word-break:break-all;font-size:12px;">终端版本日期：</label><input id="softwareVersionDate" type="text" class="form-control" value="2020-02-10"></li>
         <li><label>cpuId：</label><input id="CPUId" type="text" class="form-control" value="CPU-12345678"></li>
         <li><label>GMS型号：</label><input id="GMSType" type="text" class="form-control" value="GMS-TYPE-123456"></li>