From 1b77759de738192b30a315826da8e7c54b14749c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 13:33:33 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java | 23 +++--------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java | 25 +++---------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 16 ++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java | 20 +--------
4 files changed, 32 insertions(+), 52 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index aabc67f..3be790b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -63,6 +63,22 @@
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
+
+ List prevList = null;
+ if (append) {
+ if (isVisitorList) {
+ prevList = CheckInFragment.getInstance().get_fragment_check_in_left_visitor().getPrevList();
+ } else {
+ prevList = CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().getPrevList();
+ }
+ for (int i = 0; i < prevList.size(); i++) {
+ Object item = prevList.get(i);
+ if (item instanceof CheckInQueryItem) {
+ list.add(0, (CheckInQueryItem) item);
+ }
+ }
+ }
+
sort(list, isSortByDept);
List allItems = new ArrayList();
String name = "";
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
index 20b50cc..e4fbc07 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
@@ -42,26 +42,15 @@
}
public void refresh(List list, boolean isSortByDept, boolean append) {
- if (append) {
- List newList = new ArrayList();
- if (adapter.getList().size() > 0 && adapter.getList().get(adapter.getList().size()-1) instanceof Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.hasMorePages) {
- adapter.getList().remove(adapter.getList().size() - 1);
- }
- if (adapter.getList().size() > 0 && adapter.getList().get(adapter.getList().size()-1) instanceof
- Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.noMorePage) {
- adapter.getList().remove(adapter.getList().size() - 1);
- }
- newList.addAll(adapter.getList());
- newList.addAll(list);
- if (adapter.getList().size() > 0) {
- this.scrollToPosition(adapter.getList().size()-1);
- }
- adapter.setList(newList);
- } else {
- adapter.setList(list);
+ if (append && adapter.getList().size() > 0) {
+ this.scrollToPosition(adapter.getList().size()-1);
}
+ adapter.setList(list);
adapter.setSortByDept(isSortByDept);
this.setAdapter(adapter);
}
+ public List getPrevList() {
+ return adapter.getList();
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
index 7aac8fd..7d3fe80 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
@@ -41,27 +41,16 @@
refresh(list, append);
}
- public void refresh(List theNewList, boolean append) {
- if (append) {
- List oldList = adapter.getList();
- List newList = new ArrayList();
- if (oldList.size() > 0 && oldList.get(oldList.size()-1) instanceof Integer &&
- ((int)oldList.get(oldList.size()-1))== CommonVariables.Page.hasMorePages) {
- oldList.remove(oldList.size() - 1);
- }
- if (oldList.size() > 0 && oldList.get(oldList.size()-1) instanceof
- Integer && ((int)oldList.get(oldList.size()-1))== CommonVariables.Page.noMorePage) {
- oldList.remove(oldList.size() - 1);
- }
- if (oldList.size() > 0) {
- this.scrollToPosition(oldList.size()-1);
- }
- oldList.addAll(theNewList);
- } else {
- adapter.setList(theNewList);
+ public void refresh(List list, boolean append) {
+ if (append && adapter.getList().size() > 0) {
+ this.scrollToPosition(adapter.getList().size()-1);
}
+ adapter.setList(list);
this.setAdapter(adapter);
adapter.notifyDataSetChanged();
}
+ public List getPrevList() {
+ return adapter.getList();
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
index e3f6ee7..0b432ae 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
@@ -36,24 +36,10 @@
}
public void show(boolean isSortByDept, List list, boolean append) {
- if (append) {
-// List newList = new ArrayList();
-// if (adapter.getList().size() > 0 && adapter.getList().get(adapter.getList().size()-1) instanceof Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.hasMorePages) {
-// adapter.getList().remove(adapter.getList().size() - 1);
-// }
-// if (adapter.getList().size() > 0 && adapter.getList().get(adapter.getList().size()-1) instanceof
-// Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.noMorePage) {
-// adapter.getList().remove(adapter.getList().size() - 1);
-// }
-// newList.addAll(adapter.getList());
-// newList.addAll(list);
- if (adapter.getList().size() > 0) {
- this.scrollToPosition(adapter.getList().size()-1);
- }
- adapter.setList(list);
- } else {
- adapter.setList(list);
+ if (append && adapter.getList().size() > 0) {
+ this.scrollToPosition(adapter.getList().size()-1);
}
+ adapter.setList(list);
setAdapter(adapter);
adapter.setSortByDept(isSortByDept);
}
--
Gitblit v1.8.0