Skip to content

Commit 395115a

Browse files
committed
* 兼容加密狗feature id list为None的情况
1 parent 16df54b commit 395115a

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

CONTRIBUTING.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
### 更新日志
22

3-
#### JadeV2.0.4 - 2023-05-22
4-
* 加密狗监测模块支持多个加密狗的id
3+
4+
#### JadeV2.0.5 - 2023-06-14
5+
* 兼容加密狗feature id list为None的情况
56
---
67

78
<details onclose>
89
<summary>查看更多更新日志</summary>
910

1011

12+
#### JadeV2.0.4 - 2023-05-22
13+
* 加密狗监测模块支持多个加密狗的id
14+
---
15+
16+
1117
#### JadeV2.0.3 - 2023-05-11
1218
* 打包的时候新增是否压缩lib包参数
1319
---

jade/jade_threading.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@ def logout(self):
2525
handle = self.handlequeue.get()
2626
self.pyldk.adapter.logout(handle)
2727
def run(self):
28-
for feature_id in self.feature_id_list:
29-
haspStruct,feature_id,login_status = self.pyldk.login(feature_id)
30-
if haspStruct.status == 0:
31-
self.handlequeue.put(haspStruct.handle)
32-
break
28+
if self.feature_id_list:
29+
for feature_id in self.feature_id_list:
30+
haspStruct, feature_id, login_status = self.pyldk.login(feature_id)
31+
if haspStruct.status == 0:
32+
self.handlequeue.put(haspStruct.handle)
33+
break
34+
else:
35+
haspStruct, feature_id, login_status = self.pyldk.login()
3336
while haspStruct.status == 0 and login_status:
3437
haspStruct, feature_id,login_status = self.pyldk.login(feature_id)
3538
if haspStruct.status == 0 and login_status:

0 commit comments

Comments
 (0)