搜索设备增加多通道设备_2

controller/index.py

@@ -413,13 +413,15 @@ class oa2DiscoveryDevice(TemplateView):
         requests_data = {'sid': 'admin', 'sst': 'admin', 'alexa_user_id': userID}
         res = requests.post(url=auth_request_url, data=requests_data)
         res_json = res.json()
-        logger.info('服务器响应: {}'.format(res_json))
+        logger.info('正式服务器响应: {}'.format(res_json))
 
+        test_flag = False   # 用来区分测试服务器,后面删掉
         # 添加测试服务器测试
         if res_json['result_code'] != 0:
             auth_request_url = '{}/oalexa/discoveryuid'.format(SERVER_PREFIX_TEST)
             res = requests.post(url=auth_request_url, data=requests_data)
             res_json = res.json()
+            test_flag = True
 
         logger.info('请求服务器url: {}'.format(auth_request_url))
         logger.info('服务器响应: {}'.format(res_json))
@@ -436,10 +438,12 @@ class oa2DiscoveryDevice(TemplateView):
         for uid_a in uid_arr:
             uid = uid_a['uid']
             nick = uid_a['nick']
-            multi_channel = uid_a['multi_channel']
-            if multi_channel:
-                # 多通道设备: uid_通道号
-                uid += '_' + str(uid_a['channel'])
+
+            if test_flag:
+                multi_channel = uid_a['multi_channel']
+                if multi_channel:
+                    # 多通道设备: uid_通道号
+                    uid += '_' + str(uid_a['channel'])
 
             region = 'CN' if uid_a['region'] == 'CN' else 'EN'
             rtsp_url = rtko.encrypt(data=uid)