兼容大华视频服务器取流

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -15,11 +16,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="552">
-              <caret line="612" column="39" selection-start-line="612" selection-start-column="39" selection-end-line="612" selection-end-column="39" />
+            <state relative-caret-position="143">
+              <caret line="855" column="48" selection-start-line="855" selection-start-column="48" selection-end-line="855" selection-end-column="48" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -27,11 +28,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="563">
-              <caret line="216" column="61" selection-start-line="216" selection-start-column="61" selection-end-line="216" selection-end-column="61" />
+            <state relative-caret-position="114">
+              <caret line="198" column="29" lean-forward="true" selection-start-line="198" selection-start-column="29" selection-end-line="198" selection-end-column="29" />
               <folding>
                 <element signature="e#141#185#0#PHP" expanded="true" />
               </folding>
@@ -151,8 +152,8 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
       </list>
     </option>
   </component>
@@ -388,7 +389,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="467729000" />
+    <option name="totallyTimeSpent" value="468217000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -754,16 +755,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="612" column="39" selection-start-line="612" selection-start-column="39" selection-end-line="612" selection-end-column="39" />
-          <folding>
-            <element signature="e#129#150#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="375">
@@ -773,13 +764,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="563">
-          <caret line="216" column="61" selection-start-line="216" selection-start-column="61" selection-end-line="216" selection-end-column="61" />
+        <state relative-caret-position="114">
+          <caret line="198" column="29" lean-forward="true" selection-start-line="198" selection-start-column="29" selection-end-line="198" selection-end-column="29" />
           <folding>
             <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="143">
+          <caret line="855" column="48" selection-start-line="855" selection-start-column="48" selection-end-line="855" selection-end-column="48" />
+          <folding>
+            <element signature="e#129#150#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -201,10 +201,9 @@ class HaiKangController extends BaseController
         if (!Input::has('cameraIndexCode')) {
             return $this->error(1, '缺少必要参数');
         }
-        $protocol       = Input::get('protocol', 'hls');
-        $streamType     = Input::get('streamType', 1);
-        $video_recorder = Input::get('video_recorder', '');
-        $url          = $this->artemis . '/api/video/v1/cameras/previewURLs';
+        $protocol   = Input::get('protocol', 'hls');
+        $streamType = Input::get('streamType', 1);
+        $url        = $this->artemis . '/api/video/v1/cameras/previewURLs';
 //        $cameras_info = json_decode($this->getCamerasInfo(Input::all()), true);
         //请求参数
         $params = [];
@@ -213,13 +212,8 @@ class HaiKangController extends BaseController
         $params['streamType']      = $streamType;  //0主码流 1子码流 2第三码流
         $params['protocol']        = $protocol;
         $params['transmode']       = 1;  //0:UDP 1:TCP
-        if ($video_recorder && $video_recorder == CameraEnum::VIDEO_RECORDER_DH) {
-            $parmas['expand'] = 'transcode=1&systemformat=ps&videotype=h264';
-        }
-//        $params['streamform']      = 'ps';
-//        if ($cameras_info['data']['channelType'] == 'analog') {
-//            $params['expand'] = 'transcode=1&videotype=h264';
-//        }
+        $params['expand'] = 'transcode=1&systemformat=ps&videotype=h264';
+
         $this->sign = $this->get_sign($url);
 
         $result = $this->curlPost($this->pre_url . $url, json_encode($params));

Modules/Camera/Services/CameraServices.php

@@ -606,7 +606,6 @@ class CameraServices
                 'key'             => $query->key,
                 'secret'          => $query->secret,
                 'cameraIndexCode' => $camera_id,
-                'video_recorder'  => ''
             ]
         );
         $haikang   = new HaiKangController();
@@ -794,8 +793,7 @@ class CameraServices
                 'secret'          => $query->secret,
                 'cameraIndexCode' => $camera->index_code,
                 'streamType'      => CameraEnum::CODE_STREAM_HAK[$camera->code_stream],
-                'protocol'        => 'rtmp',
-                'video_recorder'  => $camera->video_recorder
+                'protocol'        => 'rtmp'
             ]
         );
         $haikang   = new HaiKangController();
@@ -815,7 +813,6 @@ class CameraServices
                         'cameraIndexCode' => $camera->index_code,
                         'streamType'      => CameraEnum::CODE_STREAM_HAK[$code_stream],
                         'protocol'        => 'rtmp',
-                        'video_recorder'  => $camera->video_recorder
                     ]
                 );
                 $haikang   = new HaiKangController();
@@ -857,7 +854,6 @@ class CameraServices
                     'cameraIndexCode' => $camera->index_code,
                     'streamType'      => CameraEnum::CODE_STREAM_HAK[$code_stream],
                     'protocol'        => 'rtmp',
-                    'video_recorder'  => $camera->video_recorder
                 ]
             );
             $haikang   = new HaiKangController();