From 51378c40d2fd4f3478a685aac8c72f04fda711c1 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 01 四月 2017 16:24:55 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java | 6 +++---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml | 4 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml | 31 +++++++++++++++----------------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 2 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml | 10 +++++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 2 +-
6 files changed, 27 insertions(+), 28 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 e82b1d7..03bc279 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.fragment_visit_left_list_view);
+ mLeftRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.fragment_attendance_left_list_view);
LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
mLeftRecyclerView.setLayoutManager(manager);
mLeftAdapter = new VisitLeftAdapter();
@@ -41,7 +41,7 @@
public View addRightLayout() {
mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_attendance_right, null);
- mRightRecyclerView = (EasyRecyclerView) mViewRight.findViewById(R.id.attendance_recycler);
+ mRightRecyclerView = (EasyRecyclerView) mViewRight.findViewById(R.id.fragment_attendance_right_list_view);
mRightAdapter = new AttendanceAdapter();
ViewUtils.inject(this, mViewRight);
return mViewRight;
@@ -73,7 +73,7 @@
}
}
- @OnClick(R.id.attendance_manager_back)
+ @OnClick(R.id.fragment_attendance_left_back)
public void back(View view) {
MainActivity.selectPage(0);
}
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 24dc14c..649076e 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.fragment_visit_left_list_view);
+ mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.fragment_attendance_left_list_view);
LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
mRecyclerView.setLayoutManager(manager);
mAdapter = new VisitLeftAdapter();
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 46b4d8d..9e996c5 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
@@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
- android:id="@+id/attendance_manager_back"
+ android:id="@+id/fragment_attendance_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/fragment_visit_left_search"
+ <cn.com.basic.face.widget.SearchEditText
+ android:id="@+id/fragment_attendance_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/fragment_visit_left_list_view"
+ android:id="@+id/fragment_attendance_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
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml
index 5f7650f..2767b6e 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml
@@ -13,7 +13,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<com.facebook.drawee.view.SimpleDraweeView
- android:id="@+id/attendance_manager_avatar"
+ android:id="@+id/fragment_attendance_right_photo"
android:layout_width="197dp"
android:layout_height="197dp"
fresco:placeholderImageScaleType="fitXY"/>
@@ -33,12 +33,12 @@
android:textColor="@color/colorText_5"
android:text="@string/title_card_number"/>
<TextView
- android:id="@+id/attendance_card_number"
+ android:id="@+id/fragment_attendance_right_id_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
- android:text="@string/title_card_number"/>
+ android:text=""/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -52,12 +52,12 @@
android:textColor="@color/colorText_5"
android:text="@string/title_name"/>
<TextView
- android:id="@+id/attendance_name"
+ android:id="@+id/fragment_attendance_right_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
- android:text="@string/title_card_number"/>
+ android:text=""/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -71,12 +71,12 @@
android:textColor="@color/colorText_5"
android:text="@string/title_sex"/>
<TextView
- android:id="@+id/attendance_sex"
+ android:id="@+id/fragment_attendance_right_gender"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
- android:text="@string/title_card_number"/>
+ android:text=""/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -90,12 +90,12 @@
android:textColor="@color/colorText_5"
android:text="@string/title_work"/>
<TextView
- android:id="@+id/attendance_work"
+ android:id="@+id/fragment_attendance_right_post"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
- android:text="@string/title_card_number"/>
+ android:text=""/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -109,12 +109,12 @@
android:textColor="@color/colorText_5"
android:text="@string/title_department"/>
<TextView
- android:id="@+id/attendance_department"
+ android:id="@+id/fragment_attendance_right_dept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
- android:text="@string/title_card_number"/>
+ android:text=""/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -122,7 +122,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="30dp">
-
<LinearLayout
android:id="@+id/attendance_bottom_title_ll"
android:layout_width="wrap_content"
@@ -163,7 +162,7 @@
android:text="@string/attendance_type"/>
</LinearLayout>
<View
- android:id="@+id/attendance_line"
+ android:id="@+id/fragment_attendance_right_separator"
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
@@ -171,12 +170,12 @@
android:layout_alignStart="@id/attendance_bottom_title_ll"
android:layout_alignEnd="@id/attendance_bottom_title_ll"/>
<com.camnter.easyrecyclerview.widget.EasyRecyclerView
- android:id="@+id/attendance_recycler"
+ android:id="@+id/fragment_attendance_right_list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_below="@id/attendance_line"
+ android:layout_below="@id/fragment_attendance_right_separator"
android:layout_alignStart="@id/attendance_bottom_title_ll"
android:layout_alignEnd="@id/attendance_bottom_title_ll"
- ></com.camnter.easyrecyclerview.widget.EasyRecyclerView>
+ />
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
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 774ef45..644381a 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/fragment_visit_left_search"
+ android:id="@+id/fragment_attendance_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_visit_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml
index ae145ab..16318ad 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
@@ -18,7 +18,7 @@
android:background="@color/colorSearch"
android:orientation="vertical">
<cn.com.basic.face.widget.SearchEditText
- android:id="@+id/fragment_visit_left_search"
+ android:id="@+id/fragment_attendance_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/fragment_visit_left_list_view"
+ android:id="@+id/fragment_attendance_left_list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
--
Gitblit v1.8.0