guzijian / wvp-GB28181-pro · Commits

Commit 56996e2138bc6a50e716e66945c2773db02833f5

Authored by Lawrence
1 parent 1ec70660

修正拼写错误

Inline Side-by-side
Showing 4 changed files with 13 additions and 13 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @56996e2
@@ -329,7 +329,7 @@ public class SIPCommander implements ISIPCommander { @@ -329,7 +329,7 @@ public class SIPCommander implements ISIPCommander {
329 streamInfo.setSsrc(ssrc); 329 streamInfo.setSsrc(ssrc);
330 streamInfo.setCahnnelId(channelId); 330 streamInfo.setCahnnelId(channelId);
331 streamInfo.setDeviceID(device.getDeviceId()); 331 streamInfo.setDeviceID(device.getDeviceId());
332 - boolean b = storager.startPlayBlack(streamInfo); 332 + boolean b = storager.startPlayback(streamInfo);
333 return streamInfo; 333 return streamInfo;
334 334
335 } catch ( SipException | ParseException | InvalidArgumentException e) { 335 } catch ( SipException | ParseException | InvalidArgumentException e) {
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
  View file @56996e2
@@ -184,11 +184,11 @@ public interface IVideoManagerStorager { @@ -184,11 +184,11 @@ public interface IVideoManagerStorager {
184 184
185 Map<String, StreamInfo> queryPlayByDeviceId(String deviceId); 185 Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
186 186
187 - boolean startPlayBlack(StreamInfo streamInfo); 187 + boolean startPlayback(StreamInfo streamInfo);
188 188
189 - boolean stopPlayBlack(StreamInfo streamInfo); 189 + boolean stopPlayback(StreamInfo streamInfo);
190 190
191 - StreamInfo queryPlayBlackByDevice(String deviceId, String channelId); 191 + StreamInfo queryPlaybackByDevice(String deviceId, String channelId);
192 192
193 - StreamInfo queryPlayBlackBySSRC(String ssrc); 193 + StreamInfo queryPlaybackBySSRC(String ssrc);
194 } 194 }
src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
  View file @56996e2
@@ -195,22 +195,22 @@ public class VideoManagerJdbcStoragerImpl implements IVideoManagerStorager { @@ -195,22 +195,22 @@ public class VideoManagerJdbcStoragerImpl implements IVideoManagerStorager {
195 } 195 }
196 196
197 @Override 197 @Override
198 - public boolean startPlayBlack(StreamInfo streamInfo) { 198 + public boolean startPlayback(StreamInfo streamInfo) {
199 return false; 199 return false;
200 } 200 }
201 201
202 @Override 202 @Override
203 - public boolean stopPlayBlack(StreamInfo streamInfo) { 203 + public boolean stopPlayback(StreamInfo streamInfo) {
204 return false; 204 return false;
205 } 205 }
206 206
207 @Override 207 @Override
208 - public StreamInfo queryPlayBlackByDevice(String deviceId, String channelId) { 208 + public StreamInfo queryPlaybackByDevice(String deviceId, String channelId) {
209 return null; 209 return null;
210 } 210 }
211 211
212 @Override 212 @Override
213 - public StreamInfo queryPlayBlackBySSRC(String ssrc) { 213 + public StreamInfo queryPlaybackBySSRC(String ssrc) {
214 return null; 214 return null;
215 } 215 }
216 } 216 }
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
  View file @56996e2
@@ -409,7 +409,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager { @@ -409,7 +409,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
409 } 409 }
410 410
411 @Override 411 @Override
412 - public StreamInfo queryPlayBlackBySSRC(String ssrc) { 412 + public StreamInfo queryPlaybackBySSRC(String ssrc) {
413 // List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc)); 413 // List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc));
414 List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, ssrc)); 414 List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, ssrc));
415 if (playLeys == null || playLeys.size() == 0) return null; 415 if (playLeys == null || playLeys.size() == 0) return null;
@@ -505,14 +505,14 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager { @@ -505,14 +505,14 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
505 505
506 506
507 @Override 507 @Override
508 - public boolean startPlayBlack(StreamInfo stream) { 508 + public boolean startPlayback(StreamInfo stream) {
509 return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()), 509 return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()),
510 stream); 510 stream);
511 } 511 }
512 512
513 513
514 @Override 514 @Override
515 - public boolean stopPlayBlack(StreamInfo streamInfo) { 515 + public boolean stopPlayback(StreamInfo streamInfo) {
516 if (streamInfo == null) return false; 516 if (streamInfo == null) return false;
517 DeviceChannel deviceChannel = queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId()); 517 DeviceChannel deviceChannel = queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId());
518 if (deviceChannel != null) { 518 if (deviceChannel != null) {
@@ -527,7 +527,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager { @@ -527,7 +527,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
527 } 527 }
528 528
529 @Override 529 @Override
530 - public StreamInfo queryPlayBlackByDevice(String deviceId, String code) { 530 + public StreamInfo queryPlaybackByDevice(String deviceId, String code) {
531 String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, 531 String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
532 deviceId, 532 deviceId,
533 code); 533 code);