Преглед изворни кода

修改查询视频播放链接接口

qiuzijian пре 4 година
родитељ
комит
cac3b0fe09
2 измењених фајлова са 14 додато и 7 уклоњено
  1. 5 6
      .idea/workspace.xml
  2. 9 1
      Modules/Camera/Services/CameraServices.php

+ 5 - 6
.idea/workspace.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
@@ -40,8 +39,8 @@
       <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="277">
-              <caret line="721" column="60" selection-start-line="721" selection-start-column="60" selection-end-line="721" selection-end-column="60" />
+            <state relative-caret-position="523">
+              <caret line="738" column="27" selection-start-line="738" selection-start-column="27" selection-end-line="738" selection-end-column="27" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -471,7 +470,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="291059000" />
+    <option name="totallyTimeSpent" value="291210000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -868,8 +867,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="721" column="60" selection-start-line="721" selection-start-column="60" selection-end-line="721" selection-end-column="60" />
+        <state relative-caret-position="523">
+          <caret line="738" column="27" selection-start-line="738" selection-start-column="27" selection-end-line="738" selection-end-column="27" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>

+ 9 - 1
Modules/Camera/Services/CameraServices.php

@@ -354,7 +354,7 @@ class CameraServices
 
         if (strpos($curl_res,' ')) {
             $result['status'] = false;
-            $result['msg'] = ApiEnum::EASY_DAWIN_REQUEST_FAIL;
+            $result['msg']    = ApiEnum::EASY_DAWIN_REQUEST_FAIL;
             return $result;
         }
 
@@ -383,6 +383,10 @@ class CameraServices
 
             $i++;
         }
+
+        $result['status'] = false;
+        $result['msg']    = ApiEnum::EASY_DAWIN_REQUEST_FAIL;
+        return $result;
     }
 
     //停止流媒体推流
@@ -729,6 +733,10 @@ class CameraServices
 
                 $i++;
             }
+
+            $result['status'] = false;
+            $result['msg'] = ApiEnum::HK_REQUEST_FAIL;
+            return $result;
         } else {
             $result['status'] = false;
             $result['msg'] = ApiEnum::HK_REQUEST_FAIL;