zlm

azoauth/config.py

@@ -20,8 +20,8 @@ RESP_SERVER_DOMAIN_DATA = {
 }
 SERVER_PREFIX = 'http://www.dvema.com'
 #Easydarwin
-PORT_PREFIX = '8554'
-# PORT_PREFIX = '554'
+# PORT_PREFIX = '8554'
+PORT_PREFIX = '554'
 # PORT_PREFIX = '443'
 # RTSP_PREFIX = 'rtsps'
 RTSP_PREFIX = 'rtsp'

controller/index.py

@@ -226,17 +226,17 @@ class oa2RtspStartView(TemplateView):
             #RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
             #rtsp://rtsp.zositech.xyz:443/elNGWlVURXRHU2swMlMwUlVRVVk1U2pFeE1VRT1M
             #E
-            MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/{stream_name}'. \
-                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
-                       stream_name=stream_name,
-                       PORT_PREFIX=PORT_PREFIX,
-                       RTSP_PREFIX=RTSP_PREFIX)
-            #zlm
-            # MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/live/{stream_name}'. \
+            # MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/{stream_name}'. \
             #     format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
             #            stream_name=stream_name,
             #            PORT_PREFIX=PORT_PREFIX,
             #            RTSP_PREFIX=RTSP_PREFIX)
+            #zlm
+            MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/live/{stream_name}'. \
+                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
+                       stream_name=stream_name,
+                       PORT_PREFIX=PORT_PREFIX,
+                       RTSP_PREFIX=RTSP_PREFIX)
             # po = Pool(10)
             # po.apply_async(self.runSendRtspMsg, (UID, PWD, MSG))
             print(UID)
@@ -252,18 +252,19 @@ class oa2RtspStartView(TemplateView):
             # send_flag = self.runReqRtspMsg(UID, PWD, MSG)
             send_flag = self.runSendRtspMsg(UID, PWD, MSG)
             #E
-            rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/{stream_name}'. \
-                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
-                       stream_name=stream_name,
-                       RTSP_PREFIX=RTSP_PREFIX)
-            #zlm
-            # rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/live/{stream_name}'. \
+            # rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/{stream_name}'. \
             #     format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
             #            stream_name=stream_name,
             #            RTSP_PREFIX=RTSP_PREFIX)
-            #新增关闭流的线程
-            stream_name = threading.Thread(target=self.runSendStop,args=(UID, PWD, MSG))
-            stream_name.start()
+            #zlm
+            rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/live/{stream_name}'. \
+                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
+                       stream_name=stream_name,
+                       RTSP_PREFIX=RTSP_PREFIX)
+            #----------新增关闭流的线程
+            # stream_name = threading.Thread(target=self.runSendStop,args=(UID, PWD, MSG))
+            # stream_name.start()
+            #----------/新增关闭流的线程
             res_json = {
                 'endpointId': id,
                 'manufacturerName': 'Axis',