обычная кодировка

Author: Kirill Kirsanov

client.py

@@ -106,9 +106,9 @@ def SendMessages(self):
         self.lock.acquire()
         if self.message_source:
             messages = self.message_source()
-            print(messages)
             if messages:
                 for sphone, dphone, message in messages:
+                    logging.debug(str((sphone, dphone, message )))
                     self.sendMessage(sphone, dphone, message)
         self.lock.release()
 

pdu.py

@@ -130,7 +130,13 @@ def _parseCMD(self, st):
                 continue
             if state == 'read ls':
                 self._readX(token, self._pdu['smlen'] * 2)
-                self._pdu[token] = binascii.unhexlify(self._pdu[token]).decode('utf-16-be')
+
+                if self._pdu['dcs']==8:
+                    self._pdu[token] = binascii.unhexlify(self._pdu[token]).decode('utf-16-be')
+                if self._pdu['dcs'] == 0:
+                    self._pdu[token] = binascii.unhexlify(self._pdu[token]).decode('latin1')
+
+
                 state = 'read type'
                 continue
 
@@ -177,6 +183,7 @@ def parse(self):
         self._pos = 32
         return self._pdu
 
+
 class PDU(object):
     """PDU class"""
 
@@ -278,11 +285,14 @@ def generate(self):
         return header + body
 
 
-# 1
-#big1 = b'0000005b00000005000000002c046bde0001013739353331343938343836000001313539312331313635303538310003000000000000000001311383000200000202000ca0373930343334393030303002040002001a0501000123'
-# hearbeat
-#ok = b'00000010800000150000000000000001'
-# Тест
-#test_rur = b'0000006200000005000000002d9e68ce000101373935333134393834383600000131353931233137383838303237000300000000000008000804220435044104421383000200000202000ca037393034333439303030300204000200200501000123'
+        # 1
+        # big1 = b'0000005b00000005000000002c046bde0001013739353331343938343836000001313539312331313635303538310003000000000000000001311383000200000202000ca0373930343334393030303002040002001a0501000123'
+        # hearbeat
+        # ok = b'00000010800000150000000000000001'
+        # Тест
+        # test_rur = b'0000006200000005000000002d9e68ce000101373935333134393834383600000131353931233137383838303237000300000000000008000804220435044104421383000200000202000ca037393034333439303030300204000200200501000123'
+
+        # id:2108317357 sub:001 dlvrd:001 submit date:1611081450 done date:1611081450 stat:DELIVRD err:000 text:<unprintable_text>
 
-#id:2108317357 sub:001 dlvrd:001 submit date:1611081450 done date:1611081450 stat:DELIVRD err:000 text:<unprintable_text>
+        # asd
+        # 0000005c0000000500000000369d7077000101373935333134393834383600000131353931233139313837313000030000000000000000034173641383000200000202000ca037393034333439303030300204000200370501000123'