From 72c70d81ffabc7d8d0bd274165d83c6902eb6235 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 16:15:46 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java | 11 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java | 25 +++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java | 25 +++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 35 ++++++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java | 24 +++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java | 25 +++----
7 files changed, 73 insertions(+), 74 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java
index 7633ce9..24618a0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java
@@ -39,6 +39,7 @@
private AttenderRegisterSelectPhotoListView dialog_surveillance_photo_select_list_view;
public static long selectedId = -1;
+ private boolean isShow = false;
private static AttenderRegisterSelectPhotoDialog instance = new AttenderRegisterSelectPhotoDialog();
public static AttenderRegisterSelectPhotoDialog getInstance() {
@@ -50,19 +51,6 @@
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_attender_register_select_photo_select,null);
ViewUtils.inject(this, view);
- if (BaseApplication.getInstance().networkAvailable()) {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- } else {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- }
setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
@@ -107,7 +95,6 @@
}
});
- this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -145,15 +132,24 @@
}
public void show() {
+ if (BaseApplication.getInstance().networkAvailable()) {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+ } else {
+ dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+ }
if (this.isShowing()) {
} else {
//this.showAsDropDown();
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
+ isShow = true;
}
public void hide() {
+ if (!isShow) {
+ return;
+ }
if (this.isShowing()) {
dismiss();
} else {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java
index b3764c4..80a9c1a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java
@@ -40,6 +40,8 @@
public static long selectedId = -1;
+ private boolean isShow = false;
+
public static AttenderRegisterUploadPhotoDialog instance = new AttenderRegisterUploadPhotoDialog();
public static AttenderRegisterUploadPhotoDialog getInstance() {
return instance;
@@ -50,19 +52,6 @@
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_attender_register_upload_photo_select,null);
ViewUtils.inject(this, view);
- if (BaseApplication.getInstance().networkAvailable()) {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- } else {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- }
setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
@@ -107,7 +96,6 @@
}
});
- this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -145,6 +133,9 @@
}
public void hide() {
+ if (!isShow) {
+ return;
+ }
if (this.isShowing()) {
dismiss();
} else {
@@ -181,12 +172,18 @@
}
public void show() {
+ if (BaseApplication.getInstance().networkAvailable()) {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+ } else {
+ dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+ }
if (this.isShowing()) {
} else {
//this.showAsDropDown();
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
+ isShow = true;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java
index aaf129c..f717192 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java
@@ -40,6 +40,8 @@
public static long selectedId = -1;
+ private boolean isShow = false;
+
public static VisitorRegisterSelectPhotoDialog instance = new VisitorRegisterSelectPhotoDialog();
public static VisitorRegisterSelectPhotoDialog getInstance() {
return instance;
@@ -50,19 +52,6 @@
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_visitor_register_select_photo_select,null);
ViewUtils.inject(this, view);
- if (BaseApplication.getInstance().networkAvailable()) {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- } else {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- }
setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
@@ -107,7 +96,6 @@
}
});
- this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -145,15 +133,24 @@
}
public void show() {
+ if (BaseApplication.getInstance().networkAvailable()) {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+ } else {
+ dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+ }
if (this.isShowing()) {
} else {
//this.showAsDropDown();
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
+ isShow = true;
}
public void hide() {
+ if (!isShow) {
+ return;
+ }
if (this.isShowing()) {
dismiss();
} else {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java
index de13cc5..7216072 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java
@@ -40,6 +40,8 @@
public static long selectedId = -1;
+ private boolean isShow = false;
+
private static VisitorRegisterUploadPhotoDialog instance = new VisitorRegisterUploadPhotoDialog();
public static VisitorRegisterUploadPhotoDialog getInstance() {
return instance;
@@ -50,19 +52,6 @@
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_visitor_register_upload_photo_select,null);
ViewUtils.inject(this, view);
- if (BaseApplication.getInstance().networkAvailable()) {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- } else {
- if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
- } else {
- dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
- }
- }
setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
@@ -107,7 +96,6 @@
}
});
- this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -145,6 +133,9 @@
}
public void hide() {
+ if (!isShow) {
+ return;
+ }
if (this.isShowing()) {
dismiss();
} else {
@@ -181,12 +172,18 @@
}
public void show() {
+ if (BaseApplication.getInstance().networkAvailable()) {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+ } else {
+ dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+ }
if (this.isShowing()) {
} else {
//this.showAsDropDown();
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
+ isShow = true;
}
}
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 e6fcbff..05e56d9 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
@@ -79,23 +79,24 @@
if (!BaseApplication.deviceAvailable) {
return;
}
- try {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);
- //params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.time, sdf.format(sdf.parse(item.getTime())));
- params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, item.getRegisterId());
- params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(getList(AttendanceDetailQueryItem.class));
- }
- });
- } catch (Exception e) {
- e.printStackTrace();
- }
- if (1==1) {//娌＄綉浜�
- AttendanceDao.getInstance().reloadAttendanceDetail(item);
+ if (BaseApplication.getInstance().networkAvailable()) {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);
+ //params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.time, sdf.format(sdf.parse(item.getTime())));
+ params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, item.getRegisterId());
+ params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(getList(AttendanceDetailQueryItem.class));
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(AttendanceDao.getInstance().reloadAttendanceDetail(item));
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
index cc68be6..dc61565 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
@@ -115,7 +115,7 @@
if(deviceCompanyId != null && !deviceCompanyId.trim().isEmpty()) {
sb.append(" AND a.device_company_id = ").append(deviceCompanyId);
}
- sb.append("ORDER BY a.time DESC");
+ sb.append(" ORDER BY a.time DESC");
StringBuilder count = new StringBuilder(sb.length());
count.append("select count(*) as count from (").append(sb).append(" ) _table");
sb.append(" LIMIT ").append("0").append(",").append(100);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java
index 2112147..4f907a9 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java
@@ -52,10 +52,21 @@
}
public List getAllUnregisterVisitorTwoRowsForSelect(long selectedId) {
+ select(allItems, selectedId);
return allItems;
}
+ public void select(List<SurveillanceQueryItem> items, long selectedId) {
+ for (SurveillanceQueryItem item : items) {
+ item.setSurveillancePhotoSelected(false);
+ if (item.getIdForSelect() == selectedId) {
+ item.setSurveillancePhotoSelected(true);
+ }
+ }
+ }
+
public List getAllUnregisterAttenderTwoRowsForSelect(long selectedId) {
+ select(allItems, selectedId);
return allItems;
}
--
Gitblit v1.8.0