修改了新硬件，消息长度不对的bug 2

lib/protocol/message/MessageBase.py

@@ -65,8 +65,8 @@ class MessageBase(Base):
         if msgBodyLen >= 512:
             raise RuntimeError('消息体长度超长！')
         msgBodyLen = msgBodyLen                                      #消息体长度
-        encryptionType = encryptionType << 10                        #加密方式
-        subPkg = subPkg << 13                                        #分包
+        encryptionType = encryptionType                              #加密方式
+        subPkg = subPkg                                              #分包
         retain = 0                                                   #保留位
         data = msgBodyLen + encryptionType + subPkg + retain
         dataHex = self.int2hexStringByBytes(data,2)
@@ -77,11 +77,14 @@ class MessageBase(Base):
         if msgBodyLen >= 512:
             raise RuntimeError('消息体长度超长！')
         msgBodyLen = msgBodyLen                                       #消息体长度
-        encryptionType = encryptionType  << 10                        #加密方式
-        subPkg = subPkg << 13                                         #分包
+        encryptionType = encryptionType                               #加密方式
+        subPkg = subPkg                                               #分包
         retain = 0                                                    #保留位
         data = msgBodyLen + encryptionType + subPkg + retain
         dataHex = self.int2hexStringByBytes(data,2)
+        print(encryptionType)
+        print(subPkg)
+        print(dataHex)
         return dataHex
 
     #获取消息封装项