From c7591cecdaa9904b59da022b2a29339507338ca2 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 29 三月 2017 15:23:38 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_home_bottom_visitor_cell.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_row.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_interviewee_row.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_home_bottom_register_cell.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_time_row.xml | 0 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java | 2 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java | 2 +- VisitFace/DemoForBsk/app/src/main/res/layout/dialog_row.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 10 +++++----- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyWheelAdapter.java | 2 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorManagerListAdapter.java | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyWheelAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyWheelAdapter.java index 9eaf788..adb3d74 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyWheelAdapter.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyWheelAdapter.java @@ -27,7 +27,7 @@ ViewHolder viewHolder; if (convertView == null) { viewHolder = new ViewHolder(); - convertView = LayoutInflater.from(mContext).inflate(R.layout.item_wheel_list, null); + convertView = LayoutInflater.from(mContext).inflate(R.layout.dialog_row, null); viewHolder.textView = (TextView) convertView.findViewById(R.id.item_wheel_name); convertView.setTag(viewHolder); } else { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java index 570e669..680b079 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java @@ -36,7 +36,7 @@ @Override public int[] getItemLayouts() { - return new int[]{R.layout.item_visitor_registe,R.layout.item_visitor_user}; + return new int[]{R.layout.fragment_home_bottom_register_cell,R.layout.fragment_home_bottom_visitor_cell}; } @Override diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorManagerListAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorManagerListAdapter.java index dbdcd26..efcaeec 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorManagerListAdapter.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorManagerListAdapter.java @@ -15,7 +15,7 @@ private int oldPosition,newPosition; @Override public int[] getItemLayouts() { - return new int[]{R.layout.item_visitor_manager_time,R.layout.item_visitor_manager_info}; + return new int[]{R.layout.fragment_visit_left_time_row,R.layout.fragment_visit_left_row}; } @Override diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java index d4e8d06..0a80db6 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java @@ -41,7 +41,7 @@ @Override public int[] getItemLayouts() { - return new int[]{R.layout.fragment_check_in_left_visitor_row, R.layout.item_visitor_to}; + return new int[]{R.layout.fragment_check_in_left_visitor_row, R.layout.fragment_check_in_left_interviewee_row}; } @Override diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/item_wheel_list.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_row.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/item_wheel_list.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/dialog_row.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_to.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_interviewee_row.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_to.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_interviewee_row.xml 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 3af96f4..8591fe4 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 @@ -45,17 +45,17 @@ android:text="@string/device_set"/> <include android:id="@+id/device_wifi" - layout="@layout/item_device_left" + layout="@layout/fragment_device_left_row" android:layout_height="wrap_content" android:layout_width="match_parent"/> <include android:id="@+id/device_landline" - layout="@layout/item_device_left" + layout="@layout/fragment_device_left_row" android:layout_height="wrap_content" android:layout_width="match_parent"/> <include android:id="@+id/device_school" - layout="@layout/item_device_left" + layout="@layout/fragment_device_left_row" android:layout_height="wrap_content" android:layout_width="match_parent"/> @@ -69,12 +69,12 @@ android:text="@string/device_camera"/> <include android:id="@+id/device_camera1" - layout="@layout/item_device_left" + layout="@layout/fragment_device_left_row" android:layout_height="wrap_content" android:layout_width="match_parent"/> <include android:id="@+id/device_camera2" - layout="@layout/item_device_left" + layout="@layout/fragment_device_left_row" android:layout_height="wrap_content" android:layout_width="match_parent"/> </LinearLayout> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/item_device_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/item_device_left.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_registe.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_home_bottom_register_cell.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_registe.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_home_bottom_register_cell.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_user.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_home_bottom_visitor_cell.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_user.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_home_bottom_visitor_cell.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_manager_info.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_row.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_manager_info.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_row.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_manager_time.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_time_row.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_manager_time.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_time_row.xml -- Gitblit v1.8.0