调用流媒体页面修改

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -1404,35 +1404,39 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             }
             //取出AudioTracks
             JSONArray audioJson = subObj.getJSONArray("AudioTracks");
-            for (int v = 0; v < audioJson.size(); v++) {
-                BaseCameraManagementResponse.AudioTracks audioTracks = new BaseCameraManagementResponse.AudioTracks();
-                JSONObject arrayJSONObject = audioJson.getJSONObject(v);
-                String name = arrayJSONObject.getString("Name");
-                String sampleRate = arrayJSONObject.getString("SampleRate");
-                String channels = arrayJSONObject.getString("Channels");
-                String bps = arrayJSONObject.getString("BPS");
-                audioTracks.setBps(bps);
-                audioTracks.setChannels(channels);
-                audioTracks.setName(name);
-                audioTracks.setSampleRate(sampleRate);
-                baseCameraManagementResponse.setAudioTracks(audioTracks);
+            if (audioJson != null && audioJson.size() > 0) {
+                for (int v = 0; v < audioJson.size(); v++) {
+                    BaseCameraManagementResponse.AudioTracks audioTracks = new BaseCameraManagementResponse.AudioTracks();
+                    JSONObject arrayJSONObject = audioJson.getJSONObject(v);
+                    String name = arrayJSONObject.getString("Name");
+                    String sampleRate = arrayJSONObject.getString("SampleRate");
+                    String channels = arrayJSONObject.getString("Channels");
+                    String bps = arrayJSONObject.getString("BPS");
+                    audioTracks.setBps(bps);
+                    audioTracks.setChannels(channels);
+                    audioTracks.setName(name);
+                    audioTracks.setSampleRate(sampleRate);
+                    baseCameraManagementResponse.setAudioTracks(audioTracks);
+                }
             }
             //取出VideoTracks
             JSONArray videoJson = subObj.getJSONArray("VideoTracks");
-            for (int v = 0; v < videoJson.size(); v++) {
-                BaseCameraManagementResponse.VideoTracks videoTracks = new BaseCameraManagementResponse.VideoTracks();
-                JSONObject arrayJSONObject = videoJson.getJSONObject(v);
-                String name = arrayJSONObject.getString("Name");
-                String width = arrayJSONObject.getString("Width");
-                String height = arrayJSONObject.getString("Height");
-                String resolution = width + "*" + height;
-                String gop = arrayJSONObject.getString("GOP");
-                String bps = arrayJSONObject.getString("BPS");
-                videoTracks.setBps(bps);
-                videoTracks.setGop(gop);
-                videoTracks.setName(name);
-                videoTracks.setResolution(resolution);
-                baseCameraManagementResponse.setVideoTracks(videoTracks);
+            if (audioJson != null && audioJson.size() > 0) {
+                for (int v = 0; v < videoJson.size(); v++) {
+                    BaseCameraManagementResponse.VideoTracks videoTracks = new BaseCameraManagementResponse.VideoTracks();
+                    JSONObject arrayJSONObject = videoJson.getJSONObject(v);
+                    String name = arrayJSONObject.getString("Name");
+                    String width = arrayJSONObject.getString("Width");
+                    String height = arrayJSONObject.getString("Height");
+                    String resolution = width + "*" + height;
+                    String gop = arrayJSONObject.getString("GOP");
+                    String bps = arrayJSONObject.getString("BPS");
+                    videoTracks.setBps(bps);
+                    videoTracks.setGop(gop);
+                    videoTracks.setName(name);
+                    videoTracks.setResolution(resolution);
+                    baseCameraManagementResponse.setVideoTracks(videoTracks);
+                }
             }
             baseCameraManagementResponseList.add(baseCameraManagementResponse);
         }