From 75d9b502e7c8f498f1d7a39a18b2c621281bf35e Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 06 四月 2017 11:55:19 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java | 11 ++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml | 20 +++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java | 4 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 41 ++++++++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java | 61 +------------- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml | 20 ++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 55 +++++-------- 8 files changed, 105 insertions(+), 109 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java index 65f839a..0299a06 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java @@ -8,60 +8,6 @@ public class VisitFragment { -/* public static class VisitLeftAdapter extends EasyRecyclerViewAdapter { - private int oldPosition,newPosition; - @Override - public int[] getItemLayouts() { - return new int[]{R.layout.fragment_visit_left_date_row,R.layout.fragment_visit_left_person_row}; - } - - @Override - public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) { - int type = getRecycleViewItemType(position); - switch (type){ - case 0: - TimeViewHolder(viewHolder,position); - break; - case 1: - InfoViewHolder(viewHolder,position); - break; - } - } - - @Override - public int getRecycleViewItemType(int position) { - switch (position){ - case 0: - return 0; - case 3: - return 0; - case 8: - return 0; - default: - return 1; - } - } - - private void TimeViewHolder(EasyRecyclerViewHolder viewHolder,int position){ - - } - - private void InfoViewHolder(EasyRecyclerViewHolder viewHolder,int position){ - CheckBox fragment_visit_left_person_row_check_box = viewHolder.findViewById(R.id.fragment_visit_left_person_row_check_box); - if (position ==oldPosition){ - fragment_visit_left_person_row_check_box.setChecked(false); - } - if (position == newPosition){ - fragment_visit_left_person_row_check_box.setChecked(true); - } - } - - public void checkItemShow(int oldPosition,int newPosition){ - this.oldPosition = oldPosition; - this.newPosition = newPosition; - notifyDataSetChanged(); - } - }*/ public static class VisitLeftAdapter extends EasyRecyclerViewAdapter { @Override @@ -71,11 +17,18 @@ @Override public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) { + if(!(getItem(position) instanceof String)) { + } else { + + } } @Override public int getRecycleViewItemType(int position) { + if(!(getItem(position) instanceof String)) { + return 1; + } return 0; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java index 6a2a79f..21253de 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java @@ -3,6 +3,7 @@ import android.support.v7.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.View; +import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; @@ -11,6 +12,7 @@ import cn.com.basic.face.adapter.VisitFragment.VisitLeftAdapter; import cn.com.basic.face.base.LeftRightBaseFragment; import cn.com.basic.face.base.MainActivity; +import cn.com.basic.face.service.VisitMng; import cn.com.basic.face.widget.visit.VisitLeftListView; import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder; @@ -22,51 +24,38 @@ import java.util.ArrayList; import java.util.List; -public class VisitFragment extends LeftRightBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{ +public class VisitFragment extends LeftRightBaseFragment { private static VisitFragment instance = new VisitFragment(); public static VisitFragment getInstance(){ return instance; } - private VisitLeftAdapter mAdapter; - //@ViewInject(R.id.fragment_visit_left_list_view) + @ViewInject(R.id.fragment_visit_left_list_view) private VisitLeftListView fragment_visit_left_list_view; - private int mOldPosition = 0,mNewPosition = 0; + @ViewInject(R.id.fragment_visit_left_search) + private EditText fragment_visit_left_search; public int[] getLeftRightLayoutIds() { return new int[]{R.layout.fragment_visit_left, R.layout.fragment_visit_right}; } - @Override - protected void initListeners() { -// mAdapter = new VisitLeftAdapter(); -// mAdapter.setOnItemClickListener(this); - } - - @Override - protected void initData() { -// List list = new ArrayList(); -// for (int i = 0;i<20;i++){ -// list.add(""); -// } -// mAdapter.setList(list); -// fragment_visit_left_list_view.setAdapter(mAdapter); - } - - @Override - public void onItemClick(View convertView, int position) { -// if (position ==0 ||position ==3 ||position ==8){ -// -// }else { -// mNewPosition = position; -// //mAdapter.checkItemShow(mOldPosition,mNewPosition); -// mOldPosition = mNewPosition; -// mAdapter.getItem(position); -// Toast.makeText(getActivity(),position+"",Toast.LENGTH_SHORT).show(); -// } - } - @OnClick(R.id.fragment_visit_left_back) public void back(View view) { MainActivity.selectPage(0); } + public VisitLeftListView get_fragment_visit_left_list_view() { + return fragment_visit_left_list_view; + } + + @Override + public void setMenuVisibility(boolean menuVisible) { + super.setMenuVisibility(menuVisible); + if (menuVisible && fragment_visit_left_list_view != null) { + reloadList(); + } + } + + private void reloadList() { + VisitMng.getInstance().findLeftVisitorList(fragment_visit_left_search.getText().toString()); + } + } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java index 9bf9706..3a06dba 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java @@ -1,4 +1,45 @@ package cn.com.basic.face.service; +import org.xutils.http.RequestParams; +import org.xutils.x; + +import java.util.ArrayList; +import java.util.List; + +import cn.com.basic.face.discern.common.BaseCommonCallBack; +import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; +import cn.com.basic.face.service.vo.PhoneCallFragment; +import cn.com.basic.face.service.vo.VisitFragment; +import cn.com.basic.face.util.AppApi; +import cn.com.basic.face.util.CharacterParser; + public class VisitMng { + + private static VisitMng instance = new VisitMng(); + public static VisitMng getInstance() { + return instance; + } + + public void findLeftVisitorList(String searchText) { + RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery); + params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText); + x.http().post(params, new BaseCommonCallBack() { + public void success() { + List<VisitFragment.VisitQueryItem> list = getList(VisitFragment.VisitQueryItem.class); + String date = ""; + List itemList = new ArrayList(); + int i = 0; + for (VisitFragment.VisitQueryItem item : list) { + if (i % 3 == 0) { + itemList.add("2016-10-10"); + } + itemList.add(item); + i++; + } + cn.com.basic.face.fragment.VisitFragment.getInstance().get_fragment_visit_left_list_view().show(itemList); + } + }); + + } + } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java index f86294e..773310d 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java @@ -2,10 +2,6 @@ import cn.com.basic.face.discern.query.item.SurveillanceQueryItem; -/** - * Created by xiuxi on 2017/4/5. - */ - public class PhoneCallFragment { public static class PhoneCallQueryItem extends SurveillanceQueryItem { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java new file mode 100644 index 0000000..42fe3c5 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java @@ -0,0 +1,11 @@ +package cn.com.basic.face.service.vo; + +import cn.com.basic.face.discern.query.item.SurveillanceQueryItem; + +public class VisitFragment { + + public static class VisitQueryItem extends SurveillanceQueryItem { + + } + +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java index 267cb4a..33fb0f4 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java @@ -33,7 +33,7 @@ initView(); } - public void show(boolean isSortByDept, List list) { + public void show(List list) { adapter.setList(list); setAdapter(adapter); } diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml index e41e9cb..e2b6add 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -20,6 +21,7 @@ <cn.com.basic.face.widget.checkin.SearchEditText android:id="@+id/fragment_visit_left_search" android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_marginTop="5.5dp" android:layout_marginBottom="5.5dp" android:layout_marginLeft="4dp" @@ -27,13 +29,17 @@ android:gravity="center" android:hint="Search" android:textColorHint="@color/colorSearch" - android:background="@drawable/visitor_register_search_et" - android:layout_height="wrap_content" /> - <cn.com.basic.face.widget.visit.VisitLeftListView - android:id="@+id/fragment_visit_left_list_view" + android:background="@drawable/visitor_register_search_et"/> + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#ffffff" - /> + android:background="@android:color/white" + android:orientation="vertical"> + <cn.com.basic.face.widget.visit.VisitLeftListView + android:id="@+id/fragment_visit_left_list_view" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + </LinearLayout> </LinearLayout> -</LinearLayout> \ No newline at end of file + +</LinearLayout> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml index 5daa762..b3e71cb 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml @@ -2,13 +2,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> -<TextView -android:id="@+id/fragment_visit_left_date_row_date" -android:layout_width="match_parent" -android:layout_height="wrap_content" -android:textSize="@dimen/text_size_big" -android:textColor="@color/colorText_5" -android:background="@color/colorBackground" -android:padding="22dp" -android:text=""/> - </LinearLayout> \ No newline at end of file + <TextView + android:id="@+id/fragment_visit_left_date_row_date" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:textColor="@color/colorText_5" + android:background="@color/colorBackground" + android:padding="22dp" + android:text=""/> +</LinearLayout> \ No newline at end of file -- Gitblit v1.8.0