Skip to content

Commit d2e3f8f

Browse files
authored
Merge pull request #291 from SAIC-iSmart-API/develop
0.7.1
2 parents 1cc2828 + 68d03d9 commit d2e3f8f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

handlers/message.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ async def __polling(self):
4545
await self.__read_message(message)
4646

4747
latest_message = self.__get_latest_message(all_messages)
48-
if latest_message.messageId != self.last_message_id and latest_message.message_time > self.last_message_ts:
48+
if (
49+
latest_message is not None
50+
and latest_message.messageId != self.last_message_id
51+
and latest_message.message_time > self.last_message_ts
52+
):
4953
self.last_message_id = latest_message.messageId
5054
self.last_message_ts = latest_message.message_time
5155
LOG.info(
@@ -76,7 +80,7 @@ async def __get_all_alarm_messages(self) -> list[MessageEntity]:
7680
while True:
7781
try:
7882
message_list = await self.saicapi.get_alarm_list(page_num=idx, page_size=1)
79-
if message_list.messages and len(message_list.messages) > 0:
83+
if message_list is not None and message_list.messages and len(message_list.messages) > 0:
8084
all_messages.extend(message_list.messages)
8185
else:
8286
return all_messages

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
saic-ismart-client-ng==0.5.2
1+
saic-ismart-client-ng==0.5.4
22
httpx~=0.27.0
33
gmqtt~=0.6.13
44
inflection~=0.5.1

0 commit comments

Comments
 (0)