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/FloatingService.java |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

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);
+
+        }
+    }*/
 }

--
Gitblit v1.8.0