Pārlūkot izejas kodu

修改接口自动切换码流功能

qiuzijian 3 gadi atpakaļ
vecāks
revīzija
47510f4a43
2 mainītis faili ar 8 papildinājumiem un 10 dzēšanām
  1. 6 8
      .idea/workspace.xml
  2. 2 2
      Modules/Camera/Services/CameraServices.php

+ 6 - 8
.idea/workspace.xml

@@ -3,8 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -44,8 +42,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="-844">
-              <caret line="802" column="24" lean-forward="true" selection-start-line="802" selection-start-column="24" selection-end-line="802" selection-end-column="24" />
+            <state relative-caret-position="248">
+              <caret line="831" column="77" selection-start-line="831" selection-start-column="77" selection-end-line="831" selection-end-column="77" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -439,12 +437,12 @@
       <workItem from="1641785500605" duration="61000" />
       <workItem from="1641786030534" duration="477000" />
       <workItem from="1641800375826" duration="26685000" />
-      <workItem from="1643085370753" duration="18328000" />
+      <workItem from="1643085370753" duration="18527000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="448379000" />
+    <option name="totallyTimeSpent" value="448578000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -829,8 +827,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-844">
-          <caret line="802" column="24" lean-forward="true" selection-start-line="802" selection-start-column="24" selection-end-line="802" selection-end-column="24" />
+        <state relative-caret-position="248">
+          <caret line="831" column="77" selection-start-line="831" selection-start-column="77" selection-end-line="831" selection-end-column="77" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>

+ 2 - 2
Modules/Camera/Services/CameraServices.php

@@ -829,7 +829,7 @@ class CameraServices
                     return $result;
                 } else {
                     //更新视频码流
-                    CameraList::where('id', $camera_id)->update(['code_stram' => $code_stream]);
+                    CameraList::where('id', $camera_id)->update(['code_stream' => $code_stream]);
                     $result['data'] = $res['data'];
                 }
             } else {
@@ -864,7 +864,7 @@ class CameraServices
                 return $result;
             } else {
                 //更新视频码流
-                CameraList::where('id', $camera_id)->update(['code_stram' => $code_stream]);
+                CameraList::where('id', $camera_id)->update(['code_stream' => $code_stream]);
                 $result['data'] = $res['data'];
             }
         }