diff --git a/apps/third/dahua.py b/apps/third/dahua.py index efbe86ef..59bc90c5 100644 --- a/apps/third/dahua.py +++ b/apps/third/dahua.py @@ -146,11 +146,12 @@ class DhClient: "operation": "generalJsonTransport" } if '$' in code: - d_code = code.split('$')[0] + d_code_list = code.split('$') + d_code = d_code_list[0] + num = d_code_list[-1] json_data['deviceCode'] = d_code json_data['params'] = '{\"method\":\"dev.snap\",\"id\":123,\"params\":{\"DevID\":\"' + \ - str(d_code) + '\",\"DevChannel\":\"' + \ - str(code) + '\",\"PicNum\":1,\"SnapType\":1,\"CmdSrc\":0}}' + str(d_code) + '\",\"DevChannel\":' + str(num) + ',\"PicNum\":1,\"SnapType\":1,\"CmdSrc\":0}}' _, res = self.request(**dhapis['dev_snap'], json=json_data) res = json.loads(res) return self.get_full_pic(res['params']['PicInfo'])