From 0d2d3d6cb41f54531ab4c24c75298caff19574f2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 10:29:38 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 8 ++++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 8 ++++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 11 +----------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left_visitor_row.xml | 3 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 8 ++++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 8 ++++----
6 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index a844816..3dfa8e0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -55,6 +55,7 @@
public static class Page {
public static final String PAGE_SIZE = "pageSize";
public static final String PAGE_NUM = "pageNum";
+ public static final String DEFAULT_PAGE_SIZE = "7";
public static final int hasMorePages = 1;
public static final int noMorePage = 2;
public static final int reachBottom = 3;
@@ -75,16 +76,6 @@
public static final String OUT = "2";
}
-
- /*{
- "ret":0,
- "count":3,
- "result":[[-1,123],[2,456],[0,0]]
- }*/
-
- /**
- * [-1RecogonizeResult
- */
public static class RecognizeResult {
public static final int RET = 0;
public static final int FIRST_ELEMENT_NOT_FOUND = 0;
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 e0bc55c..2b56f0b 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
@@ -33,7 +33,7 @@
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_QUERY);
params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
@@ -62,12 +62,12 @@
itemList.add(CommonVariables.Page.hasMorePages);
} else {
if (getPageNum() > 1) {
- itemList.add(CommonVariables.Page.reachBottom);
+ //itemList.add(CommonVariables.Page.reachBottom);
} else {
if (itemList.size() > 0) {
- itemList.add(CommonVariables.Page.reachBottom);
+ //itemList.add(CommonVariables.Page.reachBottom);
} else {
- itemList.add(CommonVariables.Page.noMorePage);
+ //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 d28488d..ca088c9 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
@@ -60,7 +60,7 @@
}
params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
@@ -104,12 +104,12 @@
allItems.add(CommonVariables.Page.hasMorePages);
} else {
if (getPageNum() > 1) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
if (allItems.size() > 0) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
- allItems.add(CommonVariables.Page.noMorePage);
+ //allItems.add(CommonVariables.Page.noMorePage);
}
}
}
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 4d6a3d8..9c7f326 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
@@ -38,7 +38,7 @@
}
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.PHONE_CALL_QUERY);
params.addBodyParameter(PhoneCallQueryCondition.FieldNames.username, searchText);
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
@@ -85,12 +85,12 @@
allItems.add(CommonVariables.Page.hasMorePages);
} else {
if (getPageNum() > 1) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
if (allItems.size() > 0) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
- allItems.add(CommonVariables.Page.noMorePage);
+ //allItems.add(CommonVariables.Page.noMorePage);
}
}
}
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 a69d5e3..817fa6f 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
@@ -27,7 +27,7 @@
}
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.VISIT_QUERY);
params.addBodyParameter(VisitQueryCondition.FieldNames.username, searchText);
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
@@ -61,12 +61,12 @@
itemList.add(CommonVariables.Page.hasMorePages);
} else {
if (getPageNum() > 1) {
- itemList.add(CommonVariables.Page.reachBottom);
+ //itemList.add(CommonVariables.Page.reachBottom);
} else {
if (itemList.size() > 0) {
- itemList.add(CommonVariables.Page.reachBottom);
+ //itemList.add(CommonVariables.Page.reachBottom);
} else {
- itemList.add(CommonVariables.Page.noMorePage);
+ //itemList.add(CommonVariables.Page.noMorePage);
}
}
}
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 b76562b..187e1aa 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
@@ -13,7 +13,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
- android:paddingBottom="12dp">
+ android:paddingBottom="12dp"
+ >
<TextView
android:id="@+id/fragment_check_in_left_visitor_row_name"
android:layout_width="wrap_content"
--
Gitblit v1.8.0