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/service/H264EncodeServiceClient.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java b/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java
index 5e6faeb..33e7508 100644
--- a/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java
+++ b/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java
@@ -191,14 +191,14 @@
      * @param endTime 缁撴潫鏃堕棿锛堟牸寮忥細YYMMDDHHmmss锛屼緥濡傦細240101235959锛�
      * @return 璧勬簮鍒楄〃锛屽鏋滃け璐ヨ繑鍥瀗ull
      */
-    public List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard) {
+    public List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard,String jsonConfig) {
         if (!isServiceBound()) {
             Log.e(TAG, "Service is not bound");
             return null;
         }
         
         try {
-            List<ResourceInfo> result = service.getResourceList(startTime, endTime,useTFCard);
+            List<ResourceInfo> result = service.getResourceList(startTime, endTime,useTFCard,jsonConfig);
             Log.d(TAG, "getResourceList returned " + (result != null ? result.size() : 0) + " resources");
             return result;
         } catch (RemoteException e) {
@@ -214,14 +214,14 @@
      *                      濡傛灉浼犲叆null鎴栫┖瀛楃涓诧紝灏嗘竻闄ゆ按鍗�
      * @return true-鎴愬姛锛宖alse-澶辫触
      */
-    public boolean setWatermarkInfo(String watermarkInfo) {
+    public boolean setWatermarkInfo(String watermarkInfo,String jsonConfig) {
         if (!isServiceBound()) {
             Log.e(TAG, "Service is not bound");
             return false;
         }
         
         try {
-            service.setWatermarkInfo(watermarkInfo);
+            service.setWatermarkInfo(watermarkInfo,jsonConfig);
             Log.d(TAG, "setWatermarkInfo called with: " + watermarkInfo);
             return true;
         } catch (RemoteException e) {

--
Gitblit v1.8.0