From 7e0929bc2b7805abd8b66393c1b2420a4cb349ac Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 31 三月 2017 13:16:50 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java | 5 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java | 11 +----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java | 38 +++++++------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java | 7 ++-
4 files changed, 26 insertions(+), 35 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java
index 0609c48..b0267cf 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java
@@ -11,20 +11,15 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.query.item.SupervisoryQueryItem;
-import cn.com.basic.face.fragment.CheckInFragment;
-import cn.com.basic.face.fragment.RegisterFragment;
import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.WindowsUtil;
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder;
-import java.util.List;
-
import cn.com.basic.face.discern.query.item.FacePhotoItem;
-import cn.com.basic.face.discern.query.item.CheckInQueryItem;
+
public class SupervisoryBottomListViewAdapter extends EasyRecyclerViewAdapter {
- private int TYPE_1 = 0,TYPE_2 = 1;
- private int type;
private Context context;
public SupervisoryBottomListViewAdapter(Context context) {
this.context = context;
@@ -37,35 +32,30 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
- int recycleViewItemType = getRecycleViewItemType(position);
- switch (recycleViewItemType){
- case 0:
- RegisterViewHolder(viewHolder,position);
+ switch (((SupervisoryQueryItem)getList().get(position)).getType()){
+ case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE:
+ RegisterCellViewFillData(viewHolder,position);
break;
- case 1:
- UserViewHolder(viewHolder,position);
+ case Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE:
+ checkInCellViewFillData(viewHolder,position);
break;
}
}
@Override
public int getRecycleViewItemType(int position) {
- SupervisoryQueryItem item = (SupervisoryQueryItem)getList().get(position);
- //type = position%2;
- switch (item.getType()){
- case 0:
- return TYPE_1;
- case 1:
- return TYPE_2;
- default:
- return TYPE_1;
+ int itemType = ((SupervisoryQueryItem)getList().get(position)).getType();
+ if (itemType == Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
+ return Constant.Supervisory.REGISTER_CELL_VIEW_INDEX;
+ } else {
+ return Constant.Supervisory.CHECK_IN_CELL_VIEW_INDEX;
}
}
/**
* 璁垮->浜哄憳娉ㄥ唽
*/
- private void RegisterViewHolder(EasyRecyclerViewHolder holder,int posistion){
+ private void RegisterCellViewFillData(EasyRecyclerViewHolder holder, int posistion){
RelativeLayout mLayout = holder.findViewById(R.id.fragment_home_bottom_register_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
@@ -94,7 +84,7 @@
/**
* 璁垮->鏉ヨ鐧昏
*/
- private void UserViewHolder(EasyRecyclerViewHolder holder,int posistion){
+ private void checkInCellViewFillData(EasyRecyclerViewHolder holder, int posistion){
RelativeLayout mLayout = holder.findViewById(R.id.fragment_supervisory_bottom_visitor_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
index f5f2af3..f125c7e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
@@ -112,6 +112,7 @@
}
}
}).start();
+ reloadBottomList();
}
@Override
@@ -141,19 +142,13 @@
@Override
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
- if (menuVisible) {
+ if (menuVisible && fragment_supervisory_bottom_visit_list_view != null) {
reloadBottomList();
}
}
private void reloadBottomList() {
- if (fragment_supervisory_bottom_visit_list_view != null) {
- //mList = new ArrayList();
- SupervisoryMng.getInstance().findSupervisoryBottomList(true);
- //mAdapter = new SupervisoryBottomListViewAdapter(getActivity());
- //mAdapter.setList(mList);
- //fragment_supervisory_bottom_visit_list_view.setAdapter(mAdapter);
- }
+ SupervisoryMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
}
private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java
index adb4dfb..6a62983 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java
@@ -11,7 +11,7 @@
import cn.com.basic.face.discern.query.item.SupervisoryQueryItem;
import cn.com.basic.face.fragment.SupervisoryFragment;
import cn.com.basic.face.util.AppApi;
-import cn.com.basic.face.widget.SupervisoryBottomListView;
+import cn.com.basic.face.util.Constant;
/**
* Created by xiuxi on 2017/3/31.
@@ -32,6 +32,9 @@
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<SupervisoryQueryItem> list = getList(SupervisoryQueryItem.class);
+ for (SupervisoryQueryItem item : list) {
+ item.setType(Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE);
+ }
if (isVisit) {
SupervisoryFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(list, true);
} else {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
index 2bf48cd..df63b01 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
@@ -14,8 +14,11 @@
}
public static class Supervisory {
- public static final int VISIT_REGISTER_CELL = 1;
- public static final int VISIT_CHECK_IN_CELL = 2;
+ public static final int VISIT_REGISTER_ITEM_TYPE = 1;
+ public static final int VISIT_CHECK_IN_ITEM_TYPE = 2;
+
+ public static final int REGISTER_CELL_VIEW_INDEX = 0;
+ public static final int CHECK_IN_CELL_VIEW_INDEX = 1;
}
}
--
Gitblit v1.8.0