From 7a1d9414825a826251cb3f7c255928a62f3ae1c3 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 08 五月 2017 10:40:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_cell.xml | 25 ++++++++++++
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_blank_cell.xml | 17 ++++++++
VisitFace/DemoForBsk/app/src/main/res/drawable/u158.png | 0
VisitFace/DemoForBsk/app/src/main/res/anim/slide_down.xml | 8 ++++
VisitFace/DemoForBsk/app/src/main/res/values/styles.xml | 5 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java | 4 +-
VisitFace/DemoForBsk/app/src/main/res/anim/slide_up.xml | 8 ++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 2
8 files changed, 65 insertions(+), 4 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 bec6689..6e88e25 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
@@ -264,7 +264,7 @@
@Override
public int[] getItemLayouts() {
- return new int[]{R.layout.fragment_surveillance_photo_cell, R.layout.fragment_surveillance_bottom_visit_blank_cell};
+ return new int[]{R.layout.fragment_surveillance_photo_cell, R.layout.fragment_surveillance_photo_blank_cell};
}
@Override
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
index 34b55b1..291637d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
@@ -101,8 +101,8 @@
this.setHeight(RelativeLayout.LayoutParams.MATCH_PARENT);
this.setWidth(RelativeLayout.LayoutParams.MATCH_PARENT);
this.setFocusable(true);
- this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
- this.setAnimationStyle(R.style.PopupAnimation);
+ //this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
+ this.setAnimationStyle(R.style.PopupSlideAnimation);
okButtonClickedListeners.add(okButtonClickedListener);
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/res/anim/slide_down.xml b/VisitFace/DemoForBsk/app/src/main/res/anim/slide_down.xml
new file mode 100644
index 0000000..c207c7e
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/anim/slide_down.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <translate
+ android:duration="1000"
+ android:fromYDelta="0"
+ android:toYDelta="100%" />
+</set>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/anim/slide_up.xml b/VisitFace/DemoForBsk/app/src/main/res/anim/slide_up.xml
new file mode 100644
index 0000000..582a0bd
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/anim/slide_up.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <translate
+ android:duration="1000"
+ android:fromYDelta="100%"
+ android:toYDelta="0" />
+</set>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u158.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u158.png
new file mode 100644
index 0000000..c772995
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u158.png
Binary files differ
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
new file mode 100644
index 0000000..b2d6de5
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_blank_cell.xml
@@ -0,0 +1,17 @@
+<?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:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ xmlns:fresco="http://schemas.android.com/apk/res-auto"
+ >
+ <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>
\ 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 28ef6bb..0853a06 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
@@ -4,11 +4,13 @@
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"
>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
- <com.facebook.drawee.view.SimpleDraweeView
+<!-- <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_surveillance_photo_cell_photo"
android:layout_width="@dimen/w122dp"
android:layout_height="@dimen/h127dp"
@@ -31,6 +33,27 @@
android:paddingLeft="@dimen/w5dp"
fresco:roundedCornerRadius="@dimen/w5dp"
android:alpha="0.55"
+ />-->
+ <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"
/>
</RelativeLayout>
<ImageView
diff --git a/VisitFace/DemoForBsk/app/src/main/res/values/styles.xml b/VisitFace/DemoForBsk/app/src/main/res/values/styles.xml
index 90a5b6c..ab46d6c 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/values/styles.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/values/styles.xml
@@ -21,6 +21,11 @@
<item name="android:windowExitAnimation">@anim/fade_out</item>
</style>
+ <style name="PopupSlideAnimation">
+ <item name="android:windowEnterAnimation">@anim/slide_up</item>
+ <item name="android:windowExitAnimation">@anim/slide_down</item>
+ </style>
+
<!--鐢ㄤ簬鏃ユ湡-->
<style name="AppTheme.AppDate" parent="android:Theme.Holo.Light.NoActionBar">
--
Gitblit v1.8.0