re300,EasyDarwin

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
             #EasyDarwin
-            # 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)
-            #zlmediakit
-            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)
+            #zlmediakit
+            # 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,15 +252,15 @@ class oa2RtspStartView(TemplateView):
             # send_flag = self.runReqRtspMsg(UID, PWD, MSG)
             send_flag = self.runSendRtspMsg(UID, PWD, MSG)
             #EasyDarwin
-            # 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)
-            #zlmediakit
-            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)
+            #zlmediakit
+            # 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)
             res_json = {
                 'endpointId': id,
                 'manufacturerName': 'Axis',
@@ -280,7 +280,7 @@ class oa2RtspStartView(TemplateView):
 
             }
             # time.sleep(1.5)
-            redisObj.set_data(key=key, val=str(res_json), expire=600)
+            redisObj.set_data(key=key, val=str(res_json), expire=300)
             return JsonResponse(res_json, safe=False)
         else:
             return JsonResponse({'msg': 'wrong'})