From 4c80106fc15aed5f393200f00371c70a2ed22838 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 10:51:26 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 24 ++------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 9 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java | 25 ++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 16 ----
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_visitor_row.xml | 1
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java | 1
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 16 ----
VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml | 3
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 26 ++------
9 files changed, 50 insertions(+), 71 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
index be0646f..5d7ca7d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
@@ -80,6 +80,7 @@
fragment_check_in_left_visitor_row_photo.setImageResource(R.drawable.u68);
}
}
+
}
@Override
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
index 2b56f0b..8784fdd 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -19,7 +19,7 @@
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.DateUtil;
-public class AttendanceMng {
+public class AttendanceMng extends BaseMng{
private static AttendanceMng instance = new AttendanceMng();
public static AttendanceMng getInstance() {
@@ -58,19 +58,7 @@
itemList.add(item);
i++;
}
- if (hasMorePages()) {
- itemList.add(CommonVariables.Page.hasMorePages);
- } else {
- if (getPageNum() > 1) {
- //itemList.add(CommonVariables.Page.reachBottom);
- } else {
- if (itemList.size() > 0) {
- //itemList.add(CommonVariables.Page.reachBottom);
- } else {
- //itemList.add(CommonVariables.Page.noMorePage);
- }
- }
- }
+ addPageFooter(hasMorePages(), getPageNum(), itemList);
AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java
new file mode 100644
index 0000000..4e474fd
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java
@@ -0,0 +1,25 @@
+package cn.com.basic.face.service;
+
+import java.util.List;
+
+import cn.com.basic.face.discern.common.CommonVariables;
+
+public class BaseMng {
+
+ public void addPageFooter(boolean hasMorePages, int pageNum, List list) {
+ if (hasMorePages) {
+ list.add(CommonVariables.Page.hasMorePages);
+ } else {
+ if (pageNum > 1) {
+ list.add(CommonVariables.Page.reachBottom);
+ } else {
+ if (list.size() > 0) {
+ list.add(CommonVariables.Page.reachBottom);
+ } else {
+ //itemList.add(CommonVariables.Page.noMorePage);
+ }
+ }
+ }
+ }
+
+}
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 ca088c9..a91c66e 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
@@ -22,7 +22,7 @@
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.util.CharacterParser;
-public class CheckInMng {
+public class CheckInMng extends BaseMng {
public static CheckInMng instance = new CheckInMng();
@@ -81,7 +81,7 @@
}
sort(list, isSortByDept);
- List allItems = new ArrayList();
+ List itemList = new ArrayList();
String name = "";
String prev = "";
for (int i = 0; i < list.size(); i++) {
@@ -95,28 +95,16 @@
name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
}
if (!name.equals(prev)) {
- allItems.add(name);
+ itemList.add(name);
}
- allItems.add(item);
+ itemList.add(item);
prev = name;
}
- if (hasMorePages()) {
- allItems.add(CommonVariables.Page.hasMorePages);
- } else {
- if (getPageNum() > 1) {
- //allItems.add(CommonVariables.Page.reachBottom);
- } else {
- if (allItems.size() > 0) {
- //allItems.add(CommonVariables.Page.reachBottom);
- } else {
- //allItems.add(CommonVariables.Page.noMorePage);
- }
- }
- }
+ addPageFooter(hasMorePages(), getPageNum(), itemList);
if (isVisitorList) {
- CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
} else {
- CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept, append);
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
}
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
index 9c7f326..e1f7d60 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -25,7 +25,7 @@
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.CharacterParser;
-public class PhoneCallMng {
+public class PhoneCallMng extends BaseMng {
private static PhoneCallMng instance = new PhoneCallMng();
public static PhoneCallMng getInstance() {
@@ -57,7 +57,7 @@
}
}
sort(list, isSortByDept);
- List allItems = new ArrayList();
+ List itemList = new ArrayList();
String name = "";
String prev = "";
for (int i = 0; i < list.size(); i++) {
@@ -76,25 +76,13 @@
}
if (!name.equals(prev)) {
- allItems.add(name);
+ itemList.add(name);
}
- allItems.add(item);
+ itemList.add(item);
prev = name;
}
- if (hasMorePages()) {
- allItems.add(CommonVariables.Page.hasMorePages);
- } else {
- if (getPageNum() > 1) {
- //allItems.add(CommonVariables.Page.reachBottom);
- } else {
- if (allItems.size() > 0) {
- //allItems.add(CommonVariables.Page.reachBottom);
- } else {
- //allItems.add(CommonVariables.Page.noMorePage);
- }
- }
- }
- PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, allItems, append);
+ addPageFooter(hasMorePages(), getPageNum(), itemList);
+ PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
}
});
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index b42df6c..6aaed08 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -1,6 +1,5 @@
package cn.com.basic.face.service;
-import android.graphics.Bitmap;
import android.util.Base64;
import org.xutils.http.RequestParams;
@@ -72,7 +71,7 @@
prevList.addAll(0, newList);
- fillBlank(prevList, doubleList);
+ registerTopAndCheckInBottom(prevList, doubleList);
SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);
}
@@ -81,11 +80,11 @@
});
}
- private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {
+ private void registerTopAndCheckInBottom(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {
doubleList.clear();
List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
- removeDuplicate(list);
+ removeDuplicateCheckIn(list);
int maxRegister = 20;
int i1 = 0, j = 0;
int maxCheckIn = 20;
@@ -129,7 +128,7 @@
}
- private void removeDuplicate(List<SurveillanceQueryItem> list) {
+ private void removeDuplicateCheckIn(List<SurveillanceQueryItem> list) {
List itemsToRemove = new ArrayList();
Set<String> registerIds = new HashSet<>();
for (SurveillanceQueryItem item : list) {
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 817fa6f..b62d869 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
@@ -14,7 +14,7 @@
import cn.com.basic.face.discern.query.item.VisitQueryItem;
import cn.com.basic.face.util.AppApi;
-public class VisitMng {
+public class VisitMng extends BaseMng {
private static VisitMng instance = new VisitMng();
public static VisitMng getInstance() {
@@ -57,19 +57,7 @@
itemList.add(item);
i++;
}
- if (hasMorePages()) {
- itemList.add(CommonVariables.Page.hasMorePages);
- } else {
- if (getPageNum() > 1) {
- //itemList.add(CommonVariables.Page.reachBottom);
- } else {
- if (itemList.size() > 0) {
- //itemList.add(CommonVariables.Page.reachBottom);
- } else {
- //itemList.add(CommonVariables.Page.noMorePage);
- }
- }
- }
+ addPageFooter(hasMorePages(), getPageNum(), itemList);
cn.com.basic.face.fragment.VisitFragment.getInstance().get_fragment_visit_left_list_view().show(itemList, append);
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_visitor_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_visitor_row.xml
index 187e1aa..3be579d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_visitor_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_visitor_row.xml
@@ -33,6 +33,7 @@
</RelativeLayout>
<View
+ android:id="@+id/fragment_check_in_left_visitor_row_line"
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"/>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml
index 5455217..36596b5 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml
@@ -10,7 +10,8 @@
android:layout_marginBottom="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="宸插叏閮ㄥ姞杞�"
+ android:text=""
android:gravity="center"
/>
+ <!--宸插叏閮ㄥ姞杞�-->
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0