From f95d86835b03a627c7f375613c18e178b055c3bf Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 01 四月 2017 16:13:30 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java | 2 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml | 10 +++++-----
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 2 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml | 4 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
index 0126a58..e82b1d7 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
@@ -30,7 +30,7 @@
public View addLeftLayout() {
mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_attendance_left, null);
- mLeftRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_manager_recycler);
+ mLeftRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.fragment_visit_left_list_view);
LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
mLeftRecyclerView.setLayoutManager(manager);
mLeftAdapter = new VisitLeftAdapter();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
index 2f641b2..24dc14c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
@@ -38,7 +38,7 @@
public View addLeftLayout() {
mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_visit_left,null);
- mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_manager_recycler);
+ mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.fragment_visit_left_list_view);
LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
mRecyclerView.setLayoutManager(manager);
mAdapter = new VisitLeftAdapter();
@@ -125,7 +125,7 @@
}
}
- @OnClick(R.id.visitor_manager_back)
+ @OnClick(R.id.fragment_visit_left_back)
public void back(View view) {
MainActivity.selectPage(0);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml
index a36efcf..46b4d8d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml
@@ -18,7 +18,7 @@
android:background="@color/colorSearch"
android:orientation="vertical">
<EditText
- android:id="@+id/visitor_manager_search_et"
+ android:id="@+id/fragment_visit_left_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5.5dp"
@@ -30,7 +30,7 @@
android:textColorHint="@color/colorSearch"
android:background="@drawable/visitor_register_search_et"/>
<com.camnter.easyrecyclerview.widget.EasyRecyclerView
- android:id="@+id/visitor_manager_recycler"
+ android:id="@+id/fragment_visit_left_list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"></com.camnter.easyrecyclerview.widget.EasyRecyclerView>
</LinearLayout>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
index 8591fe4..774ef45 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -18,7 +18,7 @@
android:background="@color/colorSearch"
android:orientation="vertical">
<EditText
- android:id="@+id/visitor_manager_search_et"
+ android:id="@+id/fragment_visit_left_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5.5dp"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml
index bd68036..cd37aaa 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml
@@ -48,7 +48,7 @@
android:layout_height="match_parent"
android:background="@color/colorSearch"
android:orientation="vertical">
- <EditText
+ <cn.com.basic.face.widget.SearchEditText
android:id="@+id/fragment_phone_call_left_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml
index ef51630..ae145ab 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml
@@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
- android:id="@+id/visitor_manager_back"
+ android:id="@+id/fragment_visit_left_back"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:text="< 璁垮绠＄悊"
@@ -17,8 +17,8 @@
android:layout_height="match_parent"
android:background="@color/colorSearch"
android:orientation="vertical">
- <EditText
- android:id="@+id/visitor_manager_search_et"
+ <cn.com.basic.face.widget.SearchEditText
+ android:id="@+id/fragment_visit_left_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5.5dp"
@@ -30,8 +30,8 @@
android:textColorHint="@color/colorSearch"
android:background="@drawable/visitor_register_search_et"/>
<com.camnter.easyrecyclerview.widget.EasyRecyclerView
- android:id="@+id/visitor_manager_recycler"
+ android:id="@+id/fragment_visit_left_list_view"
android:layout_width="match_parent"
- android:layout_height="match_parent"></com.camnter.easyrecyclerview.widget.EasyRecyclerView>
+ android:layout_height="match_parent"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0