From f988d0dee126225cd3374366bcda311fc88eb6f9 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 05 四月 2017 11:56:38 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml | 20 +++++----- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInIntervieweeCell.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldTextView.java | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowLeft.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRow.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowRight.java | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left.xml | 4 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/SearchEditText.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 6 +- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/InfoTextView.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 4 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 4 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml | 8 ++-- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml | 4 +- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftListView.java | 2 24 files changed, 42 insertions(+), 42 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java index b660dab..2dfc5b1 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java @@ -18,9 +18,9 @@ import cn.com.basic.face.service.DictionaryMng; import cn.com.basic.face.service.CheckInMng; import cn.com.basic.face.base.MainActivity; -import cn.com.basic.face.widget.CheckInIntervieweeCell; -import cn.com.basic.face.widget.CheckInLeftListView; -import cn.com.basic.face.widget.CheckInRightVisitorCell; +import cn.com.basic.face.widget.checkin.CheckInIntervieweeCell; +import cn.com.basic.face.widget.checkin.CheckInLeftListView; +import cn.com.basic.face.widget.checkin.CheckInRightVisitorCell; import com.lidroid.xutils.view.annotation.ViewInject; import com.lidroid.xutils.view.annotation.event.OnClick; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java index fda407c..4ab8853 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java @@ -12,7 +12,7 @@ import cn.com.basic.face.base.LeftRightBaseFragment; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.util.Constant; -import cn.com.basic.face.widget.CheckInIntervieweeCell; +import cn.com.basic.face.widget.checkin.CheckInIntervieweeCell; import com.camnter.easyrecyclerview.widget.EasyRecyclerView; import com.lidroid.xutils.ViewUtils; import com.lidroid.xutils.view.annotation.ViewInject; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java index a3e5839..a1ec937 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java @@ -22,8 +22,8 @@ import cn.com.basic.face.util.AppApi; import cn.com.basic.face.dialog.DateSelectDialog; import cn.com.basic.face.dialog.CountryDialog; -import cn.com.basic.face.widget.RegisterRightFieldLabelView; -import cn.com.basic.face.widget.RegisterRightFieldTextView; +import cn.com.basic.face.widget.register.RegisterRightFieldLabelView; +import cn.com.basic.face.widget.register.RegisterRightFieldTextView; import cn.com.basic.face.dialog.SelectDialog; import com.facebook.drawee.view.SimpleDraweeView; 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 efc404a..814feb2 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.SupervisoryBottomListView; +import cn.com.basic.face.widget.surveilance.SupervisoryBottomListView; import com.lidroid.xutils.view.annotation.ViewInject; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/InfoTextView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/InfoTextView.java similarity index 98% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/InfoTextView.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/InfoTextView.java index d8b31ce..469fe27 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/InfoTextView.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/InfoTextView.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.util; import android.content.Context; import android.content.res.TypedArray; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInIntervieweeCell.java similarity index 98% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInIntervieweeCell.java index 0a1d8f8..06cdd53 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInIntervieweeCell.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.checkin; import android.content.Context; import android.net.Uri; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftListView.java similarity index 96% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftListView.java index 0ccc3d0..c1bc41e 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftListView.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.checkin; import android.content.Context; import android.util.AttributeSet; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java similarity index 97% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java index 0f5563f..e9e703f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.checkin; import android.content.Context; import android.net.Uri; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/SearchEditText.java similarity index 92% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/SearchEditText.java index de0c346..9637300 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/SearchEditText.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.checkin; import android.content.Context; import android.util.AttributeSet; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/RegisterRightFieldLabelView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java similarity index 98% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/RegisterRightFieldLabelView.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java index e8034b8..1e95723 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/RegisterRightFieldLabelView.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.register; import android.content.Context; import android.content.res.TypedArray; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/RegisterRightFieldTextView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldTextView.java similarity index 97% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/RegisterRightFieldTextView.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldTextView.java index 46e62dc..2a62387 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/RegisterRightFieldTextView.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldTextView.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.register; import android.content.Context; import android.content.res.TypedArray; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java similarity index 98% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java index 78e7762..fd719c2 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SupervisoryBottomListView.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.surveilance; import android.content.Context; import android.graphics.Rect; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRow.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRow.java similarity index 98% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRow.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRow.java index ec4fe60..4d48d70 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRow.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRow.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.visit; import android.content.Context; import android.content.res.TypedArray; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowLeft.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowLeft.java similarity index 97% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowLeft.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowLeft.java index b32b6ad..27040c1 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowLeft.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowLeft.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.visit; import android.content.Context; import android.content.res.TypedArray; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowRight.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowRight.java similarity index 97% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowRight.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowRight.java index 14c6b7e..5d567f0 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowRight.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitRightFormRowRight.java @@ -1,4 +1,4 @@ -package cn.com.basic.face.widget; +package cn.com.basic.face.widget.visit; import android.content.Context; import android.content.res.TypedArray; 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 9e996c5..cb14cd8 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 @@ -17,7 +17,7 @@ android:layout_height="match_parent" android:background="@color/colorSearch" android:orientation="vertical"> - <cn.com.basic.face.widget.SearchEditText + <cn.com.basic.face.widget.checkin.SearchEditText android:id="@+id/fragment_attendance_left_search" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left.xml index 1381be8..53cc478 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left.xml @@ -45,7 +45,7 @@ android:layout_height="match_parent" android:background="@color/colorSearch" android:orientation="vertical"> - <cn.com.basic.face.widget.SearchEditText + <cn.com.basic.face.widget.checkin.SearchEditText android:id="@+id/fragment_check_in_left_search_edit_text" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" /> </RadioGroup> </LinearLayout> - <cn.com.basic.face.widget.CheckInLeftListView + <cn.com.basic.face.widget.checkin.CheckInLeftListView android:id="@+id/fragment_check_in_left_list_view" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml index 78317d4..905edd5 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml @@ -47,20 +47,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal"> - <cn.com.basic.face.widget.CheckInRightVisitorCell + <cn.com.basic.face.widget.checkin.CheckInRightVisitorCell android:id="@+id/fragment_check_in_right_visitor_cell" android:layout_width="254dp" android:layout_height="350dp" android:background="@drawable/card_bcg" - android:orientation="vertical"></cn.com.basic.face.widget.CheckInRightVisitorCell> + android:orientation="vertical"></cn.com.basic.face.widget.checkin.CheckInRightVisitorCell> - <cn.com.basic.face.widget.CheckInIntervieweeCell + <cn.com.basic.face.widget.checkin.CheckInIntervieweeCell android:id="@+id/fragment_check_in_right_interviewee_cell" android:layout_width="254dp" android:layout_height="350dp" android:background="@drawable/card_bcg" android:layout_marginLeft="103dp" - android:orientation="vertical"></cn.com.basic.face.widget.CheckInIntervieweeCell> + android:orientation="vertical"></cn.com.basic.face.widget.checkin.CheckInIntervieweeCell> </LinearLayout> <LinearLayout android:layout_width="611dp" 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 cd37aaa..2e71ac7 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"> - <cn.com.basic.face.widget.SearchEditText + <cn.com.basic.face.widget.checkin.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_phone_call_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml index 1c4fcfb..89f550e 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <cn.com.basic.face.widget.CheckInIntervieweeCell + <cn.com.basic.face.widget.checkin.CheckInIntervieweeCell android:id="@+id/fragment_phone_call_right_interviewee_cell" android:layout_width="254dp" android:layout_height="350dp" diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml index e1d68a9..33deefc 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml @@ -124,31 +124,31 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical"> - <cn.com.basic.face.widget.RegisterRightFieldTextView + <cn.com.basic.face.widget.register.RegisterRightFieldTextView android:id="@+id/register_name" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_name" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_gender" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_sex" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_country" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_nation" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_birthday" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_birthday" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_visitor_class" android:layout_height="wrap_content" android:layout_width="278dp" @@ -160,31 +160,31 @@ android:layout_height="wrap_content" android:layout_marginLeft="122dp" android:orientation="vertical"> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_phone" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_phone" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_id_class" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_idClass" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_id_num" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_idNumber" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_company" android:layout_height="wrap_content" android:layout_width="278dp" register:label="@string/title_companyName" /> - <cn.com.basic.face.widget.RegisterRightFieldLabelView + <cn.com.basic.face.widget.register.RegisterRightFieldLabelView android:id="@+id/register_remark" android:layout_height="wrap_content" android:layout_width="278dp" 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 bbd6374..7d45b81 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.SupervisoryBottomListView + <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView 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.SupervisoryBottomListView + <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView android:id="@+id/fragment_supervisory_bottom_attendance_list_view" android:layout_width="wrap_content" android:layout_height="match_parent" 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 16318ad..652ec62 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 @@ -17,7 +17,7 @@ android:layout_height="match_parent" android:background="@color/colorSearch" android:orientation="vertical"> - <cn.com.basic.face.widget.SearchEditText + <cn.com.basic.face.widget.checkin.SearchEditText android:id="@+id/fragment_attendance_left_search" android:layout_width="match_parent" android:layout_height="wrap_content" 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 d0efc58..1c0e761 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 @@ -51,14 +51,14 @@ android:textStyle="bold" android:text="@string/base_information"/> - <cn.com.basic.face.widget.VisitRightFormRow + <cn.com.basic.face.widget.visit.VisitRightFormRow android:layout_width="match_parent" android:layout_height="wrap_content"> <!--<include layout="@layout/fragment_visit_right_form_row_left" android:layout_height="wrap_content" android:layout_width="wrap_content"/> <include layout="@layout/fragment_visit_right_form_row_right"/>--> - </cn.com.basic.face.widget.VisitRightFormRow> + </cn.com.basic.face.widget.visit.VisitRightFormRow> <!-- <include layout="@layout/fragment_visit_right_form_row1"> <include layout="@layout/fragment_visit_right_form_row_left" -- Gitblit v1.8.0