From ecbe68b56e1ed965395d6716818e2aef148bbb8e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 四月 2017 11:23:34 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 2
VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml | 7 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceRightListView.java | 4 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java | 7 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java | 7 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java | 7 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java | 13 ++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java | 5 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java | 7 ++-
12 files changed, 39 insertions(+), 28 deletions(-)
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 d8356cd..e0bc55c 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, "7");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
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 29f006a..d28488d 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, "5");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
@@ -114,7 +114,7 @@
}
}
if (isVisitorList) {
- CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems, append);
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
} else {
CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, 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 8d6c74d..4d6a3d8 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, "6");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
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 e582695..a69d5e3 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, "5");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java
index 8e04323..ac90d0f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.attendance;
import android.content.Context;
+import android.os.Parcelable;
import android.util.AttributeSet;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
@@ -15,6 +16,7 @@
public class AttendanceLeftListView extends EasyRecyclerView {
private AttendanceFragment.AttendanceLeftAdapter adapter;
+ private Parcelable recyclerViewState;
private void initView() {
adapter = new AttendanceFragment.AttendanceLeftAdapter();
@@ -37,6 +39,7 @@
}
public void show(List list, boolean append) {
+ recyclerViewState = this.getLayoutManager().onSaveInstanceState();
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) {
@@ -48,14 +51,12 @@
}
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);
}
setAdapter(adapter);
+ this.getLayoutManager().onRestoreInstanceState(recyclerViewState);
}
public List getPrevList() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceRightListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceRightListView.java
index df2a8a8..e8d8086 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceRightListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceRightListView.java
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.attendance;
import android.content.Context;
+import android.os.Parcelable;
import android.util.AttributeSet;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
@@ -12,6 +13,7 @@
public class AttendanceRightListView extends EasyRecyclerView {
private AttendanceFragment.AttendanceRightAdapter adapter;
+ private Parcelable recyclerViewState;
private void initView() {
adapter = new AttendanceFragment.AttendanceRightAdapter();
@@ -34,8 +36,10 @@
}
public void show(List list) {
+ recyclerViewState = this.getLayoutManager().onSaveInstanceState();
adapter.setList(list);
setAdapter(adapter);
+ this.getLayoutManager().onRestoreInstanceState(recyclerViewState);
}
}
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 e4fbc07..bd4d887 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
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.checkin;
import android.content.Context;
+import android.os.Parcelable;
import android.util.AttributeSet;
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
@@ -17,6 +18,7 @@
private CheckInFragment.CheckInLeftIntervieweeAdapter adapter = new CheckInFragment.CheckInLeftIntervieweeAdapter();
private List list = new ArrayList();
+ private Parcelable recyclerViewState;
public void setAdapter(Context context) {
setAdapter(adapter);
@@ -42,12 +44,11 @@
}
public void refresh(List list, boolean isSortByDept, boolean append) {
- if (append && adapter.getList().size() > 0) {
- this.scrollToPosition(adapter.getList().size()-1);
- }
+ recyclerViewState = this.getLayoutManager().onSaveInstanceState();
adapter.setList(list);
adapter.setSortByDept(isSortByDept);
this.setAdapter(adapter);
+ this.getLayoutManager().onRestoreInstanceState(recyclerViewState);
}
public List getPrevList() {
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 7d3fe80..8523605 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
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.checkin;
import android.content.Context;
+import android.os.Parcelable;
import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet;
@@ -17,6 +18,7 @@
private CheckInFragment.CheckInLeftVisitorAdapter adapter = new CheckInFragment.CheckInLeftVisitorAdapter();
private List list = new ArrayList();
+ private Parcelable recyclerViewState;
public void setAdapter(Context context) {
setAdapter(adapter);
@@ -37,17 +39,12 @@
setAdapter(context);
}
- public void show(List list, boolean append) {
- refresh(list, append);
- }
-
- public void refresh(List list, boolean append) {
- if (append && adapter.getList().size() > 0) {
- this.scrollToPosition(adapter.getList().size()-1);
- }
+ public void show(List list) {
+ recyclerViewState = this.getLayoutManager().onSaveInstanceState();
adapter.setList(list);
this.setAdapter(adapter);
adapter.notifyDataSetChanged();
+ this.getLayoutManager().onRestoreInstanceState(recyclerViewState);
}
public List getPrevList() {
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 0b432ae..12202fc 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
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.phonecall;
import android.content.Context;
+import android.os.Parcelable;
import android.util.AttributeSet;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
@@ -14,6 +15,7 @@
public class PhoneCallLeftListView extends EasyRecyclerView {
private PhoneCallLeftAdapter adapter ;
+ private Parcelable recyclerViewState;
private void initView() {
adapter = new PhoneCallLeftAdapter();
@@ -36,12 +38,11 @@
}
public void show(boolean isSortByDept, List list, boolean append) {
- if (append && adapter.getList().size() > 0) {
- this.scrollToPosition(adapter.getList().size()-1);
- }
+ recyclerViewState = this.getLayoutManager().onSaveInstanceState();
adapter.setList(list);
setAdapter(adapter);
adapter.setSortByDept(isSortByDept);
+ this.getLayoutManager().onRestoreInstanceState(recyclerViewState);
}
public List getPrevList() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java
index 752ed10..7309cf6 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomListView.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.graphics.Rect;
+import android.os.Parcelable;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -18,6 +19,8 @@
import cn.com.basic.face.util.WindowsUtil;
public class SurveillanceBottomListView extends EasyRecyclerView {
+
+ private Parcelable recyclerViewState;
private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
@Override
@@ -71,10 +74,12 @@
}
public void refresh(List list) {
+ recyclerViewState = this.getLayoutManager().onSaveInstanceState();
this.list.clear();
this.list.addAll(list);
mAdapter.setList(this.list);
this.setAdapter(mAdapter);
+ this.getLayoutManager().onRestoreInstanceState(recyclerViewState);
}
public List getPrevList() {
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 e99e4ea..efb0bba 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
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.visit;
import android.content.Context;
+import android.os.Parcelable;
import android.util.AttributeSet;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
@@ -14,6 +15,7 @@
public class VisitLeftListView extends EasyRecyclerView {
private VisitFragment.VisitLeftAdapter adapter;
+ private Parcelable recyclerViewState;
private void initView() {
adapter = new VisitFragment.VisitLeftAdapter();
@@ -36,6 +38,7 @@
}
public void show(List list, boolean append) {
+ recyclerViewState = this.getLayoutManager().onSaveInstanceState();
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) {
@@ -47,15 +50,13 @@
}
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);
}
setAdapter(adapter);
adapter.notifyDataSetChanged();
+ this.getLayoutManager().onRestoreInstanceState(recyclerViewState);
}
public List getPrevList() {
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
index 31ac27f..1165399 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
@@ -7,9 +7,10 @@
<TextView
android:id="@+id/load_more_text_view"
android:paddingTop="20dp"
- android:layout_marginBottom="20dp"
+ android:paddingBottom="20dp"
android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:text="鍔犺浇鏇村"
- android:gravity="center_horizontal"
- android:layout_height="60dp" />
+ android:gravity="center" />
+
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0