From 9a4f30159d1f1a6007e326da5633581d635a69b2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 18:33:27 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 3 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 4 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml | 1 +
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml | 25 +++++++++++++++++++++----
4 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index 61376e0..1052c88 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -116,7 +116,7 @@
// port = camera1.getString("fragment_device_right_camera1_port", "");
// }
- return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/main/av_stream";
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
}
public String getCamera2Address() {
@@ -139,7 +139,7 @@
// port = camera1.getString("fragment_device_right_camera1_port", "");
// }
- return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/main/av_stream";
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index d676d8c..9706ef3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -93,8 +93,9 @@
if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
|| type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
) {
+ //item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
if (prevVisitorList.size() > 3 ) {
- item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
+
}
item.setCreateTime(new Date());
newVisitorList.add(0, item);
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 5c6339e..3a946b4 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
@@ -13,6 +13,7 @@
android:paddingTop="@dimen/h5dp"
android:paddingRight="@dimen/w5dp"
android:paddingLeft="@dimen/w5dp"
+ android:paddingBottom="@dimen/h5dp"
/>
<TextView
android:id="@+id/fragment_home_bottom_register_cell_to_register"
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 05f4536..c7b619f 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
@@ -9,10 +9,23 @@
android:id="@+id/fragment_home_bottom_visitor_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/h5dp"
+ />
+ <!--
+ <com.facebook.drawee.view.SimpleDraweeView
+ android:id="@+id/fragment_home_bottom_visitor_cell_photo"
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h127dp"
fresco:roundedCornerRadius="@dimen/w5dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
/>
+ -->
<TextView
android:id="@+id/fragment_home_bottom_visitor_cell_warning"
android:layout_width="wrap_content"
@@ -26,13 +39,15 @@
android:text="璀︽姤"
android:textColor="@android:color/white"
android:layout_alignParentRight="true"
+ android:visibility="visible"
/>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/h20dp"
- android:background="#40000000"
- android:layout_alignParentBottom="true">
-
+ android:layout_height="@dimen/h35dp"
+ android:layout_alignParentBottom="true"
+ android:visibility="gone"
+ android:paddingBottom="@dimen/h15dp"
+ >
<TextView
android:id="@+id/fragment_home_bottom_visitor_cell_name"
android:layout_width="@dimen/view_size_0"
@@ -40,6 +55,7 @@
android:layout_weight="1"
android:text=""
android:textSize="@dimen/w12dp"
+ android:background="#40000000"
android:gravity="center"
android:textColor="@android:color/white"/>
<View
@@ -52,6 +68,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text="鏉ヨ鐧昏"
+ android:background="#40000000"
android:textSize="@dimen/w12dp"
android:gravity="center"
android:textColor="@android:color/white"/>
--
Gitblit v1.8.0