Merge pull request #12 from aaronchenzhihe/master

ota

Author: dustin007442

src/OTA_test.py

@@ -0,0 +1,50 @@
+from usr.protocol import *
+import utime
+import usocket as socket 
+import umqtt
+import ujson as json
+from usr import uuid
+import request
+import _thread
+
+class OTA(object):
+    def __init__(self,mac):
+        self.uuid = str(uuid.uuid4())
+        self.head = {
+            'Accept-Language': 'zh-CN',
+            'Content-Type': 'application/json',
+            'User-Agent': 'kevin-box-2/1.0.1',
+            'Device-Id': mac,
+            'Client-Id': self.uuid
+        }
+        self.ota_data = {
+            "application": {
+                "version": "1.0.1",
+                "elf_sha256": "c8a8ecb6d6fbcda682494d9675cd1ead240ecf38bdde75282a42365a0e396033"
+            },
+            "board": {
+                "type": "kevin-box",
+                "name": "kevin-box-2",
+                "carrier": "CHINA UNICOM",
+                "csq": "22",
+                "imei": "****",
+                "iccid": "89860125801125426850"
+            }
+        }
+        self.url = "https://api.tenclass.net/xiaozhi/ota/"
+        # self.url ="http://xiaozhi.pandastroller.com:8002/xiaozhi/ota/"
+        self.response = None
+        self.UDP_IP = None
+        self.UDP_PORT = None
+        self.run()
+
+    def run(self):
+        # 通过OTA得到mqtt的连接参数
+        resp = request.post(self.url, data=json.dumps(self.ota_data), headers=self.head)
+        self.response = resp.json()
+        # print(self.response)
+        return self.response
+
+
+
+

src/main.py

@@ -161,6 +161,7 @@ def __chat_process(self):
                     if self.__voice_activity_event.is_set():
                         # 有人声
                         if not is_listen_flag:
+                            self.__protocol.abort()
                             self.__protocol.listen("start")
                             is_listen_flag = True
                         self.__protocol.send(data)
@@ -201,7 +202,7 @@ def on_voice_activity_detection(self, state):
         gc.collect()
         logger.info("on_voice_activity_detection: {}".format(state))
         if state == 1:
-            self.__protocol.abort()
+            # self.__protocol.abort()
             self.__voice_activity_event.set()  # 有人声
         else:
             self.__voice_activity_event.clear()  # 无人声

src/protocol.py

@@ -5,12 +5,14 @@
 from usr.threading import Thread, Condition
 from usr.logging import getLogger
 import sys_bus
+from usr.OTA_test import OTA
 
 
 
 logger = getLogger(__name__)
 
 
+
 WSS_DEBUG = True
 WSS_HOST = "wss://api.tenclass.net/xiaozhi/v1/"
 ACCESS_TOKEN = "test-token"
@@ -65,14 +67,19 @@ def validate(request, response):
 class WebSocketClient(object):
 
     def __init__(self, host=WSS_HOST, debug=WSS_DEBUG):
+        global WSS_HOST
+        self.ota = OTA(mac=self.get_mac_address())
         self.debug = debug
-        self.host = host
+        WSS_HOST = self.ota.run()
+        self.host = WSS_HOST["websocket"]["url"]
         self.__resp_helper = RespHelper()
         self.__recv_thread = None
         self.__audio_message_handler = None
         self.__json_message_handler = None
         self.__last_text_value = None
-    
+        logger.info("OTA:{}".format(WSS_HOST))
+        
+
     def __str__(self):
         return "{}(host=\"{}\")".format(type(self).__name__, self.host)
 
@@ -129,7 +136,7 @@ def connect(self):
         __client__ = ws.Client.connect(
             self.host, 
             headers={
-                "Authorization": "Bearer {}".format(ACCESS_TOKEN),
+                "Authorization": "Bearer {}".format(WSS_HOST["websocket"]["token"]),
                 "Protocol-Version": PROTOCOL_VERSION,
                 "Device-Id": self.get_mac_address(),
                 "Client-Id": self.generate_uuid()
@@ -138,6 +145,7 @@ def connect(self):
         )
 
         try:
+
             self.__recv_thread = Thread(target=self.__recv_thread_worker)
             self.__recv_thread.start(stack_size=64)
         except Exception as e: