1.aidl增加接口 sendinfo，发送水印信息；不再通过广播

Dana

6 天以前 af026c7f53dbe9649cfc420b27b5289eced1ac82

1.aidl增加接口 sendinfo，发送水印信息；不再通过广播

 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 为发给FloatingService的的信息；procesid=2为发给P2UsbCameraVideoService
            void registerCallback(in IMyCallback cb);
            void unregisterCallback(in IMyCallback cb);
}

 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,6 +110,19 @@
            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 {
@@ -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);

        }
    }*/
}

 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);