瀏覽代碼

兼容大华视频服务器取流

qiuzijian 3 年之前
父節點
當前提交
a1816008da
共有 2 個文件被更改,包括 4 次插入5 次删除
  1. 3 4
      .idea/workspace.xml
  2. 1 1
      Modules/Camera/Http/Controllers/Api/HaiKangController.php

+ 3 - 4
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <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" />
@@ -32,7 +31,7 @@
         <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="30" selection-start-line="216" selection-start-column="30" selection-end-line="216" selection-end-column="30" />
+              <caret line="216" column="61" selection-start-line="216" selection-start-column="61" selection-end-line="216" selection-end-column="61" />
               <folding>
                 <element signature="e#141#185#0#PHP" expanded="true" />
               </folding>
@@ -389,7 +388,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="467228000" />
+    <option name="totallyTimeSpent" value="467729000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -775,7 +774,7 @@
     <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="30" selection-start-line="216" selection-start-column="30" selection-end-line="216" selection-end-column="30" />
+          <caret line="216" column="61" selection-start-line="216" selection-start-column="61" selection-end-line="216" selection-end-column="61" />
           <folding>
             <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>

+ 1 - 1
Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -214,7 +214,7 @@ class HaiKangController extends BaseController
         $params['protocol']        = $protocol;
         $params['transmode']       = 1;  //0:UDP 1:TCP
         if ($video_recorder && $video_recorder == CameraEnum::VIDEO_RECORDER_DH) {
-            $parmas['expand'] = 'transcode=1&videotype=h264';
+            $parmas['expand'] = 'transcode=1&systemformat=ps&videotype=h264';
         }
 //        $params['streamform']      = 'ps';
 //        if ($cameras_info['data']['channelType'] == 'analog') {