xuxiuxi

2017-04-05 4e24d14d27ab08fa33ac58b55e8fdf484057c7d0

git-svn-id: http://192.168.1.226/svn/proxy@339 454eff88-639b-444f-9e54-f578c98de674

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

@@ -13,7 +13,7 @@
import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;

import cn.com.basic.face.service.SurvalanceMng;
import cn.com.basic.face.widget.surveilance.SupervisoryBottomListView;
import cn.com.basic.face.widget.surveilance.SurveillanceBottomListView;

import com.lidroid.xutils.view.annotation.ViewInject;

@@ -33,9 +33,9 @@
    @ViewInject(R.id.fragment_supervisory_bottom_attendance_background)
    private View fragment_supervisory_bottom_attendance_background;
    @ViewInject(R.id.fragment_supervisory_bottom_visit_list_view)
    private SupervisoryBottomListView fragment_supervisory_bottom_visit_list_view;
    private SurveillanceBottomListView fragment_supervisory_bottom_visit_list_view;
    @ViewInject(R.id.fragment_supervisory_bottom_attendance_list_view)
    private SupervisoryBottomListView fragment_supervisory_bottom_attendance_list_view;
    private SurveillanceBottomListView fragment_supervisory_bottom_attendance_list_view;
    @ViewInject(R.id.fragment_supervisory_enter_camera)
    VideoView fragment_supervisory_enter_camera;
    @ViewInject(R.id.fragment_supervisory_exit_camera)
@@ -56,11 +56,11 @@
        return instance;
    }

    public SupervisoryBottomListView get_fragment_supervisory_bottom_visit_list_view() {
    public SurveillanceBottomListView get_fragment_supervisory_bottom_visit_list_view() {
        return fragment_supervisory_bottom_visit_list_view;
    }

    public SupervisoryBottomListView get_fragment_supervisory_bottom_attendance_list_view() {
    public SurveillanceBottomListView get_fragment_supervisory_bottom_attendance_list_view() {
        return fragment_supervisory_bottom_visit_list_view;
    }


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java
@@ -17,7 +17,7 @@
import cn.com.basic.face.base.MainActivity;

import cn.com.basic.face.util.WindowsUtil;



public class SupervisoryBottomListView extends EasyRecyclerView {

public class SurveillanceBottomListView extends EasyRecyclerView {



    private class SpaceItemDecoration extends RecyclerView.ItemDecoration {

        @Override

@@ -51,17 +51,17 @@
        initLayout();

    }



    public SupervisoryBottomListView(Context context) {

    public SurveillanceBottomListView(Context context) {

        super(context);

        setAdapter(context);

    }



    public SupervisoryBottomListView(Context context, AttributeSet attrs) {

    public SurveillanceBottomListView(Context context, AttributeSet attrs) {

        super(context, attrs);

        setAdapter(context);

    }



    public SupervisoryBottomListView(Context context, AttributeSet attrs, int defStyle) {

    public SurveillanceBottomListView(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

        setAdapter(context);

    }


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

@@ -171,13 +171,13 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@android:color/white">
            <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView
            <cn.com.basic.face.widget.surveilance.SurveillanceBottomListView
                android:id="@+id/fragment_supervisory_bottom_visit_list_view"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:orientation="vertical"/>

            <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView
            <cn.com.basic.face.widget.surveilance.SurveillanceBottomListView
                android:id="@+id/fragment_supervisory_bottom_attendance_list_view"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"