xuxiuxi
2017-04-18 4dcad62f9276d34d13ff6e35bd8b0a910a1df3f1


git-svn-id: http://192.168.1.226/svn/proxy@473 454eff88-639b-444f-9e54-f578c98de674
3个文件已修改
17 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -69,6 +69,8 @@
            ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
            layoutParams.height = WindowsUtil.dip2px(context, 127);
            layoutParams.width = WindowsUtil.dip2px(context, 104);
//            layoutParams.height = WindowsUtil.px2dip(context, 480);
//            layoutParams.width = WindowsUtil.px2dip(context, 640);
            mLayout.setLayoutParams(layoutParams);
            final Object data = this.getItem(position);
@@ -104,6 +106,8 @@
            ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
            layoutParams.height = WindowsUtil.dip2px(context, 127);
            layoutParams.width = WindowsUtil.dip2px(context, 104);
//            layoutParams.height = WindowsUtil.px2dip(context, 480);
//            layoutParams.width = WindowsUtil.px2dip(context, 640);
            mLayout.setLayoutParams(layoutParams);
            ImageView fragment_home_bottom_visitor_cell_photo = (ImageView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_photo);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -105,6 +105,7 @@
    }
    private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {
        doubleList.clear();
        List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
        List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
        for (SurveillanceQueryItem item : list) {
@@ -129,8 +130,8 @@
                }
                m++;
            } else {
                if (m < checkInList.size()) {
                    item = checkInList.get(m);
                if (n < checkInList.size()) {
                    item = checkInList.get(n);
                } else {
                    item = getBlankItem();
                }
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -38,8 +38,8 @@
            android:layout_weight="1"
            >
            <SurfaceView
                android:layout_width="640px"
                android:layout_height="480px"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:id="@+id/fragment_supervisory_enter_camera" />
            <RelativeLayout
                android:layout_width="match_parent"
@@ -75,8 +75,8 @@
            >
            <SurfaceView
                android:id="@+id/fragment_supervisory_exit_camera"
                android:layout_width="640px"
                android:layout_height="480px"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                />
            <RelativeLayout