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/H264EncodeService.java | 12 ++++++------
app/src/main/java/com/anyun/h264/model/WatermarkInfo.java | 1 +
app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java | 8 ++++----
如何检查test.h264文件.md | 1 +
app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl | 4 ++--
check_h264.py | 1 +
app/src/main/java/com/anyun/h264/model/ResourceInfo.java | 1 +
app/src/main/aidl/com/anyun/h264/model/ResourceInfo.aidl | 1 +
app/src/main/java/com/anyun/h264/H264EncodeService2.java | 12 ++++++------
多进程方案使用说明.md | 1 +
README_H264_CHECK.md | 1 +
11 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/README_H264_CHECK.md b/README_H264_CHECK.md
index b681680..c60a8ee 100644
--- a/README_H264_CHECK.md
+++ b/README_H264_CHECK.md
@@ -119,3 +119,4 @@
搴旇鐪嬪埌锛歚00 00 00 01` 鎴� `00 00 01`锛圓nnex-B璧峰鐮侊級
+
diff --git a/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl b/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl
index fd338a9..ef88507 100644
--- a/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl
+++ b/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl
@@ -32,12 +32,12 @@
* @param endTime 缁撴潫鏃堕棿锛堟牸寮忥細YYMMDDHHmmss锛孊CD缂栫爜鐨�6瀛楄妭瀛楃涓诧級
* @return 璧勬簮鍒楄〃锛堟牴鎹甁T/T 1076-2016琛�23瀹氫箟锛�
*/
- List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard);
+ List<ResourceInfo> getResourceList(String startTime, String endTime,boolean useTFCard, String jsonConfig);
/**
* 璁剧疆姘村嵃淇℃伅
* @param watermarkInfo 姘村嵃淇℃伅瀛楃涓�
*/
- void setWatermarkInfo(String watermarkInfo);
+ void setWatermarkInfo(String watermarkInfo, String jsonConfig);
}
diff --git a/app/src/main/aidl/com/anyun/h264/model/ResourceInfo.aidl b/app/src/main/aidl/com/anyun/h264/model/ResourceInfo.aidl
index 1a74ece..5e54c23 100644
--- a/app/src/main/aidl/com/anyun/h264/model/ResourceInfo.aidl
+++ b/app/src/main/aidl/com/anyun/h264/model/ResourceInfo.aidl
@@ -6,3 +6,4 @@
parcelable ResourceInfo;
+
diff --git a/app/src/main/java/com/anyun/h264/H264EncodeService.java b/app/src/main/java/com/anyun/h264/H264EncodeService.java
index a856be1..d0c7374 100644
--- a/app/src/main/java/com/anyun/h264/H264EncodeService.java
+++ b/app/src/main/java/com/anyun/h264/H264EncodeService.java
@@ -63,13 +63,13 @@
}
@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);
}
};
@@ -755,7 +755,7 @@
* @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<>();
@@ -911,7 +911,7 @@
* 绀轰緥锛歿"plateNumber":"浜珹12345","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 {
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 {
diff --git a/app/src/main/java/com/anyun/h264/model/ResourceInfo.java b/app/src/main/java/com/anyun/h264/model/ResourceInfo.java
index b61f8ec..0deadda 100644
--- a/app/src/main/java/com/anyun/h264/model/ResourceInfo.java
+++ b/app/src/main/java/com/anyun/h264/model/ResourceInfo.java
@@ -157,3 +157,4 @@
+
diff --git a/app/src/main/java/com/anyun/h264/model/WatermarkInfo.java b/app/src/main/java/com/anyun/h264/model/WatermarkInfo.java
index 4f643fe..74901c8 100644
--- a/app/src/main/java/com/anyun/h264/model/WatermarkInfo.java
+++ b/app/src/main/java/com/anyun/h264/model/WatermarkInfo.java
@@ -139,3 +139,4 @@
}
+
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) {
diff --git a/check_h264.py b/check_h264.py
index a9f36f3..cb08c37 100644
--- a/check_h264.py
+++ b/check_h264.py
@@ -209,3 +209,4 @@
+
diff --git "a/\345\244\232\350\277\233\347\250\213\346\226\271\346\241\210\344\275\277\347\224\250\350\257\264\346\230\216.md" "b/\345\244\232\350\277\233\347\250\213\346\226\271\346\241\210\344\275\277\347\224\250\350\257\264\346\230\216.md"
index 02addf5..28e875c 100644
--- "a/\345\244\232\350\277\233\347\250\213\346\226\271\346\241\210\344\275\277\347\224\250\350\257\264\346\230\216.md"
+++ "b/\345\244\232\350\277\233\347\250\213\346\226\271\346\241\210\344\275\277\347\224\250\350\257\264\346\230\216.md"
@@ -117,3 +117,4 @@
+
diff --git "a/\345\246\202\344\275\225\346\243\200\346\237\245test.h264\346\226\207\344\273\266.md" "b/\345\246\202\344\275\225\346\243\200\346\237\245test.h264\346\226\207\344\273\266.md"
index cbd700f..91a4510 100644
--- "a/\345\246\202\344\275\225\346\243\200\346\237\245test.h264\346\226\207\344\273\266.md"
+++ "b/\345\246\202\344\275\225\346\243\200\346\237\245test.h264\346\226\207\344\273\266.md"
@@ -183,3 +183,4 @@
4. **濡傛灉杩樻湁闂**锛岃繍琛屾鏌ュ伐鍏疯幏鍙栬缁嗚瘖鏂�
+
--
Gitblit v1.8.0