xuxiuxi

2017-08-01 db2c035c3406d310af30094ec2bbf55ab396bf83

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java

@@ -22,6 +22,7 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.thread.StartCameraThread;
import cn.com.basic.face.util.RtspFaceNative;

import cn.com.basic.face.service.SurveillanceMng;
@@ -67,6 +68,8 @@
    @ViewInject(R.id.fragment_surveillance_bottom_linear_layout)
    private LinearLayout fragment_surveillance_bottom_linear_layout;

    StartCameraThread startEnterCameraThread = null;
    StartCameraThread startExitCameraThread = null;

    static boolean useNative = false;

@@ -181,8 +184,6 @@
        if (CommonVariables.FACE_SERVER) {
            fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mPreview);
            fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mDraw);
            //fragment_supervisory_exit_camera_relative_layout.setVisibility(View.GONE);
            //fragment_surveillance_bottom_linear_layout.setVisibility(View.GONE);
        }
        fragment_supervisory_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
            public void surfaceCreated(SurfaceHolder holder) {
@@ -190,37 +191,28 @@
                    new SurveillancePhotoEmulateThread().start();
                }
                if (useNative) {
                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
                    synchronized (MainActivity.getInstance()) {
                        startEnterCameraThread = new StartCameraThread(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
                        startEnterCameraThread.start();
                    }
                }
            }

            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
            public void surfaceDestroyed(SurfaceHolder holder) {
                System.out.println("surfaceDestroyed");
            }
            public void surfaceDestroyed(SurfaceHolder holder) { }
        });
        fragment_supervisory_exit_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
            public void surfaceCreated(SurfaceHolder holder) {
                if (useNative) {
                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.OUT), fragment_supervisory_exit_camera.getHolder().getSurface());
                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.OUT), DeviceMng.getInstance().getCamera2Address());
                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.OUT), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
                    synchronized (MainActivity.getInstance()) {
                        startEnterCameraThread = new StartCameraThread(Integer.parseInt(CommonVariables.Camera.OUT), fragment_supervisory_exit_camera.getHolder().getSurface());
                        startEnterCameraThread.start();
                    }
                }
            }

            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
                System.out.print("width="+width+",height="+height);
//                if (useNative) {
//                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
//                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
//                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
//                }
            }
            public void surfaceDestroyed(SurfaceHolder holder) {
                System.out.println("surfaceDestroyed");
            }
            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { }
            public void surfaceDestroyed(SurfaceHolder holder) { }
        });
        new SurveillanceMng.SurveillanceListThread().start();
    }