From 4e24d14d27ab08fa33ac58b55e8fdf484057c7d0 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 05 四月 2017 12:03:37 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 4 ++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 10 +++++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 814feb2..5fa8acb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -13,7 +13,7 @@
import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;
import cn.com.basic.face.service.SurvalanceMng;
-import cn.com.basic.face.widget.surveilance.SupervisoryBottomListView;
+import cn.com.basic.face.widget.surveilance.SurveillanceBottomListView;
import com.lidroid.xutils.view.annotation.ViewInject;
@@ -33,9 +33,9 @@
@ViewInject(R.id.fragment_supervisory_bottom_attendance_background)
private View fragment_supervisory_bottom_attendance_background;
@ViewInject(R.id.fragment_supervisory_bottom_visit_list_view)
- private SupervisoryBottomListView fragment_supervisory_bottom_visit_list_view;
+ private SurveillanceBottomListView fragment_supervisory_bottom_visit_list_view;
@ViewInject(R.id.fragment_supervisory_bottom_attendance_list_view)
- private SupervisoryBottomListView fragment_supervisory_bottom_attendance_list_view;
+ private SurveillanceBottomListView fragment_supervisory_bottom_attendance_list_view;
@ViewInject(R.id.fragment_supervisory_enter_camera)
VideoView fragment_supervisory_enter_camera;
@ViewInject(R.id.fragment_supervisory_exit_camera)
@@ -56,11 +56,11 @@
return instance;
}
- public SupervisoryBottomListView get_fragment_supervisory_bottom_visit_list_view() {
+ public SurveillanceBottomListView get_fragment_supervisory_bottom_visit_list_view() {
return fragment_supervisory_bottom_visit_list_view;
}
- public SupervisoryBottomListView get_fragment_supervisory_bottom_attendance_list_view() {
+ public SurveillanceBottomListView get_fragment_supervisory_bottom_attendance_list_view() {
return fragment_supervisory_bottom_visit_list_view;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java
similarity index 89%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java
index fd719c2..166bf85 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java
@@ -17,7 +17,7 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.util.WindowsUtil;
-public class SupervisoryBottomListView extends EasyRecyclerView {
+public class SurveillanceBottomListView extends EasyRecyclerView {
private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
@Override
@@ -51,17 +51,17 @@
initLayout();
}
- public SupervisoryBottomListView(Context context) {
+ public SurveillanceBottomListView(Context context) {
super(context);
setAdapter(context);
}
- public SupervisoryBottomListView(Context context, AttributeSet attrs) {
+ public SurveillanceBottomListView(Context context, AttributeSet attrs) {
super(context, attrs);
setAdapter(context);
}
- public SupervisoryBottomListView(Context context, AttributeSet attrs, int defStyle) {
+ public SurveillanceBottomListView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
setAdapter(context);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
index 7d45b81..0995412 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -171,13 +171,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
- <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView
+ <cn.com.basic.face.widget.surveilance.SurveillanceBottomListView
android:id="@+id/fragment_supervisory_bottom_visit_list_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"/>
- <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView
+ <cn.com.basic.face.widget.surveilance.SurveillanceBottomListView
android:id="@+id/fragment_supervisory_bottom_attendance_list_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
--
Gitblit v1.8.0