qiuzijian 4 éve
szülő
commit
8d5ea11273
2 módosított fájl, 9 hozzáadás és 9 törlés
  1. 5 5
      .idea/workspace.xml
  2. 4 4
      Modules/Camera/Services/CameraServices.php

+ 5 - 5
.idea/workspace.xml

@@ -51,8 +51,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="442">
-              <caret line="421" column="85" selection-start-line="421" selection-start-column="85" selection-end-line="421" selection-end-column="85" />
+            <state relative-caret-position="624">
+              <caret line="415" column="39" selection-start-line="415" selection-start-column="39" selection-end-line="415" selection-end-column="39" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -484,7 +484,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="259986000" />
+    <option name="totallyTimeSpent" value="260263000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -864,8 +864,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="421" column="85" selection-start-line="421" selection-start-column="85" selection-end-line="421" selection-end-column="85" />
+        <state relative-caret-position="624">
+          <caret line="415" column="39" selection-start-line="415" selection-start-column="39" selection-end-line="415" selection-end-column="39" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>

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

@@ -397,11 +397,11 @@ class CameraServices
                 $curl = env('EASY_DARWIN_URL') . CameraEnum::API_STREAM_STOP . '?' . http_build_query($data);
 
                 //请求流媒体服务器停止推流
-                $curl_res = curl_request($curl);
+                $stop_res = curl_request($curl);
 
-                $curl_res = json_decode($curl_res, true);
+                $stop_res = json_decode($stop_res, true);
 
-                if ($curl_res == 'OK') {
+                if ($stop_res == 'OK') {
                     //更新拉流id为默认id
                     CameraList::where('revert_id', $val['id'])->update(
                         [
@@ -413,7 +413,7 @@ class CameraServices
                 } else {
                     Log::info('流媒体服务器停止推流失败id:' . $val['id']);
                     Log::info('流媒体服务器停止推流失败返回结果');
-                    Log::info($curl_res);
+                    Log::info($stop_res);
                 }
             }
         }