From d139906e39aa91d57eb38a6b3e768718eef56333 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 七月 2017 10:29:51 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java | 3
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 29 +++++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/AttendanceQueryCondition.java | 22 +++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java | 31 ++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java | 85 ++++++++-------------------
5 files changed, 94 insertions(+), 76 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
index 779cebe..98a1376 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
@@ -82,7 +82,8 @@
RelativeLayout fragment_attendance_left_relative_layout = viewHolder.findViewById(R.id.fragment_attendance_left_relative_layout);
final AttendanceQueryItem item = getItem(position);
- fragment_visit_left_person_row_status.setText(item.getAttendanceType());
+// fragment_visit_left_person_row_status.setText(item.getAttendanceType());
+ fragment_visit_left_person_row_status.setVisibility(View.GONE);
fragment_attendance_left_relative_layout.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/AttendanceQueryCondition.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/AttendanceQueryCondition.java
index c285832..4d17a52 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/AttendanceQueryCondition.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/AttendanceQueryCondition.java
@@ -5,13 +5,33 @@
public static final class FieldNames {
/**
+ *
+ */
+ public static final String deviceCompanyId = "deviceCompanyId";
+ /**
* 浜哄憳鍚嶅瓧
*/
public static final String username = "username";
}
+ //
+ private String deviceCompanyId;
// 浜哄憳鍚嶅瓧
private String username;
+
+ /**
+ * Get
+ */
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ /**
+ * Set
+ */
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
/**
* Get 浜哄憳鍚嶅瓧
@@ -29,6 +49,6 @@
public String toString() {
return
- ",浜哄憳鍚嶅瓧 =" + username ;
+ ", =" + deviceCompanyId + ",浜哄憳鍚嶅瓧 =" + username ;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java
index 6bb7d31..934b386 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java
@@ -11,16 +11,12 @@
private String surveillancePhoto;
// 璇佷欢缂栧彿
private String identifyNum;
- // 鍚嶇О
- private String gender;
// 鑱屼綅鍚嶇О
private String postName;
+ // 鍚嶇О
+ private String gender;
// 閮ㄩ棬鍚嶇О
private String deptName;
- //
- private String time;
- //
- private String attendanceType;
/**
* Get 浜哄憳涓婚敭
@@ -28,7 +24,7 @@
public String getRegisterId() {
return registerId;
}
-
+
/**
* Set 浜哄憳涓婚敭
*/
@@ -42,7 +38,7 @@
public String getUsername() {
return username;
}
-
+
/**
* Set 浜哄憳鍚嶅瓧
*/
@@ -56,7 +52,7 @@
public String getSurveillancePhoto() {
return surveillancePhoto;
}
-
+
/**
* Set 鐩戞帶鍥剧墖
*/
@@ -70,7 +66,7 @@
public String getIdentifyNum() {
return identifyNum;
}
-
+
/**
* Set 璇佷欢缂栧彿
*/
@@ -79,26 +75,12 @@
}
/**
- * Get 鍚嶇О
- */
- public String getGender() {
- return gender;
- }
-
- /**
- * Set 鍚嶇О
- */
- public void setGender(String gender) {
- this.gender = gender;
- }
-
- /**
* Get 鑱屼綅鍚嶇О
*/
public String getPostName() {
return postName;
}
-
+
/**
* Set 鑱屼綅鍚嶇О
*/
@@ -107,12 +89,26 @@
}
/**
+ * Get 鍚嶇О
+ */
+ public String getGender() {
+ return gender;
+ }
+
+ /**
+ * Set 鍚嶇О
+ */
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
+
+ /**
* Get 閮ㄩ棬鍚嶇О
*/
public String getDeptName() {
return deptName;
}
-
+
/**
* Set 閮ㄩ棬鍚嶇О
*/
@@ -120,39 +116,10 @@
this.deptName = deptName;
}
- /**
- * Get
- */
- public String getTime() {
- return time;
- }
-
- /**
- * Set
- */
- public void setTime(String time) {
- this.time = time;
- }
-
- /**
- * Get
- */
- public String getAttendanceType() {
- return attendanceType;
- }
-
- /**
- * Set
- */
- public void setAttendanceType(String attendanceType) {
- this.attendanceType = attendanceType;
- }
-
public String toString() {
- return
- ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto +
- ",璇佷欢缂栧彿 =" + identifyNum + ",鍚嶇О =" + gender + ",鑱屼綅鍚嶇О =" + postName +
- ",閮ㄩ棬鍚嶇О =" + deptName + ", =" + time + ", =" + attendanceType
- ;
+ return
+ ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto +
+ ",璇佷欢缂栧彿 =" + identifyNum + ",鑱屼綅鍚嶇О =" + postName + ",鍚嶇О =" + gender +
+ ",閮ㄩ棬鍚嶇О =" + deptName ;
}
}
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 cee37bb..66e6551 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
@@ -36,6 +36,7 @@
} else {
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.ATTENDANCE_QUERY);
params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
+ params.addBodyParameter(AttendanceQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum + "");
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
x.http().post(params, new BaseCommonCallBack() {
@@ -45,21 +46,21 @@
int i = 0;
String previewDate = "";
if (append) {
- List prevList = AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().getPrevList();
- if (prevList != null && prevList.size() > 1) {
- previewDate = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(
- ((AttendanceQueryItem) prevList.get(prevList.size() - 2)).getTime());
- }
+// List prevList = AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().getPrevList();
+// if (prevList != null && prevList.size() > 1) {
+// previewDate = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(
+// ((AttendanceQueryItem) prevList.get(prevList.size() - 2)).getTime());
+// }
}
for (AttendanceQueryItem item : list) {
- try {
- String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(item.getTime());
- if (!previewDate.equals(yyyyMMdd)) {
- itemList.add(yyyyMMdd);
- previewDate = yyyyMMdd;
- }
- } catch (Exception e) {
- }
+// try {
+// String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(item.getTime());
+// if (!previewDate.equals(yyyyMMdd)) {
+// itemList.add(yyyyMMdd);
+// previewDate = yyyyMMdd;
+// }
+// } catch (Exception e) {
+// }
itemList.add(item);
i++;
}
@@ -77,7 +78,7 @@
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.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");
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
index fd1518b..1ba34a1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
@@ -1,9 +1,15 @@
package cn.com.basic.face.service.sqlite;
+import android.graphics.Bitmap;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
import cn.com.basic.face.discern.query.item.SurveillancePhotoQueryItem;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
+import cn.com.basic.face.util.FileUtil;
public class SurveillanceDao {
@@ -12,10 +18,33 @@
return instance;
}
- //temp_table (headPicture, cameraInOrOut, createTime, visitId)
+ //offline_ (headPicture, cameraInOrOut, createTime, visitId)
public void addBitmap(final List<SurveillanceQueryItem> bitmapList, final byte[] byteArray, int len, final String cameraInOrOut, byte[] surveillancePhotoBytes) {
+ for (SurveillanceQueryItem item : bitmapList) {
+ Bitmap bitmap = item.getBitmap();
+ String fileName = UUID.randomUUID().toString()+".bmp";
+ FileUtil.writeToFile(fileName, new byte[]{});
+
+ }
+
+ String headPicture = "";
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String createTime = sdf.format(new Date());
+ String sql = "insert offline_temp(head_picture, camera_in_or_out, create_time, visit_id) values('"+
+ headPicture+"','"+
+ cameraInOrOut+"','"+
+ createTime+"','"+
+ "null" +"')";
+ //瀛樺叆鏁版嵁搴�
+ //鎶婂浘鐗囧瓨鍏ユ湰鍦版枃浠�
+ //浜哄憳娉ㄥ唽鍙互閫夋嫨鏈湴鍥剧墖
+ //鍚屾涓存椂琛�
+
+ //鍚屾璁垮鐧昏琛�
+
+ //鍒犻櫎鏈湴鏂囦欢锛堝惊鐜垹闄わ級
}
--
Gitblit v1.8.0