openharmony/testfwk_xdevice
1
0
Fork 0
mirror of https://gitee.com/openharmony/testfwk_xdevice synced 2024-11-22 23:10:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!307 优化HDC消息编码处理

Browse Source 
Merge pull request !307 from liguangjie/master
This commit is contained in:
openharmony_ci 2024-11-05 12:52:34 +00:00 committed by Gitee
commit 071f379a44
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/ohos/src/ohos/environment/dmlib.py
View File

@ -58,6 +58,7 @@ ID_LIST = b'LIST'
ID_DENT = b'DENT'
DEFAULT_ENCODING = "utf-8"
COMPATIBLE_ENCODING = "ISO-8850-1"
SYNC_DATA_MAX = 64 * 1024
REMOTE_PATH_MAX_LENGTH = 1024
SOCK_DATA_MAX = 256
@ -995,10 +996,12 @@ class HdcHelper:
"""
Converts an HDC reply to a string.
"""
try:
return str(reply, encoding=DEFAULT_ENCODING)
except (ValueError, TypeError) as _:
return ""
for encoding in [DEFAULT_ENCODING, COMPATIBLE_ENCODING]:
try:
return str(reply, encoding=encoding)
except (ValueError, TypeError) as _:
continue
return ""
@staticmethod
def socket(host=None, port=None, timeout=None):