From f938403d9e5caa290a22600a54c99a75d1043294 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 06 四月 2017 10:12:28 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml | 436 ++++++++++++++++++++++++++++++++++++++++++++--- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 88 --------- 3 files changed, 410 insertions(+), 116 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java index ce7447e..8ae89b8 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java @@ -59,7 +59,7 @@ myFragmentPagerAdapter.addFragment(RegisterFragment.getInstance(), tabNamesList.get(1),tabIcons[1]); myFragmentPagerAdapter.addFragment(CheckInFragment.getInstance(), tabNamesList.get(2),tabIcons[2]); myFragmentPagerAdapter.addFragment(PhoneCallFragment.getInstance(), tabNamesList.get(3),tabIcons[3]); - myFragmentPagerAdapter.addFragment(VisitFragment.newInstance(), tabNamesList.get(4),tabIcons[4]); + myFragmentPagerAdapter.addFragment(VisitFragment.getInstance(), tabNamesList.get(4),tabIcons[4]); myFragmentPagerAdapter.addFragment(AttendanceFragment.newInstance(), tabNamesList.get(5),tabIcons[5]); myFragmentPagerAdapter.addFragment(DeviceFragment.newInstance(), tabNamesList.get(6),tabIcons[6]); mViewPager.setAdapter(myFragmentPagerAdapter); 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 709a73b..d58a11d 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 @@ -22,97 +22,21 @@ import java.util.List; public class VisitFragment extends LeftRightBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{ - private View fragment_visit_left; - private View mViewRight; - private LinearLayout mRowLayout1; - private LinearLayout mRowLayout2; - private LinearLayout mRowLayout3; - private LinearLayout mRowLayout4; - private LinearLayout mRowLayout5; - private LinearLayout mRowLayout6; - private LinearLayout mRowLayout7; - private TextView mRow1TextViewLeft; - private TextView mRow1TextViewRight; - private TextView mRow2TextViewLeft; - private TextView mRow2TextViewRight; - private TextView mRow3TextViewLeft; - private TextView mRow3TextViewRight; - private TextView mRow4TextViewLeft; - private TextView mRow4TextViewRight; - private TextView mRow5TextViewLeft; - private TextView mRow5TextViewRight; - private TextView mRow6TextViewLeft; - private TextView mRow6TextViewRight; - private TextView mRow7TextViewLeft; - private TextView mRow7TextViewRight; + private static VisitFragment instance = new VisitFragment(); + public static VisitFragment getInstance(){ return instance; } + private VisitLeftAdapter mAdapter; @ViewInject(R.id.fragment_attendance_left_list_view) private EasyRecyclerView fragment_attendance_left_list_view; private int mOldPosition = 0,mNewPosition = 0; - public static VisitFragment newInstance(){ - return new VisitFragment(); - } - public View addLeftLayout() { - fragment_visit_left = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_visit_left,null); - ViewUtils.inject(this, fragment_visit_left); - - LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false); - fragment_attendance_left_list_view.setLayoutManager(manager); - mAdapter = new VisitLeftAdapter(); - - return fragment_visit_left; - } - - public View addRightLayout() { - mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_visit_right,null); - mRowLayout1 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row1); - mRowLayout2 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row2); - mRowLayout3 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row3); - mRowLayout4 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row4); - mRowLayout5 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row5); - mRowLayout6 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row6); - mRowLayout7 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row7); - - mRow1TextViewLeft = (TextView) mRowLayout1.findViewById(R.id.visitor_manager_row_title_left); - mRow1TextViewRight = (TextView) mRowLayout1.findViewById(R.id.visitor_manager_row_title_right); - mRow1TextViewLeft.setText(R.string.title_name); - mRow1TextViewRight.setText(R.string.title_phone); - - mRow2TextViewLeft = (TextView) mRowLayout2.findViewById(R.id.visitor_manager_row_title_left); - mRow2TextViewRight = (TextView) mRowLayout2.findViewById(R.id.visitor_manager_row_title_right); - mRow2TextViewLeft.setText(R.string.title_sex); - mRow2TextViewRight.setText(R.string.title_idClass); - - mRow3TextViewLeft = (TextView) mRowLayout3.findViewById(R.id.visitor_manager_row_title_left); - mRow3TextViewRight = (TextView) mRowLayout3.findViewById(R.id.visitor_manager_row_title_right); - mRow3TextViewLeft.setText(R.string.title_nation); - mRow3TextViewRight.setText(R.string.title_idNumber); - - mRow4TextViewLeft = (TextView) mRowLayout4.findViewById(R.id.visitor_manager_row_title_left); - mRow4TextViewRight = (TextView) mRowLayout4.findViewById(R.id.visitor_manager_row_title_right); - mRow4TextViewLeft.setText(R.string.title_birthday); - mRow4TextViewRight.setText(R.string.title_companyName); - - mRow5TextViewLeft = (TextView) mRowLayout5.findViewById(R.id.visitor_manager_row_title_left); - mRow5TextViewRight = (TextView) mRowLayout5.findViewById(R.id.visitor_manager_row_title_right); - mRow5TextViewLeft.setText(R.string.title_visitor); - mRow5TextViewRight.setText(R.string.title_visitor_thing); - - mRow6TextViewLeft = (TextView) mRowLayout6.findViewById(R.id.visitor_manager_row_title_left); - mRow6TextViewRight = (TextView) mRowLayout6.findViewById(R.id.visitor_manager_row_title_right); - mRow6TextViewLeft.setText(R.string.title_visitor_department); - mRow6TextViewRight.setText(R.string.title_visitor_state); - - mRow7TextViewLeft = (TextView) mRowLayout7.findViewById(R.id.visitor_manager_row_title_left); - mRow7TextViewRight = (TextView) mRowLayout7.findViewById(R.id.visitor_manager_row_title_right); - mRow7TextViewLeft.setText(R.string.title_visitor_start_time); - mRow7TextViewRight.setText(R.string.title_visitor_end_time); - return mViewRight; + public int[] getLeftRightLayoutIds() { + return new int[]{R.layout.fragment_visit_left, R.layout.fragment_visit_right}; } @Override protected void initListeners() { + mAdapter = new VisitLeftAdapter(); mAdapter.setOnItemClickListener(this); } diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml index 1c0e761..a1b326f 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml @@ -4,21 +4,21 @@ android:layout_height="match_parent" xmlns:fresco="http://schemas.android.com/apk/res-auto"> <LinearLayout - android:id="@+id/visitor_manager_top_ll" + android:id="@+id/fragment_visit_right_linear_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_marginTop="20dp" android:orientation="horizontal"> <com.facebook.drawee.view.SimpleDraweeView - android:id="@+id/visitor_manager_avatar" + android:id="@+id/fragment_visit_right_head_photo" android:layout_width="197dp" android:layout_height="197dp" android:background="@android:color/black" fresco:placeholderImageScaleType="fitXY" /> <com.facebook.drawee.view.SimpleDraweeView - android:id="@+id/visitor_manager_card" + android:id="@+id/fragment_visit_right_card_photo" android:layout_width="330dp" android:layout_height="210dp" fresco:placeholderImageScaleType="fitXY" @@ -33,11 +33,10 @@ <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignStart="@id/visitor_manager_top_ll" - android:layout_alignEnd="@id/visitor_manager_top_ll" - android:layout_below="@id/visitor_manager_top_ll" + android:layout_alignStart="@id/fragment_visit_right_linear_layout" + android:layout_alignEnd="@id/fragment_visit_right_linear_layout" + android:layout_below="@id/fragment_visit_right_linear_layout" android:layout_marginTop="15dp"> - <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" @@ -50,30 +49,236 @@ android:textSize="@dimen/text_size_big" android:textStyle="bold" android:text="@string/base_information"/> - - <cn.com.basic.face.widget.visit.VisitRightFormRow + <LinearLayout + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"> - <!--<include layout="@layout/fragment_visit_right_form_row_left" + <LinearLayout + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="wrap_content"/> - <include layout="@layout/fragment_visit_right_form_row_right"/>--> - </cn.com.basic.face.widget.visit.VisitRightFormRow> -<!-- - <include layout="@layout/fragment_visit_right_form_row1"> - <include layout="@layout/fragment_visit_right_form_row_left" + android:orientation="horizontal"> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="濮撳悕" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鐢佃瘽" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_phone" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + </LinearLayout> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="wrap_content"/> - <include layout="@layout/fragment_visit_right_form_row_right"/> - </include>--> - <include layout="@layout/fragment_visit_right_form_row" - android:id="@+id/visitor_manager_row1"/> - <include layout="@layout/fragment_visit_right_form_row" - android:id="@+id/visitor_manager_row2"/> - <include layout="@layout/fragment_visit_right_form_row" - android:id="@+id/visitor_manager_row3"/> - <include layout="@layout/fragment_visit_right_form_row" - android:id="@+id/visitor_manager_row4"/> + android:orientation="horizontal"> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鎬у埆" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_gender" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="璇佷欢绫诲瀷" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + </LinearLayout> + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鍥界睄" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_country" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="璇佷欢缂栧彿" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_id_num" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + </LinearLayout> + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鍑虹敓鏃ユ湡" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_birthday" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鍏徃鍚嶇О" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_company" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + </LinearLayout> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -82,12 +287,177 @@ android:textStyle="bold" android:layout_marginTop="28dp" android:text="@string/visitor_information"/> - <include layout="@layout/fragment_visit_right_form_row" - android:id="@+id/visitor_manager_row5"/> - <include layout="@layout/fragment_visit_right_form_row" - android:id="@+id/visitor_manager_row6"/> - <include layout="@layout/fragment_visit_right_form_row" - android:id="@+id/visitor_manager_row7"/> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鎷滆浜�" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_person" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鎷滆浜嬫儏" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_visit_reason" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + </LinearLayout> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鏉ヨ閮ㄩ棬" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_from_dept" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="璁块棶鐘舵��" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + </LinearLayout> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="鏉ヨ鏃堕棿" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_visit_time" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + <LinearLayout + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="绂诲紑鏃堕棿" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/fragment_visit_right_exit_time" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="" + android:textColor="@color/colorText_b" + android:background="@null"/> + </LinearLayout> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + </LinearLayout> </LinearLayout> </ScrollView> </RelativeLayout> \ No newline at end of file -- Gitblit v1.8.0