From b85ae3f664c75beb701b72f46495b4f2520af944 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 03 五月 2017 13:33:19 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 2 +- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml | 2 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 10 +++++----- VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java index 5fe87a6..c52588d 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java +++ b/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); + //} } }); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java index e28fbe6..a83e7c3 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java +++ b/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(); diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml b/VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml index 8a19ed4..173901c 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml +++ b/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> \ No newline at end of file diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml index 50c85a5..5201834 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml +++ b/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" -- Gitblit v1.8.0