| | |
| | | } |
| | | |
| | | @Override |
| | | public List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard) throws RemoteException { |
| | | return H264EncodeService.this.getResourceList(startTime, endTime,useTFCard); |
| | | public List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard,String jsonConfig) throws RemoteException { |
| | | return H264EncodeService.this.getResourceList(startTime, endTime,useTFCard, jsonConfig); |
| | | } |
| | | |
| | | @Override |
| | | public void setWatermarkInfo(String watermarkInfo) throws RemoteException { |
| | | H264EncodeService.this.setWatermarkInfo(watermarkInfo); |
| | | public void setWatermarkInfo(String watermarkInfo,String jsonConfig) throws RemoteException { |
| | | H264EncodeService.this.setWatermarkInfo(watermarkInfo,jsonConfig); |
| | | } |
| | | }; |
| | | |
| | |
| | | * @param endTime 结束时间(格式:YYMMDDHHmmss) |
| | | * @return 资源列表 |
| | | */ |
| | | private List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard) { |
| | | private List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard,String jsonConfig) { |
| | | Timber.d("getResourceList called, startTime: %s, endTime: %s, useTFCard: %b", startTime, endTime, useTFCard); |
| | | |
| | | List<ResourceInfo> resourceList = new ArrayList<>(); |
| | |
| | | * 示例:{"plateNumber":"京A12345","student":"张三","coach":"李四", |
| | | * "longitude":116.397128,"latitude":39.916527,"drivingSchool":"XX驾校","speed":60.5} |
| | | */ |
| | | private void setWatermarkInfo(String watermarkInfoJson) { |
| | | private void setWatermarkInfo(String watermarkInfoJson,String jsonConfig) { |
| | | Timber.d("setWatermarkInfo called, watermarkInfoJson: %s", watermarkInfoJson); |
| | | |
| | | try { |