xuxiuxi
2017-05-03 b85ae3f664c75beb701b72f46495b4f2520af944


git-svn-id: http://192.168.1.226/svn/proxy@587 454eff88-639b-444f-9e54-f578c98de674
4个文件已修改
18 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -93,11 +93,11 @@
                    @Override
                    public void onClick(View view) {
                        MainActivity.selectPage(1);
                        RegisterFragment.getInstance().setRegisterInfo(getVo(item));
                        if(item.getBitmap() != null) {
                            RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
                            RegisterFragment.getInstance().setSurveillanceQueryItem(item);
                        }
                        //RegisterFragment.getInstance().setRegisterInfo(getVo(item));//java.lang.OutOfMemoryError: Failed to allocate a 25338980 byte allocation with 15827186 free bytes and 15MB until OOM
                        //if(item.getBitmap() != null) {
                        //    RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
                        //    RegisterFragment.getInstance().setSurveillanceQueryItem(item);
                        //}
                    }
                });
            }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -129,7 +129,7 @@
        float dpWidth = displayMetrics.widthPixels / displayMetrics.density;
        if (1==1) {
            return;
            //return;
        }
        String name = fragment_register_name.getValue();
VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml
@@ -4,7 +4,7 @@
<solid android:color="#F6335A" />
<size
    android:height="45dp"
    android:width="45dp" />
    android:height="@dimen/w45dp"
    android:width="@dimen/w45dp" />
</shape>
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml
@@ -17,7 +17,7 @@
        android:layout_height="wrap_content"
        android:background="@drawable/rounded_textview"
        android:gravity="center"
        android:textSize="@dimen/text_size_big"
        android:textSize="@dimen/w16dp"
        android:text="注册"
        android:layout_marginBottom="@dimen/h30dp"
        android:layout_marginRight="@dimen/w10dp"