From e2b8f363dc6a670159b7b5d47cd9577a018505db Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 13:38:42 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java | 20 +++++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java | 7 +--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomAttendanceListView.java | 7 +--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java | 7 +--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java | 2
10 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
index 1c8b848..4360998 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
@@ -512,7 +512,7 @@
protected void onStop() {
super.onStop();
//Config.sqlMap.getDb().close();
- db.close();
+// db.close();
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
index 0747c0f..3c9d7cb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -177,7 +177,7 @@
params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(fragment_visitor_register_country.getValue()));
params.addBodyParameter(Register.FieldNames.visitorTypeId, DictionaryMng.getInstance().getId(visitor_type));
params.addBodyParameter(Register.FieldNames.identifyNum, fragment_visitor_register_id_num.getValue());
- params.addBodyParameter(Register.FieldNames.companyId, company);
+// params.addBodyParameter(Register.FieldNames.companyId, null);
params.addBodyParameter(Register.FieldNames.company, company);
params.addBodyParameter(Register.FieldNames.birthday, fragment_visitor_register_birthday.getValue());
params.addBodyParameter(Register.FieldNames.remark, fragment_visitor_register_remark.getValue());
@@ -231,7 +231,7 @@
offlineVisitorRegisterItem.setCountryId(DictionaryMng.getInstance().getId(fragment_visitor_register_country.getValue()));
offlineVisitorRegisterItem.setVisitorTypeId(DictionaryMng.getInstance().getId(visitor_type));
offlineVisitorRegisterItem.setIdentifyNum(fragment_visitor_register_id_num.getValue());
- offlineVisitorRegisterItem.setCompanyId(company);
+ offlineVisitorRegisterItem.setCompanyId(null);
offlineVisitorRegisterItem.setCompany(company);
offlineVisitorRegisterItem.setBirthday(fragment_visitor_register_birthday.getValue());
offlineVisitorRegisterItem.setRemark(fragment_visitor_register_remark.getValue());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
index c7813ad..ceccc0d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
@@ -176,16 +176,16 @@
public void removeTimeoutItemAndShow() {
List itemsToRemove = new ArrayList();
- for (SurveillanceQueryItem item : allItems) {
- if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- Date now = new Date();
- Date createTime = item.getCreateTime();
- double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60;
- if (minutes >= 5) {
- itemsToRemove.add(item);
- }
- }
- }
+// for (SurveillanceQueryItem item : allItems) {
+// if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+// Date now = new Date();
+// Date createTime = item.getCreateTime();
+// double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60;
+// if (minutes >= 5) {
+// itemsToRemove.add(item);
+// }
+// }
+// }
allItems.removeAll(itemsToRemove);
SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(SurveillanceQueryItemUtil.getInstance().getVisitorTwoRows());
SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(SurveillanceQueryItemUtil.getInstance().getAttendanceTwoRows());
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 dab35a6..4621107 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
@@ -17,8 +17,8 @@
public class CheckInLeftInterviewee extends EasyRecyclerView {
private static CheckInFragment.CheckInLeftIntervieweeAdapter adapter = new CheckInFragment.CheckInLeftIntervieweeAdapter();
- private List list = new ArrayList();
- private Parcelable recyclerViewState;
+ private static List list = new ArrayList();
+ private static Parcelable recyclerViewState;
public void setAdapter(Context context) {
setAdapter(adapter);
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 e981aa1..6f6fe49 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
@@ -17,8 +17,8 @@
public class CheckInLeftVisitor extends EasyRecyclerView {
private static CheckInFragment.CheckInLeftVisitorAdapter adapter = new CheckInFragment.CheckInLeftVisitorAdapter();
- private List list = new ArrayList();
- private Parcelable recyclerViewState;
+ private static List list = new ArrayList();
+ private static Parcelable recyclerViewState;
public void setAdapter(Context context) {
setAdapter(adapter);
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 1648ef6..989e75f 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
@@ -15,7 +15,7 @@
public class PhoneCallLeftListView extends EasyRecyclerView {
private static PhoneCallLeftAdapter adapter ;
- private Parcelable recyclerViewState;
+ private static Parcelable recyclerViewState;
private void initView() {
adapter = new PhoneCallLeftAdapter();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomAttendanceListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomAttendanceListView.java
index 2cfced6..a10744d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomAttendanceListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomAttendanceListView.java
@@ -20,7 +20,9 @@
public class SurveillanceBottomAttendanceListView extends EasyRecyclerView {
- private Parcelable recyclerViewState;
+ public static SurveillanceFragment.SurveillanceBottomAttendanceListViewAdapter mAdapter;
+ public static List list = new ArrayList();
+ public static Parcelable recyclerViewState;
private class SpaceItemDecoration extends ItemDecoration {
@Override
@@ -43,9 +45,6 @@
gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
setLayoutManager(gridLayoutManager);
}
-
- private SurveillanceFragment.SurveillanceBottomAttendanceListViewAdapter mAdapter;
- private List list = new ArrayList();
public void setAdapter(Context context) {
mAdapter = new SurveillanceFragment.SurveillanceBottomAttendanceListViewAdapter(context);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java
index ce5942a..169ffd0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java
@@ -20,7 +20,9 @@
public class SurveillanceBottomVisitorListView extends EasyRecyclerView {
- private Parcelable recyclerViewState;
+ public static SurveillanceFragment.SurveillanceBottomVisitorListViewAdapter mAdapter;
+ public static List list = new ArrayList();
+ public static Parcelable recyclerViewState;
private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
@Override
@@ -43,9 +45,6 @@
gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
setLayoutManager(gridLayoutManager);
}
-
- private SurveillanceFragment.SurveillanceBottomVisitorListViewAdapter mAdapter;
- private List list = new ArrayList();
public void setAdapter(Context context) {
mAdapter = new SurveillanceFragment.SurveillanceBottomVisitorListViewAdapter(context);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java
index 512b991..f34e768 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java
@@ -21,7 +21,9 @@
public class SurveillancePhotoSelectListView extends EasyRecyclerView {
- private Parcelable recyclerViewState;
+ public static Parcelable recyclerViewState;
+ public static SurveillanceFragment.SurveillancePhotoSelectListViewAdapter mAdapter;
+ public static List list = new ArrayList();
private class SpaceItemDecoration extends ItemDecoration {
@Override
@@ -44,9 +46,6 @@
gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
setLayoutManager(gridLayoutManager);
}
-
- private SurveillanceFragment.SurveillancePhotoSelectListViewAdapter mAdapter;
- private List list = new ArrayList();
public void setAdapter(Context context) {
mAdapter = new SurveillanceFragment.SurveillancePhotoSelectListViewAdapter(context);
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 6811e1e..6235fb1 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
@@ -14,8 +14,8 @@
public class VisitLeftListView extends EasyRecyclerView {
- private static VisitFragment.VisitLeftAdapter adapter;
- private Parcelable recyclerViewState;
+ public static VisitFragment.VisitLeftAdapter adapter;
+ public static Parcelable recyclerViewState;
private void initView() {
adapter = new VisitFragment.VisitLeftAdapter();
--
Gitblit v1.8.0