From 3ba8a63e3cea26791fff2c01f810783cc87ef2b6 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期三, 24 十二月 2025 11:01:05 +0800
Subject: [PATCH] 1.修改接口 ，如果json里面cameraid为2 ，则调用H264EncodeService2里面的接口
---
app/src/main/java/com/anyun/h264/H264EncodeService2.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/anyun/h264/H264EncodeService2.java b/app/src/main/java/com/anyun/h264/H264EncodeService2.java
index ea76ddb..05ce338 100644
--- a/app/src/main/java/com/anyun/h264/H264EncodeService2.java
+++ b/app/src/main/java/com/anyun/h264/H264EncodeService2.java
@@ -51,13 +51,13 @@
}
@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);
}
};
@@ -596,7 +596,7 @@
/**
* 鑾峰彇璧勬簮鍒楄〃锛堟牴鎹甁T/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<>();
@@ -756,7 +756,7 @@
/**
* 璁剧疆姘村嵃淇℃伅
*/
- private void setWatermarkInfo(String watermarkInfoJson) {
+ private void setWatermarkInfo(String watermarkInfoJson,String jsonConfig) {
Timber.d("setWatermarkInfo called (camera2), watermarkInfoJson: %s", watermarkInfoJson);
try {
--
Gitblit v1.8.0