From 1cbe3da23535a1111510a6fce6fe24fd2983bfd1 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 14:53:41 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml | 9 ++++++---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 18 +++++++++---------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml | 14 +++++++-------
3 files changed, 22 insertions(+), 19 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 db65956..4d668d8 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
@@ -67,8 +67,8 @@
RelativeLayout mLayout = holder.findViewById(R.id.fragment_home_bottom_register_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
- layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);//WindowsUtil.dip2px(context, 127);
- layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);//WindowsUtil.dip2px(context, 122);
+ layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
+ layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);
mLayout.setLayoutParams(layoutParams);
final Object data = this.getItem(position);
@@ -110,8 +110,8 @@
RelativeLayout mLayout = holder.findViewById(R.id.fragment_supervisory_bottom_visitor_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
- layoutParams.height = WindowsUtil.dip2px(context, 127);
- layoutParams.width = WindowsUtil.dip2px(context, 122);
+ layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
+ layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);
mLayout.setLayoutParams(layoutParams);
ImageView fragment_home_bottom_visitor_cell_photo = (ImageView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_photo);
@@ -172,9 +172,9 @@
@Override
public void onClick(View view) {
MainActivity.selectPage(Constant.TabType.CHECK_IN);
- cn.com.basic.face.fragment.CheckInFragment.getInstance().
- getFragment_check_in_right_visitor_cell()
- .setVisitorInfo(getVo(item));
+// cn.com.basic.face.fragment.CheckInFragment.getInstance().
+// getFragment_check_in_right_visitor_cell()
+// .setVisitorInfo(getVo(item));
if (item.getBitmap() != null && (item.getImagePath() == null || "".equals(item.getImagePath()))) {
cn.com.basic.face.fragment.CheckInFragment.getInstance().
getFragment_check_in_right_visitor_cell().setPhoto(item.getBitmap());
@@ -216,8 +216,8 @@
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
RelativeLayout mLayout = viewHolder.findViewById(R.id.fragment_supervisory_bottom_attendance_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
- layoutParams.height = WindowsUtil.dip2px(context, 127);
- layoutParams.width = WindowsUtil.dip2px(context, 122);
+ layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
+ layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);
mLayout.setLayoutParams(layoutParams);
ImageView fragment_home_bottom_attendance_cell_photo = (ImageView) mLayout.findViewById(R.id.fragment_home_bottom_attendance_cell_photo);
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
index 20df68c..5417c2d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
@@ -13,6 +13,9 @@
fresco:roundedCornerRadius="@dimen/w5dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
+ android:paddingTop="@dimen/h15dp"
+ android:paddingRight="@dimen/w5dp"
+ android:paddingLeft="@dimen/w5dp"
/>
<LinearLayout
android:layout_width="match_parent"
@@ -26,7 +29,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text=""
- android:textSize="@dimen/text_size_small"
+ android:textSize="@dimen/w12dp"
android:gravity="center"
android:textColor="@android:color/white"/>
<View
@@ -38,8 +41,8 @@
android:layout_width="@dimen/view_size_0"
android:layout_height="match_parent"
android:layout_weight="1"
- android:text="鏉ヨ鐧昏"
- android:textSize="@dimen/text_size_small"
+ android:text="绛惧埌"
+ android:textSize="@dimen/w12dp"
android:gravity="center"
android:textColor="@android:color/white"
android:background="#00000000"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
index f0749d0..05f4536 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
@@ -5,7 +5,6 @@
android:layout_height="wrap_content"
xmlns:fresco="http://schemas.android.com/apk/res-auto"
>
-
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_home_bottom_visitor_cell_photo"
android:layout_width="@dimen/w122dp"
@@ -21,12 +20,13 @@
android:background="@color/colorRed"
android:paddingRight="@dimen/w7dp"
android:paddingLeft="@dimen/w10dp"
- android:paddingTop="2dp"
- android:paddingBottom="2dp"
- android:textSize="@dimen/text_size_big"
+ android:paddingTop="@dimen/h2dp"
+ android:paddingBottom="@dimen/h2dp"
+ android:textSize="@dimen/w16dp"
android:text="璀︽姤"
android:textColor="@android:color/white"
- android:layout_alignParentRight="true"/>
+ android:layout_alignParentRight="true"
+ />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/h20dp"
@@ -39,7 +39,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text=""
- android:textSize="@dimen/text_size_small"
+ android:textSize="@dimen/w12dp"
android:gravity="center"
android:textColor="@android:color/white"/>
<View
@@ -52,7 +52,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text="鏉ヨ鐧昏"
- android:textSize="@dimen/text_size_small"
+ android:textSize="@dimen/w12dp"
android:gravity="center"
android:textColor="@android:color/white"/>
</LinearLayout>
--
Gitblit v1.8.0