parent: b83bcaf7 | 补丁 | 提交 | ignore whitespace
xuxiuxi
2017-05-09 534debadad3ccd0fd2542029324551db29833a98 


git-svn-id: http://192.168.1.226/svn/proxy@616 454eff88-639b-444f-9e54-f578c98de674
4个文件已修改
99 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java


@@ -34,6 +34,7 @@






import java.text.SimpleDateFormat;



import java.util.Date;



import java.util.List;







import cn.com.basic.face.discern.common.CommonVariables;



import cn.com.basic.face.discern.entity.Visit;



@@ -69,6 +70,10 @@


    @ViewInject(R.id.fragment_check_in_left_interviewee_radio)



    private RadioButton fragment_check_in_left_interviewee_radio;







    private String visitorSearchText;



    private String intervieweeSearchText;



//    private boolean ignore







    private int pageNum = 1;







    private CheckInMng manager = CheckInMng.getInstance();



@@ -86,7 +91,21 @@


                .setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {



                    @Override



                    public void onCheckedChanged(RadioGroup radioGroup, int i) {



                        reloadCheckInLeftList();



                        if (fragment_check_in_left_visitor_radio.isChecked()) {



                            List prevList = fragment_check_in_left_visitor.getPrevList();



                            if (prevList == null || prevList.size() == 0) {



                                reloadCheckInLeftList();



                            } else {



                                fragment_check_in_left_search_edit_text.setText(visitorSearchText);







                            }



                        } else {



                            fragment_check_in_left_search_edit_text.setText(intervieweeSearchText);



                            List prevList = fragment_check_in_left_interviewee.getPrevList();



                            if (prevList == null || prevList.size() == 0) {



                                reloadCheckInLeftList();



                            }



                        }



                    }



                });







@@ -101,7 +120,14 @@


        fragment_check_in_left_search_edit_text.addTextChangedListener(new TextWatcher() {



            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}



            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}



            public void afterTextChanged(Editable editable) { reloadCheckInLeftList(); }



            public void afterTextChanged(Editable editable) {



                if (fragment_check_in_left_visitor_radio.isChecked()) {



                    visitorSearchText = editable.toString();



                } else {



                    intervieweeSearchText = editable.toString();



                }



                reloadCheckInLeftList();



            }



        });







    }





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


@@ -49,7 +49,7 @@


    @ViewInject(R.id.fragment_surveillance_exit_timer)


    private TextView fragment_surveillance_exit_timer;




    static boolean useNative = true;


    static boolean useNative = false;




    public static boolean isEmulator() {


        return Build.FINGERPRINT.startsWith("generic")


@@ -63,11 +63,11 @@


    }




    static {


        if (isEmulator()) {


            useNative = false;


        } else {


            useNative = true;


        }


//        if (isEmulator()) {


//            useNative = false;


//        } else {


//            useNative = true;


//        }


        if (useNative) {


            System.loadLibrary("cvface_api");


            System.loadLibrary("opencv_java3");


@@ -77,7 +77,8 @@


            System.loadLibrary("rtspface");


            RtspFaceNative.init();


//            RtspFaceNative.setLocalIP("192.168.1.10");


            RtspFaceNative.setLocalIP("192.168.1.106");//自己手机ip


//            RtspFaceNative.setLocalIP("192.168.1.106");//自己手机ip


            RtspFaceNative.setLocalIP("192.168.1.203");


        }


    }






 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java


@@ -102,19 +102,19 @@


        String ip = "192.168.1.70";



        String port = "554";







        SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA1);



        if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {



            username = camera1.getString("fragment_device_right_camera1_username", "");



        }



        if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {



            password = camera1.getString("fragment_device_right_camera1_password", "");



        }



        if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {



            ip = camera1.getString("fragment_device_right_camera1_ip", "");



        }



        if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {



            port = camera1.getString("fragment_device_right_camera1_port", "");



        }



//        SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA1);



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {



//            username = camera1.getString("fragment_device_right_camera1_username", "");



//        }



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {



//            password = camera1.getString("fragment_device_right_camera1_password", "");



//        }



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {



//            ip = camera1.getString("fragment_device_right_camera1_ip", "");



//        }



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {



//            port = camera1.getString("fragment_device_right_camera1_port", "");



//        }







        return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";



    }



@@ -125,19 +125,19 @@


        String ip = "192.168.1.68";



        String port = "554";







        SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA2);



        if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {



            username = camera1.getString("fragment_device_right_camera1_username", "");



        }



        if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {



            password = camera1.getString("fragment_device_right_camera1_password", "");



        }



        if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {



            ip = camera1.getString("fragment_device_right_camera1_ip", "");



        }



        if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {



            port = camera1.getString("fragment_device_right_camera1_port", "");



        }



//        SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA2);



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {



//            username = camera1.getString("fragment_device_right_camera1_username", "");



//        }



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {



//            password = camera1.getString("fragment_device_right_camera1_password", "");



//        }



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {



//            ip = camera1.getString("fragment_device_right_camera1_ip", "");



//        }



//        if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {



//            port = camera1.getString("fragment_device_right_camera1_port", "");



//        }







        return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";



    }





 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml


@@ -21,7 +21,7 @@


        android:background="@color/colorSearch"



        android:orientation="vertical"



        >



        <EditText



        <cn.com.basic.face.widget.checkin.SearchEditText



            android:id="@+id/fragment_device_left_search"



            android:layout_width="match_parent"



            android:layout_height="wrap_content"