From e19bc8adbaa0a0872b2831093cd9510927865829 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 29 三月 2017 15:00:06 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java | 4 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml | 0
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionPopup.java | 2 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml | 0
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyFragmentPagerAdapter.java | 2 +-
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_single_selection.xml | 0
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml | 0
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml | 0
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionPopup.java | 2 +-
9 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyFragmentPagerAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyFragmentPagerAdapter.java
index ccba3f6..e66e4fc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyFragmentPagerAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/MyFragmentPagerAdapter.java
@@ -58,7 +58,7 @@
// return ss;
}
public View getTabView(int position){
- View view = LayoutInflater.from(context).inflate(R.layout.tab_main,null);
+ View view = LayoutInflater.from(context).inflate(R.layout.activity_main_tab,null);
TextView mTvTitle = (TextView) view.findViewById(R.id.tab_item_title);
mTvTitle.setText(mFragmentTitles.get(position));
ImageView mImgIcon = (ImageView) view.findViewById(R.id.tab_item_icon);
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 d1cc924..40576c7 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
@@ -33,7 +33,7 @@
}
@Override
public View addLeftLayout() {
- mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.attendance_manager_left, null);
+ mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_attendance_left, null);
mLeftRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_manager_recycler);
LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
mLeftRecyclerView.setLayoutManager(manager);
@@ -44,7 +44,7 @@
@Override
public View addRightLayout() {
- mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.attendance_manager_right, null);
+ mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_attendance_right, null);
mRightRecyclerView = (EasyRecyclerView) mViewRight.findViewById(R.id.attendance_recycler);
mRightAdapter = new AttendanceRecyclerViewAdapter();
ViewUtils.inject(this, mViewRight);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionPopup.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionPopup.java
index 9b48d92..3509285 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionPopup.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionPopup.java
@@ -41,7 +41,7 @@
this.mContext = context;
countryPresenter = new CountryPresenter(context);
- view = LayoutInflater.from(context).inflate(R.layout.pop_country, null);
+ view = LayoutInflater.from(context).inflate(R.layout.dialog_country, null);
mWheelViewTitle = (WheelView) view.findViewById(R.id.pop_country_title);
mWheelViewTitle.setOnWheelItemSelectedListener(this);
mWheelViewName = (WheelView) view.findViewById(R.id.pop_country_name);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionPopup.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionPopup.java
index 6b5aee9..983c1a8 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionPopup.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionPopup.java
@@ -32,7 +32,7 @@
private Context mContext;
public SingleSelectionPopup(Context context, List mList,String mTitle) {
this.mContext = context;
- view = LayoutInflater.from(context).inflate(R.layout.pop_single_selection,null);
+ view = LayoutInflater.from(context).inflate(R.layout.dialog_single_selection,null);
this.mList = mList;
mTvTitle = (TextView) view.findViewById(R.id.pop_single_title);
if (mTitle !=null && mTitle.length() > 0){
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/tab_main.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/tab_main.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/pop_country.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/pop_country.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/pop_single_selection.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_single_selection.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/pop_single_selection.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/dialog_single_selection.xml
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/attendance_manager_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/attendance_manager_left.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_left.xml
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/attendance_manager_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/attendance_manager_right.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_attendance_right.xml
--
Gitblit v1.8.0