| | |
| | | } |
| | | |
| | | @Override |
| | | public List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard) throws RemoteException { |
| | | return H264EncodeService2.this.getResourceList(startTime, endTime,useTFCard); |
| | | public List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard,String jsonConfig) throws RemoteException { |
| | | return H264EncodeService2.this.getResourceList(startTime, endTime,useTFCard,jsonConfig); |
| | | } |
| | | |
| | | @Override |
| | | public void setWatermarkInfo(String watermarkInfo) throws RemoteException { |
| | | H264EncodeService2.this.setWatermarkInfo(watermarkInfo); |
| | | public void setWatermarkInfo(String watermarkInfo,String jsonConfig) throws RemoteException { |
| | | H264EncodeService2.this.setWatermarkInfo(watermarkInfo,jsonConfig); |
| | | } |
| | | }; |
| | | |
| | |
| | | /** |
| | | * 获取资源列表(根据JT/T 1076-2016表23定义) |
| | | */ |
| | | 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 (camera2), startTime: %s, endTime: %s, useTFCard: %b", startTime, endTime, useTFCard); |
| | | |
| | | List<ResourceInfo> resourceList = new ArrayList<>(); |
| | |
| | | /** |
| | | * 设置水印信息 |
| | | */ |
| | | private void setWatermarkInfo(String watermarkInfoJson) { |
| | | private void setWatermarkInfo(String watermarkInfoJson,String jsonConfig) { |
| | | Timber.d("setWatermarkInfo called (camera2), watermarkInfoJson: %s", watermarkInfoJson); |
| | | |
| | | try { |