新增关闭流线程

controller/index.py

@@ -159,7 +159,7 @@ class oa2TokenView(TemplateView):
             return JsonResponse(res_json)
 
 
-# import threading
+import threading
 
 
 def runSendRtspMsg_thread(UID, PWD, MSG):
@@ -225,13 +225,13 @@ class oa2RtspStartView(TemplateView):
             RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['CN']
             #RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
             #rtsp://rtsp.zositech.xyz:443/elNGWlVURXRHU2swMlMwUlVRVVk1U2pFeE1VRT1M
-            #EasyDarwin
+            #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)
-            #zlmediakit
+            #zlm
             # MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/live/{stream_name}'. \
             #     format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
             #            stream_name=stream_name,
@@ -251,16 +251,19 @@ class oa2RtspStartView(TemplateView):
             # threading.Thread(target=runSendRtspMsg_thread, args=(UID, PWD, MSG)).start()
             # send_flag = self.runReqRtspMsg(UID, PWD, MSG)
             send_flag = self.runSendRtspMsg(UID, PWD, MSG)
-            #EasyDarwin
+            #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)
-            #zlmediakit
+            #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',
@@ -277,9 +280,7 @@ class oa2RtspStartView(TemplateView):
                 'authorizationTypes': ['NONE'],
                 'uri': rtsp_uri,
                 'msg': send_flag
-
             }
-            # time.sleep(1.5)
             redisObj.set_data(key=key, val=str(res_json), expire=600)
             return JsonResponse(res_json, safe=False)
         else:
@@ -308,6 +309,7 @@ class oa2RtspStartView(TemplateView):
             return True
 
     def runSendStop(self, UID, PWD, MSG):
+        time.sleep(60)
         command = "./pushtool {UID} {PWD} {MSG} 0".format(UID=UID, PWD=PWD, MSG=MSG)
         print('command=>{command}'.format(command=command))
         try: