From af026c7f53dbe9649cfc420b27b5289eced1ac82 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期四, 29 一月 2026 14:58:37 +0800
Subject: [PATCH] 1.aidl增加接口 sendinfo，发送水印信息；不再通过广播
---
app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java | 6 ++++++
app/src/main/aidl/com/safeluck/floatwindow/IMediaAidlInterface.aidl | 1 +
app/src/main/java/com/safeluck/floatwindow/FloatingService.java | 41 ++++++++++++++++++++++++++++++++++++++++-
3 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/app/src/main/aidl/com/safeluck/floatwindow/IMediaAidlInterface.aidl b/app/src/main/aidl/com/safeluck/floatwindow/IMediaAidlInterface.aidl
index 224a06b..be90e63 100644
--- a/app/src/main/aidl/com/safeluck/floatwindow/IMediaAidlInterface.aidl
+++ b/app/src/main/aidl/com/safeluck/floatwindow/IMediaAidlInterface.aidl
@@ -16,6 +16,7 @@
void startMedia(in MediaArgu media);
void stopMedia(in MediaArgu media);
+ void sendInfo(String s,int processId);//姘村嵃淇℃伅 json,processid=1 涓哄彂缁橣loatingService鐨勭殑淇℃伅锛沺rocesid=2涓哄彂缁橮2UsbCameraVideoService
void registerCallback(in IMyCallback cb);
void unregisterCallback(in IMyCallback cb);
}
diff --git a/app/src/main/java/com/safeluck/floatwindow/FloatingService.java b/app/src/main/java/com/safeluck/floatwindow/FloatingService.java
index 5e6da98..184cc3b 100644
--- a/app/src/main/java/com/safeluck/floatwindow/FloatingService.java
+++ b/app/src/main/java/com/safeluck/floatwindow/FloatingService.java
@@ -12,6 +12,7 @@
import com.safeluck.floatwindow.manager.AndroidCameraRecordManager;
import com.safeluck.floatwindow.manager.UsbCameraPushManager;
import com.safeluck.floatwindow.manager.UsbCameraRecordManager;
+import com.safeluck.floatwindow.util.GlobalData;
import timber.log.Timber;
@@ -109,7 +110,20 @@
Timber.d("stopMedia called via AIDL");
FloatingService.this.stopMedia(media);
}
-
+
+ @Override
+ public void sendInfo(String s, int processId) throws RemoteException {
+ if (processId == 2) {
+ ensureP2Bound();
+ if (p2Service != null) {
+ p2Service.sendInfo(s,processId);
+ }
+ }else{
+ GlobalData.getInstance().setWaterMaskInfo(s);
+ }
+ }
+
+
@Override
public void registerCallback(IMyCallback cb) throws RemoteException {
if (cb != null) {
@@ -347,4 +361,29 @@
response.setMessage(message);
notifyCallback(response);
}
+ /* private BroadcastReceiver mCloseBroadCastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ if (action.equals("com.safeluck.floatwindow_video2.studyinfo")) {
+ String str= intent.getStringExtra("info");
+ Log.i(TAG, "骞挎挱"+str);
+ GlobalData.getInstance().setWaterMaskInfo(str);
+ }
+ }
+ };
+ private void registBroadCastReceiver() {
+ IntentFilter filter = new IntentFilter();
+ filter.addAction("com.safeluck.floatwindow_video2.studyinfo");
+ registerReceiver(mCloseBroadCastReceiver,filter);
+
+ }
+ private void unRegisterTestBroadReceiver() {
+ if (mCloseBroadCastReceiver != null) {
+
+ //鏌ヨ鍒扮浉搴旂殑BroadcastReceiver
+ unregisterReceiver(mCloseBroadCastReceiver);
+
+ }
+ }*/
}
diff --git a/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java b/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java
index 09e59ab..15797d8 100644
--- a/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java
+++ b/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java
@@ -11,6 +11,7 @@
import com.safeluck.floatwindow.manager.UsbCameraPushManager;
import com.safeluck.floatwindow.manager.UsbCameraRecordManager;
+import com.safeluck.floatwindow.util.GlobalData;
import timber.log.Timber;
@@ -58,6 +59,11 @@
}
@Override
+ public void sendInfo(String s, int processId) throws RemoteException {
+ GlobalData.getInstance().setWaterMaskInfo(s);
+ }
+
+ @Override
public void registerCallback(IMyCallback cb) throws RemoteException {
if (cb != null) {
mCallbacks.register(cb);
--
Gitblit v1.8.0