From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_cell.xml | 44 ++++++++--------------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_blank_cell.xml | 36 +++++++++++++-----
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml | 1
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 6 +-
4 files changed, 46 insertions(+), 41 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 6e88e25..b6c0be4 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
@@ -269,14 +269,14 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
- if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- return;
- }
RelativeLayout mLayout = viewHolder.findViewById(R.id.fragment_surveillance_photo_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);
mLayout.setLayoutParams(layoutParams);
+ if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+ return;
+ }
ImageView fragment_surveillance_photo_cell_photo = (ImageView) mLayout.findViewById(R.id.fragment_surveillance_photo_cell_photo);
final View fragment_surveillance_photo_cell_select = mLayout.findViewById(R.id.fragment_surveillance_photo_cell_select);
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml
index 3b46816..972aec2 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml
@@ -38,6 +38,7 @@
android:background="@android:color/white"
android:orientation="vertical"
android:layout_marginLeft="@dimen/w10dp"
+ android:layout_marginBottom="@dimen/h25dp"
/>
<View
android:layout_width="match_parent"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_blank_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_blank_cell.xml
index b2d6de5..ea13883 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_blank_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_blank_cell.xml
@@ -1,17 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fragment_home_bottom_register_cell_relative_layout"
+ android:id="@+id/fragment_surveillance_photo_cell_relative_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:fresco="http://schemas.android.com/apk/res-auto"
+ android:gravity="center_horizontal"
+ android:layout_gravity="center_horizontal"
>
- <com.facebook.drawee.view.SimpleDraweeView
- android:id="@+id/fragment_surveillance_photo_cell_photo1"
- android:layout_width="@dimen/w122dp"
- android:layout_height="@dimen/h127dp"
- android:alpha="0.35"
- fresco:roundedCornerRadius="@dimen/w5dp"
- fresco:placeholderImageScaleType="fitXY"
- android:background="@drawable/normal_choose_bcg"
- />
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <com.facebook.drawee.view.SimpleDraweeView
+ android:id="@+id/fragment_surveillance_photo_cell_photo1"
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h127dp"
+ android:alpha="0.35"
+ fresco:roundedCornerRadius="@dimen/w5dp"
+ fresco:placeholderImageScaleType="fitXY"
+ android:background="@drawable/normal_choose_bcg"
+ />
+ <ImageView
+ android:id="@+id/fragment_surveillance_photo_cell_select"
+ android:layout_width="@dimen/w50dp"
+ android:layout_height="@dimen/h50dp"
+ android:src="@drawable/u241"
+ android:textColor="@android:color/white"
+ android:visibility="gone"
+ android:layout_marginTop="@dimen/w50dp"
+ android:layout_marginStart="@dimen/w50dp"
+ />
+ </RelativeLayout>
</RelativeLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_cell.xml
index 67a36b0..9e1ee70 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_cell.xml
@@ -11,38 +11,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView
- android:id="@+id/fragment_surveillance_photo_cell_photo_bg"
- android:layout_width="@dimen/w122dp"
- android:layout_height="@dimen/h127dp"
- android:alpha="0.35"
- fresco:roundedCornerRadius="@dimen/w5dp"
- fresco:placeholderImageScaleType="fitXY"
- android:background="@drawable/normal_choose_bcg"
- />
- <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_surveillance_photo_cell_photo"
android:layout_width="@dimen/w122dp"
android:layout_height="@dimen/h127dp"
- android:layout_alignParentBottom="true"
- android:scaleType="centerCrop"
- android:paddingTop="@dimen/h5dp"
- android:paddingRight="@dimen/w5dp"
- android:paddingLeft="@dimen/w5dp"
- android:paddingBottom="@dimen/w5dp"
fresco:roundedCornerRadius="@dimen/w5dp"
+ fresco:placeholderImageScaleType="fitXY"
+ android:paddingTop="@dimen/h5dp"
+ android:paddingBottom="@dimen/h5dp"
+ android:background="@drawable/normal_choose_bcg"
+ />
+ <ImageView
+ android:id="@+id/fragment_surveillance_photo_cell_select"
+ android:layout_width="@dimen/w50dp"
+ android:layout_height="@dimen/h50dp"
+ android:src="@drawable/u241"
+ android:textColor="@android:color/white"
+ android:visibility="gone"
+ android:layout_marginTop="@dimen/w50dp"
+ android:layout_marginStart="@dimen/w50dp"
/>
</RelativeLayout>
- <ImageView
- android:id="@+id/fragment_surveillance_photo_cell_select"
- android:layout_width="@dimen/w50dp"
- android:layout_height="@dimen/h50dp"
- android:src="@drawable/u241"
- android:gravity="center"
- android:layout_marginBottom="@dimen/h20dp"
- android:layout_marginLeft="@dimen/w60dp"
- android:layout_alignParentBottom="true"
- android:textColor="@android:color/white"
- android:layout_alignParentLeft="true"
- android:visibility="gone"
- />
+
+
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0