From 6d107225053540903b47201c947826a72cb1c812 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 31 三月 2017 12:26:26 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 2 + VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java | 28 +++++++++++++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java | 42 +++++++++++++-------- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java | 6 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java | 23 +++++------ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java | 4 +- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml | 8 ++-- 7 files changed, 74 insertions(+), 39 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 c4fccee..0609c48 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 @@ -10,6 +10,7 @@ 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; @@ -25,7 +26,6 @@ private int TYPE_1 = 0,TYPE_2 = 1; private int type; private Context context; - private List list; public SupervisoryBottomListViewAdapter(Context context) { this.context = context; } @@ -50,9 +50,9 @@ @Override public int getRecycleViewItemType(int position) { - - type = position%2; - switch (type){ + SupervisoryQueryItem item = (SupervisoryQueryItem)getList().get(position); + //type = position%2; + switch (item.getType()){ case 0: return TYPE_1; case 1: @@ -78,14 +78,14 @@ ImageView fragment_home_bottom_register_cell_photo = holder.findViewById(R.id.fragment_home_bottom_register_cell_photo); TextView fragment_home_bottom_register_cell_to_register = holder.findViewById(R.id.fragment_home_bottom_register_cell_to_register); - if (data instanceof CheckInQueryItem) { - final CheckInQueryItem item = (CheckInQueryItem)data; + if (data instanceof SupervisoryQueryItem) { + final SupervisoryQueryItem item = (SupervisoryQueryItem)data; fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE +item.getImagePath())); fragment_home_bottom_register_cell_to_register.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view) { MainActivity.selectPage(1); - RegisterFragment.getInstance().setRegisterInfo(item); + //RegisterFragment.getInstance().setRegisterInfo(item); } }); } @@ -140,8 +140,8 @@ } fragment_home_bottom_visitor_cell_name.setText(""); - if (data instanceof CheckInQueryItem) { - final CheckInQueryItem item = (CheckInQueryItem)data; + if (data instanceof SupervisoryQueryItem) { + final SupervisoryQueryItem item = (SupervisoryQueryItem)data; fragment_home_bottom_visitor_cell_name.setText(item.getName()); fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE +item.getImagePath())); if (1==1) { @@ -152,15 +152,14 @@ @Override public void onClick(View view) { MainActivity.selectPage(2); - CheckInFragment.getInstance().checkInFromHomePage(item); - CheckInFragment.getInstance().getFragment_check_in_right_visitor_cell().setVisitorInfo(item); + //CheckInFragment.getInstance().checkInFromHomePage(item); + //CheckInFragment.getInstance().getFragment_check_in_right_visitor_cell().setVisitorInfo(item); } }); } } } - public void setRowType(int i) { 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 4c5d4df..f5f2af3 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 @@ -18,6 +18,8 @@ import cn.com.basic.face.service.SupervisoryMng; import cn.com.basic.face.util.WindowsUtil; +import cn.com.basic.face.widget.SupervisoryBottomListView; + import com.camnter.easyrecyclerview.widget.EasyRecyclerView; import com.lidroid.xutils.view.annotation.ViewInject; @@ -41,10 +43,10 @@ private View fragment_supervisory_bottom_visitor_background; @ViewInject(R.id.fragment_supervisory_bottom_attendance_background) private View fragment_supervisory_bottom_attendance_background; - @ViewInject(R.id.fragment_supervisory_bottom_register_list) - private EasyRecyclerView fragment_supervisory_bottom_register_list; - @ViewInject(R.id.fragment_supervisory_bottom_visitor_list) - private EasyRecyclerView fragment_supervisory_bottom_visitor_list; + @ViewInject(R.id.fragment_supervisory_bottom_visit_list_view) + private SupervisoryBottomListView fragment_supervisory_bottom_visit_list_view; + @ViewInject(R.id.fragment_supervisory_bottom_attendance_list_view) + private SupervisoryBottomListView fragment_supervisory_bottom_attendance_list_view; @ViewInject(R.id.fragment_supervisory_enter_camera) VideoView fragment_supervisory_enter_camera; @ViewInject(R.id.fragment_supervisory_exit_camera) @@ -67,6 +69,14 @@ return instance; } + public SupervisoryBottomListView get_fragment_supervisory_bottom_visit_list_view() { + return fragment_supervisory_bottom_visit_list_view; + } + + public SupervisoryBottomListView get_fragment_supervisory_bottom_attendance_list_view() { + return fragment_supervisory_bottom_visit_list_view; + } + @Override protected int getLayoutId() { return R.layout.fragment_supervisory; @@ -74,10 +84,10 @@ @Override protected void initViews(View view, Bundle savedInstanceState) { - fragment_supervisory_bottom_register_list.addItemDecoration(new SpaceItemDecoration()); + fragment_supervisory_bottom_visit_list_view.addItemDecoration(new SpaceItemDecoration()); GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2); gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - fragment_supervisory_bottom_register_list.setLayoutManager(gridLayoutManager); + fragment_supervisory_bottom_visit_list_view.setLayoutManager(gridLayoutManager); mAdapter = new SupervisoryBottomListViewAdapter(getActivity()); new Thread(new Runnable() { @Override @@ -113,14 +123,14 @@ case R.id.fragment_supervisory_bottom_visitor_radio_button: fragment_supervisory_bottom_visitor_background.setVisibility(View.VISIBLE); fragment_supervisory_bottom_attendance_background.setVisibility(View.INVISIBLE); - fragment_supervisory_bottom_register_list.setVisibility(View.VISIBLE); - fragment_supervisory_bottom_visitor_list.setVisibility(View.GONE); + fragment_supervisory_bottom_visit_list_view.setVisibility(View.VISIBLE); + fragment_supervisory_bottom_attendance_list_view.setVisibility(View.GONE); break; case R.id.fragment_supervisory_bottom_attendance_radio_button: fragment_supervisory_bottom_visitor_background.setVisibility(View.INVISIBLE); fragment_supervisory_bottom_attendance_background.setVisibility(View.VISIBLE); - fragment_supervisory_bottom_register_list.setVisibility(View.GONE); - fragment_supervisory_bottom_visitor_list.setVisibility(View.VISIBLE); + fragment_supervisory_bottom_visit_list_view.setVisibility(View.GONE); + fragment_supervisory_bottom_attendance_list_view.setVisibility(View.VISIBLE); break; } reloadBottomList(); @@ -137,12 +147,12 @@ } private void reloadBottomList() { - if (fragment_supervisory_bottom_register_list != null) { - mList = new ArrayList(); - SupervisoryMng.getInstance().findSupervisoryBottomList(); - mAdapter = new SupervisoryBottomListViewAdapter(getActivity()); - mAdapter.setList(mList); - fragment_supervisory_bottom_register_list.setAdapter(mAdapter); + 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); } } 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 d6d7a54..adb4dfb 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 @@ -1,5 +1,18 @@ package cn.com.basic.face.service; +import org.xutils.http.RequestParams; +import org.xutils.x; + +import java.util.List; + +import cn.com.basic.face.base.BaseApplication; +import cn.com.basic.face.discern.common.BaseCommonCallBack; +import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; +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; + /** * Created by xiuxi on 2017/3/31. */ @@ -12,9 +25,20 @@ return instance; } - public void findSupervisoryBottomList() { + public void findSupervisoryBottomList(final boolean isVisit) { - + RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.SupervisoryQuery); + params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); + x.http().post(params, new BaseCommonCallBack() { + public void success() { + List<SupervisoryQueryItem> list = getList(SupervisoryQueryItem.class); + if (isVisit) { + SupervisoryFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(list, true); + } else { + SupervisoryFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(list, true); + } + } + }); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java index af07342..dcf3e59 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java @@ -17,6 +17,8 @@ public final static String CheckInQuery = "queryCheckIn/v_list.do"; // + public final static String SupervisoryQuery = "queryCheckIn/v_list.do"; // + public static final String CHECK_IN_ADD = "Visit/o_add.do"; //娣诲姞璁块棶璁板綍 } 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/CheckInLeftListView.java index 3ee48aa..82781c0 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/CheckInLeftListView.java @@ -39,10 +39,10 @@ public void show(List list, boolean isVisitorList) { mAdapter.setRowType(isVisitorList? Constant.CheckIn.VISITOR_ROW:Constant.CheckIn.INTERVIEWEE_ROW); - refresh(); + refresh(list); } - public void refresh() { + public void refresh(List list) { this.list.clear(); this.list.addAll(list); mAdapter.setList(this.list); 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/SupervisoryBottomListView.java index c9b1494..00c0379 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/SupervisoryBottomListView.java @@ -43,11 +43,11 @@ } public void show(List list, boolean isVisitorList) { - mAdapter.setRowType(isVisitorList? Constant.CheckIn.VISITOR_ROW:Constant.CheckIn.INTERVIEWEE_ROW); - refresh(); + //mAdapter.setRowType(isVisitorList? Constant.CheckIn.VISITOR_ROW:Constant.CheckIn.INTERVIEWEE_ROW); + refresh(list); } - public void refresh() { + public void refresh(List list) { this.list.clear(); this.list.addAll(list); mAdapter.setList(this.list); diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml index cb3a482..bbd6374 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml @@ -171,14 +171,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/white"> - <com.camnter.easyrecyclerview.widget.EasyRecyclerView - android:id="@+id/fragment_supervisory_bottom_register_list" + <cn.com.basic.face.widget.SupervisoryBottomListView + android:id="@+id/fragment_supervisory_bottom_visit_list_view" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical"/> - <com.camnter.easyrecyclerview.widget.EasyRecyclerView - android:id="@+id/fragment_supervisory_bottom_visitor_list" + <cn.com.basic.face.widget.SupervisoryBottomListView + android:id="@+id/fragment_supervisory_bottom_attendance_list_view" android:layout_width="wrap_content" android:layout_height="match_parent" android:visibility="gone" -- Gitblit v1.8.0