gaohz
/
TakwayBoard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bug] fix listening lock bugs

This commit is contained in:
IrvingGao 2024-06-18 16:10:11 +08:00
parent 0fd76583a1
commit 5c67ef58ff
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
takway/clients/web_socket_client_utils.py
View File

@ -170,7 +170,6 @@ class WebSocketClinet:
record_chunk_size = recorder.vad_chunk_size record_chunk_size = recorder.vad_chunk_size
# 开关按键被按下或被关键词唤醒 # 开关按键被按下或被关键词唤醒
if self.wakeup_event.is_set(): if self.wakeup_event.is_set():
print(f"{datetime.now()}: Wake up by button.") print(f"{datetime.now()}: Wake up by button.")
@ -186,9 +185,6 @@ class WebSocketClinet:
self.listening_event.set() self.listening_event.set()
self.speaking_event.clear() self.speaking_event.clear()
# if board == 'orangepi':
# recorder.hardware.set_led_on("blue")
# wake up # wake up
is_bgn = True is_bgn = True
is_end = False is_end = False
@ -405,6 +401,8 @@ class WebSocketClinet:
self.audio_play_queue.put(('audio_bytes', response)) self.audio_play_queue.put(('audio_bytes', response))
elif data_type == None: elif data_type == None:
print(f"{datetime.now()}: receive None data, break loop.") print(f"{datetime.now()}: receive None data, break loop.")
self.listening_event.set()
self.speaking_event.clear()
# print(f"listening_event: {self.listening_event.is_set()}, speaking_event: {self.speaking_event.is_set()}") # print(f"listening_event: {self.listening_event.is_set()}, speaking_event: {self.speaking_event.is_set()}")
break # 如果没有接收到消息，则退出循环 break # 如果没有接收到消息，则退出循环

12
ws_client.py
View File

@ -12,7 +12,13 @@ if __name__ == '__main__':
# session_id = '3f7c2d8f-dc8a-4f1b-9fe0-6bf56c759a41' # 砚文 # session_id = '3f7c2d8f-dc8a-4f1b-9fe0-6bf56c759a41' # 砚文
# session_id = '1fd56ce7-f21e-4eb4-8dc8-3a17960ae328' # 越哥 # session_id = '1fd56ce7-f21e-4eb4-8dc8-3a17960ae328' # 越哥
# session_id = 'bfcc4bbc-ac94-4604-8fd7-50545b8c6a5f' # 楼总 # session_id = 'bfcc4bbc-ac94-4604-8fd7-50545b8c6a5f' # 楼总
session_id = '469f4a99-12a5-45a6-bc91-353df07423b6' # 鸿志 # session_id = '469f4a99-12a5-45a6-bc91-353df07423b6' # 鸿志
session_id = '9ad8f855-f87c-41c8-a1f3-12e39d013c8c' # 1 积木 刚木
# session_id = '13e14fd9-a212-4cf1-a09b-5890344c769c' # 2
# session_id = 'e6e76e50-cb4c-4fe7-8660-8278e712c49b' # 3
# session_id = '6cbbfa55-58e3-437a-94c4-65eee1fa88a6' # 4
# session_id = 'c14cfd9f-3609-46f9-90aa-ba5a80b65015' # 5
excute_args = {} excute_args = {}
@ -27,8 +33,8 @@ if __name__ == '__main__':
# board = 'v329' # board = 'v329'
board = 'orangepi' board = 'orangepi'
# ACCESS_KEY = 'neOpatzY/mTzSyxdHs+ajNfpY/7SX1WrlqP/D6+5Km8THUxfZdcauQ==' # luxun # ACCESS_KEY = 'neOpatzY/mTzSyxdHs+ajNfpY/7SX1WrlqP/D6+5Km8THUxfZdcauQ==' # luxun
# ACCESS_KEY = 'KwdWw3V5X9Dz0c9x+5HmGAMi7GbW0kvnaGOAPloIAYwhp06jNt5baw==' # yuyue ACCESS_KEY = 'KwdWw3V5X9Dz0c9x+5HmGAMi7GbW0kvnaGOAPloIAYwhp06jNt5baw==' # yuyue
ACCESS_KEY = 'GPFKn+Z9LHGh8yZNfWkLUYRixnrsyY+5w8KN3rpl6sw+Bi7XIqbgTw==' # gaohz (hzgao2000@gmail.com) # ACCESS_KEY = 'GPFKn+Z9LHGh8yZNfWkLUYRixnrsyY+5w8KN3rpl6sw+Bi7XIqbgTw==' # gaohz (hzgao2000@gmail.com)
# ACCESS_KEY = 'Zo6Vx8YElrjMuA30K9yWMZvD06gcgOfyTi4rC6PPoqWL9mkhA/N/Lg==' # loujc # ACCESS_KEY = 'Zo6Vx8YElrjMuA30K9yWMZvD06gcgOfyTi4rC6PPoqWL9mkhA/N/Lg==' # loujc
# ACCESS_KEY = 'Ce5DkiDBQ9B7QNhebpQJyw/f3nhlqO5960yDUfkNAcl9gSj7RzIt6w==' # jinzc # ACCESS_KEY = 'Ce5DkiDBQ9B7QNhebpQJyw/f3nhlqO5960yDUfkNAcl9gSj7RzIt6w==' # jinzc