大华切片

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

@@ -354,11 +354,7 @@ class TdwyController extends BaseController
             if($result4['data']['url'] && $result4['data']['token']){
                 $rtsp = explode('|',$result4['data']['url']);
                 if($rtsp[1]){
-                    $result['data'] = [
-                        'camera_id' => $camera_id,
-                        'url' => $rtsp[1].'?token='.$result4['data']['token']
-                    ];
-                    return $result;
+                    return $rtsp[1].'?token='.$result4['data']['token'];
                 }
             }
         }

Modules/Camera/Services/CameraServices.php

@@ -1860,9 +1860,9 @@ class CameraServices
 
         $tdwy = new TdwyController();
         $tdwy->dahuaRtsp($camera_id,$parent_id);
-        $result = $tdwy->dahuaRtsp($camera_id,$parent_id);
+        $rtsp = $tdwy->dahuaRtsp($camera_id,$parent_id);
 
-        $res = self::getVideoStream($result['data']['url'], $path, $camera_id);
+        $res = self::getVideoStream($rtsp, $path, $camera_id);
         $result['data'] = $res['data'];
         return $result;
     }