From 91f5af216649a8610b878125668c50e4b79373a8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 29 三月 2017 14:29:27 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/IntervieweeQueryMng.java | 4
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/DeviceFragment.java | 6 +-
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/VisitorRecyclerViewAdapter.java | 6 +-
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/OneBottomRecylerViewAdapter.java | 6 +-
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java | 24 ++++----
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/CheckInFragment.java | 25 +-------
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java | 4
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/AttendanceFragment.java | 6 +-
/dev/null | 42 --------------
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitFragment.java | 8 +-
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/PhoneCallFragment.java | 6 +-
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java | 12 +--
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorQueryMng.java | 1
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/HomeFragment.java | 6 +-
14 files changed, 45 insertions(+), 111 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/OneBottomRecylerViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/OneBottomRecylerViewAdapter.java
index f04f500..44e2d32 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/OneBottomRecylerViewAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/OneBottomRecylerViewAdapter.java
@@ -10,7 +10,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.CheckInFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import com.bsk.zhangbo.demoforbsk.util.WindowsUtil;
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
@@ -156,7 +156,7 @@
@Override
public void onClick(View view) {
MainActivity.selectPage(2);
- VisitorRegisterFragment.getInstance().visitorCheckIn(item);
+ CheckInFragment.getInstance().visitorCheckIn(item);
}
});
} else {
@@ -178,7 +178,7 @@
@Override
public void onClick(View view) {
MainActivity.selectPage(2);
- VisitorRegisterFragment.getInstance().visitorCheckIn(item);
+ CheckInFragment.getInstance().visitorCheckIn(item);
}
});
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/VisitorRecyclerViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/VisitorRecyclerViewAdapter.java
index 390e6b4..2b7483a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/VisitorRecyclerViewAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/VisitorRecyclerViewAdapter.java
@@ -15,7 +15,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.CheckInFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import com.bsk.zhangbo.demoforbsk.util.Constant;
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
@@ -101,7 +101,7 @@
Object data = getList().get(posistion);
if (data instanceof VisitorQueryItem) {
VisitorQueryItem item = (VisitorQueryItem) data;
- VisitorRegisterFragment.getInstance().setVisitorInfo(item);
+ CheckInFragment.getInstance().setVisitorInfo(item);
}
}
});
@@ -151,7 +151,7 @@
Object data = getList().get(posistion);
if (data instanceof VisitorQueryItem) {
VisitorQueryItem item = (VisitorQueryItem) data;
- VisitorRegisterFragment.getInstance().setIntervieweeInfo(item);
+ CheckInFragment.getInstance().setIntervieweeInfo(item);
}
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
index d49af11..e680c8a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
@@ -1,7 +1,7 @@
package com.bsk.zhangbo.demoforbsk.service;
import com.bsk.zhangbo.demoforbsk.ui.fragment.RegisterFragment;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.CheckInFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import org.xutils.http.RequestParams;
@@ -107,7 +107,7 @@
idMap.put(CommonVariables.DictionaryType.VISIT_PURPOSE+item.getName(), item.getId()+"");
visitPurposeList.add(item.getName());
}
- VisitorRegisterFragment.getInstance().setVisitPurposeList(visitPurposeList);
+ CheckInFragment.getInstance().setVisitPurposeList(visitPurposeList);
}
});
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/IntervieweeQueryMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/IntervieweeQueryMng.java
index 1dcd115..43bd31c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/IntervieweeQueryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/IntervieweeQueryMng.java
@@ -1,6 +1,6 @@
package com.bsk.zhangbo.demoforbsk.service;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.CheckInFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import com.lidroid.xutils.HttpUtils;
@@ -29,7 +29,7 @@
params.addBodyParameter(IntervieweeQueryCondition.FieldNames.name, name);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- VisitorRegisterFragment.getInstance().listChanged(getList(IntervieweeQueryItem.class), isClear);
+ CheckInFragment.getInstance().listChanged(getList(IntervieweeQueryItem.class), isClear);
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java
index 3e56fca..62a52a3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java
@@ -3,17 +3,15 @@
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.base.BaseApplication;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.OneFragment;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.HomeFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.CheckInFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import org.xutils.http.RequestParams;
import org.xutils.x;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.condition.IntervieweeQueryCondition;
import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
-import cn.com.basic.face.discern.query.item.IntervieweeQueryItem;
import cn.com.basic.face.discern.query.item.VisitorQueryItem;
/**
@@ -38,7 +36,7 @@
params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- VisitorRegisterFragment.getInstance().listChanged(getList(VisitorQueryItem.class), isClear);
+ CheckInFragment.getInstance().listChanged(getList(VisitorQueryItem.class), isClear);
}
});
}
@@ -52,7 +50,7 @@
params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- OneFragment.getInstance().visitorListChanged(getList(VisitorQueryItem.class));
+ HomeFragment.getInstance().visitorListChanged(getList(VisitorQueryItem.class));
}
});
}
@@ -74,7 +72,7 @@
params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- VisitorRegisterFragment.getInstance().listChanged(getList(VisitorQueryItem.class), isClear);
+ CheckInFragment.getInstance().listChanged(getList(VisitorQueryItem.class), isClear);
}
});
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorQueryMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorQueryMng.java
index ce04173..7f24f45 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorQueryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorQueryMng.java
@@ -1,6 +1,5 @@
package com.bsk.zhangbo.demoforbsk.service;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import org.xutils.http.RequestParams;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java
index b45efde..e85ee07 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java
@@ -8,13 +8,13 @@
import com.bsk.zhangbo.demoforbsk.R;
import com.bsk.zhangbo.demoforbsk.adapter.MyFragmentPagerAdapter;
import com.bsk.zhangbo.demoforbsk.base.BaseActivity;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.AttendanceManagerFragment;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.DeviceManagerFragment;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.OneFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.AttendanceFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.DeviceFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.HomeFragment;
import com.bsk.zhangbo.demoforbsk.ui.fragment.RegisterFragment;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.TelPhoneFragment;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorManagerFragment;
-import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.PhoneCallFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.CheckInFragment;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitFragment;
import com.bsk.zhangbo.demoforbsk.util.TabNameUtil;
import java.util.Arrays;
@@ -49,13 +49,13 @@
List<String> tabNamesList = Arrays.asList(TabNameUtil.tabNames);
int[] tabIcons = TabNameUtil.tabIcons;
MyFragmentPagerAdapter myFragmentPagerAdapter = new MyFragmentPagerAdapter(getSupportFragmentManager(),MainActivity.this);
- myFragmentPagerAdapter.addFragment(OneFragment.getInstance(), tabNamesList.get(0),tabIcons[0]);
+ myFragmentPagerAdapter.addFragment(HomeFragment.getInstance(), tabNamesList.get(0),tabIcons[0]);
myFragmentPagerAdapter.addFragment(RegisterFragment.getInstance(), tabNamesList.get(1),tabIcons[1]);
- myFragmentPagerAdapter.addFragment(VisitorRegisterFragment.getInstance(), tabNamesList.get(2),tabIcons[2]);
- myFragmentPagerAdapter.addFragment(TelPhoneFragment.newInstance(), tabNamesList.get(3),tabIcons[3]);
- myFragmentPagerAdapter.addFragment(VisitorManagerFragment.newInstance(), tabNamesList.get(4),tabIcons[4]);
- myFragmentPagerAdapter.addFragment(AttendanceManagerFragment.newInstance(), tabNamesList.get(5),tabIcons[5]);
- myFragmentPagerAdapter.addFragment(DeviceManagerFragment.newInstance(), tabNamesList.get(6),tabIcons[6]);
+ myFragmentPagerAdapter.addFragment(CheckInFragment.getInstance(), tabNamesList.get(2),tabIcons[2]);
+ myFragmentPagerAdapter.addFragment(PhoneCallFragment.newInstance(), tabNamesList.get(3),tabIcons[3]);
+ myFragmentPagerAdapter.addFragment(VisitFragment.newInstance(), 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);
mViewPager.setOffscreenPageLimit(6);//viewpager缂撳瓨涓暟
mTabLayout.setupWithViewPager(mViewPager);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/AttendanceManagerFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/AttendanceFragment.java
similarity index 92%
rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/AttendanceManagerFragment.java
rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/AttendanceFragment.java
index 8f51764..0d1210c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/AttendanceManagerFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/AttendanceFragment.java
@@ -22,13 +22,13 @@
* Created by Sinoe on 2017/2/23.
*/
-public class AttendanceManagerFragment extends MainUIBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
+public class AttendanceFragment extends MainUIBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
private View mViewLeft,mViewRight;
private EasyRecyclerView mRightRecyclerView,mLeftRecyclerView;
private AttendanceRecyclerViewAdapter mRightAdapter;
private VisitorManagerListAdapter mLeftAdapter;
- public static AttendanceManagerFragment newInstance(){
- return new AttendanceManagerFragment();
+ public static AttendanceFragment newInstance(){
+ return new AttendanceFragment();
}
@Override
public View addLeftLayout() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/CheckInFragment.java
similarity index 91%
rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/CheckInFragment.java
index a8d5a9d..b4f3ccf 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/CheckInFragment.java
@@ -48,7 +48,7 @@
* Created by Administrator on 2017/2/20 0020.
*/
-public class VisitorRegisterFragment extends MainUIBaseFragment {
+public class CheckInFragment extends MainUIBaseFragment {
private View mViewLeft,mViewRight;
private RadioGroup mRGTop,mRGClass;
private LinearLayout mLlRadioGroupClass;
@@ -57,7 +57,7 @@
private EasyRecyclerView mRecyclerView;
private List mList = new ArrayList();;
- private static VisitorRegisterFragment instance = new VisitorRegisterFragment();
+ private static CheckInFragment instance = new CheckInFragment();
private TextView leftCompanyName;
private TextView leftIdentityNumber;
private ImageView leftPhoto;
@@ -83,7 +83,7 @@
private RadioButton visitorRegisterCheckDepartment;
private ImageView rightPhoto;
- public static VisitorRegisterFragment getInstance() {
+ public static CheckInFragment getInstance() {
return instance;
}
@@ -282,25 +282,6 @@
leftCompanyName.setText(item.getCompanyName());
leftIdentityNumber.setText(item.getIdentify());
leftPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
- /*
- left = (VisitorView) mViewRight.findViewById(R.id.visitor_view_left);
- left.setType(Constant.VISITOR_FROM);
- left.setTitle("");
- leftCompanyName = (TextView) left.findViewById(R.id.visitor_view_left_company_name);
- leftIdentityNumber = (TextView) left.findViewById(R.id.visitor_view_left_identity_number);
- leftPhone = (TextView) left.findViewById(R.id.visitor_view_left_phone);
- leftPhoto = (ImageView) left.findViewById(R.id.visitor_view_left_photo);
-
- right = (VisitorView) mViewRight.findViewById(R.id.visitor_view_right);
- right.setType(Constant.VISITOR_TO);
- right.setTitle("");
- rightDepartment = (TextView) right.findViewById(R.id.view_visitor_right_deptartment);
- rightPost = (TextView) right.findViewById(R.id.view_visitor_right_post);
- rightMobilePhone = (TextView) right.findViewById(R.id.visitor_right_phone);
- rightTel = (TextView) right.findViewById(R.id.visitor_right_tel);
- rightPhoto = (ImageView) right.findViewById(R.id.visitor_view_right_photo);
- */
-
}
public void listChanged(List list, boolean isClear) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/DeviceManagerFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/DeviceFragment.java
similarity index 95%
rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/DeviceManagerFragment.java
rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/DeviceFragment.java
index abeee6c..431edad 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/DeviceManagerFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/DeviceFragment.java
@@ -19,14 +19,14 @@
* Created by Sinoe on 2017/2/23.
*/
-public class DeviceManagerFragment extends MainUIBaseFragment implements View.OnClickListener{
+public class DeviceFragment extends MainUIBaseFragment implements View.OnClickListener{
private View mViewLeft,mViewRight;
private RelativeLayout mLayoutWifi,mLayoutLandline,mLayoutSchool,mLayoutCamera1,mLayoutCamera2;
private TextView mTvWifi,mTvLandline,mTvSchool,mTvCamera1,mTvCamera2;
private CheckBox mCheckWifi,mCheckLandline,mCheckSchool,mCheckCamera1,mCheckCamera2;
private List<CheckBox> listCheck = new ArrayList<>();
- public static DeviceManagerFragment newInstance() {
- return new DeviceManagerFragment();
+ public static DeviceFragment newInstance() {
+ return new DeviceFragment();
}
@Override
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/HomeFragment.java
similarity index 98%
rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java
rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/HomeFragment.java
index 8aaa75e..662031a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/HomeFragment.java
@@ -35,7 +35,7 @@
* Created by zhangbo on 2017/2/15.
*/
-public class OneFragment extends BaseFragment {
+public class HomeFragment extends BaseFragment {
private RadioGroup mRadioGroup;
private RadioButton mRadioButton1, mRadioButton2;
@@ -68,9 +68,9 @@
}
- private static OneFragment instance = new OneFragment();
+ private static HomeFragment instance = new HomeFragment();
- public static OneFragment getInstance() {
+ public static HomeFragment getInstance() {
return instance;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/TelPhoneFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/PhoneCallFragment.java
similarity index 96%
rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/TelPhoneFragment.java
rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/PhoneCallFragment.java
index 38489b1..a428d71 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/TelPhoneFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/PhoneCallFragment.java
@@ -23,7 +23,7 @@
* Created by Sinoe on 2017/2/23.
*/
-public class TelPhoneFragment extends MainUIBaseFragment {
+public class PhoneCallFragment extends MainUIBaseFragment {
private View mViewLeft,mViewRight;
@@ -36,8 +36,8 @@
- public static TelPhoneFragment newInstance() {
- return new TelPhoneFragment();
+ public static PhoneCallFragment newInstance() {
+ return new PhoneCallFragment();
}
@Override
public View addLeftLayout() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/TwoFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/TwoFragment.java
deleted file mode 100644
index d7d89e7..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/TwoFragment.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.bsk.zhangbo.demoforbsk.ui.fragment;
-
-import android.os.Bundle;
-import android.view.View;
-
-import com.bsk.zhangbo.demoforbsk.R;
-import com.bsk.zhangbo.demoforbsk.base.BaseFragment;
-
-/**
- * Created by zhangbo on 2017/2/15.
- */
-
-public class TwoFragment extends BaseFragment {
-
- public static TwoFragment newInstance() {
- return new TwoFragment();
- }
- @Override
- protected int getLayoutId() {
- return R.layout.fragment_two;
- }
-
- @Override
- protected void initViews(View view, Bundle savedInstanceState) {
-
- }
-
- @Override
- protected void initToolbar(Bundle savedInstanceState) {
-
- }
-
- @Override
- protected void initListeners() {
-
- }
-
- @Override
- protected void initData() {
-
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorManagerFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitFragment.java
similarity index 95%
rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorManagerFragment.java
rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitFragment.java
index 201df90..814dcb2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorManagerFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitFragment.java
@@ -1,10 +1,8 @@
package com.bsk.zhangbo.demoforbsk.ui.fragment;
import android.support.v7.widget.LinearLayoutManager;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
-import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -25,7 +23,7 @@
* Created by Sinoe on 2017/2/23.
*/
-public class VisitorManagerFragment extends MainUIBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
+public class VisitFragment extends MainUIBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
private View mViewLeft,mViewRight;
private LinearLayout mRowLayout1,mRowLayout2,mRowLayout3,mRowLayout4,mRowLayout5,mRowLayout6,mRowLayout7;
private TextView mRow1TextViewLeft,mRow1TextViewRight,mRow2TextViewLeft,mRow2TextViewRight,mRow3TextViewLeft,mRow3TextViewRight,mRow4TextViewLeft,mRow4TextViewRight,
@@ -33,8 +31,8 @@
private VisitorManagerListAdapter mAdapter;
private EasyRecyclerView mRecyclerView;
private int mOldPosition = 0,mNewPosition = 0;
- public static VisitorManagerFragment newInstance(){
- return new VisitorManagerFragment();
+ public static VisitFragment newInstance(){
+ return new VisitFragment();
}
--
Gitblit v1.8.0