From 0a7e6639ae4e193de0e15c86fde488c950f315d0 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 20:53:24 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 228 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 142 insertions(+), 86 deletions(-)
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 77070e9..05370b0 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
@@ -3,26 +3,38 @@
import android.widget.Toast;
import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.common.ResultBean;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
+import cn.com.basic.face.discern.entity.Visit;
+import cn.com.basic.face.discern.entity.VisitDetail;
+import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
-import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
+import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
+import cn.com.basic.face.discern.query.item.OfflineVisitItem;
import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.service.sqlite.CheckInDao;
+import cn.com.basic.face.service.sqlite.DictionaryDao;
import cn.com.basic.face.util.AppApi;
import org.xutils.http.RequestParams;
import org.xutils.x;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
import java.util.List;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.util.CharacterParser;
+import cn.com.basic.face.util.SqliteSqlUtil;
-public class CheckInMng {
+//鐧昏
+public class CheckInMng extends BaseMng {
public static CheckInMng instance = new CheckInMng();
@@ -30,108 +42,145 @@
return instance;
}
- public void add(RequestParams params, final String visitReasonId) {
+ public void add(RequestParams params, final String visitReasonId, OfflineVisitItem offlineVisitItem) {
if (!BaseApplication.deviceAvailable) {
return;
}
- params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
- x.http().post(params, new BaseCommonCallBack() {
- @Override
- public void success() {
- Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
- CheckInFragment.getInstance().resetForm();
- if (visitReasonId == null || "".equals(visitReasonId)) {
- DictionaryMng.getInstance().loadVisitReasonList();
+ if (BaseApplication.getInstance().networkAvailable()) {
+ params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
+ params.addBodyParameter(Visit.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+ Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ CheckInFragment.getInstance().resetForm();
+ if (visitReasonId == null || "".equals(visitReasonId)) {
+ DictionaryMng.getInstance().loadVisitReasonList();
+ }
}
- }
- });
+ });
+ } else {
+ final long result = CheckInDao.getInstance().addOfflineVisit(offlineVisitItem);
+
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (result > 0) {
+ Toast.makeText(BaseApplication.getInstance(), "娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ if (visitReasonId == null || "".equals(visitReasonId)) {
+ DictionaryMng.getInstance().loadVisitReasonList();
+ }
+ CheckInFragment.getInstance().resetForm();
+ } else {
+ Toast.makeText(BaseApplication.getInstance(), "娣诲姞澶辫触", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+ }
}
public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
- String deviceCompanyId = BaseApplication.getInstance().getDevice().getDeviceCompanyId();
- if (isVisitorList) {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
+ String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
+ if (isVisitorList) {
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);
+ } else {
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, deviceCompanyId);
+ }
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
+ params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ findCheckInLeftListAfterReturn(resultBean, isVisitorList, isSortByDept, append);
+ }
+ });
} else {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, deviceCompanyId);
+ findCheckInLeftListAfterReturn(CheckInDao.getInstance().findCheckInLeftList(isVisitorList, searchText, pageNum), isVisitorList, isSortByDept, append);
}
- params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
- params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "5");
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
+ }
- List prevList = null;
- if (append) {
- if (isVisitorList) {
- prevList = CheckInFragment.getInstance().get_fragment_check_in_left_visitor().getPrevList();
- } else {
- prevList = CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().getPrevList();
- }
- for (int i = 0; i < prevList.size(); i++) {
- Object item = prevList.get(i);
- if (item instanceof CheckInQueryItem) {
- list.add(0, (CheckInQueryItem) item);
- }
- }
- }
+ public void findCheckInLeftListAfterReturn(ResultBean resultBean, final boolean isVisitorList, final boolean isSortByDept, final boolean append) {
+ List<CheckInQueryItem> list = resultBean.getList(CheckInQueryItem.class);
+ if (list == null) {
+ list = new ArrayList<>();
+ }
- sort(list, isSortByDept);
- List allItems = new ArrayList();
- String name = "";
- String prev = "";
- for (int i = 0; i < list.size(); i++) {
- CheckInQueryItem item = list.get(i);
- if (isSortByDept) {
- if (item.getDeptName() != null && item.getDeptName().length() > 0) {
- name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
- }
- } else {
- if (item.getUsername() != null && item.getUsername().length() > 0)
- name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
- }
- if (!name.equals(prev)) {
- allItems.add(name);
- }
- allItems.add(item);
- prev = name;
- }
- if (hasMorePages()) {
- allItems.add(CommonVariables.Page.hasMorePages);
- } else {
- if (getPageNum() > 1) {
- allItems.add(CommonVariables.Page.reachBottom);
- } else {
- if (allItems.size() > 0) {
- allItems.add(CommonVariables.Page.reachBottom);
- } else {
- allItems.add(CommonVariables.Page.noMorePage);
- }
- }
- }
- if (isVisitorList) {
- CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems, append);
- } else {
- CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept, append);
+ List prevList = null;
+ if (append) {
+ if (isVisitorList) {
+ prevList = CheckInFragment.getInstance().get_fragment_check_in_left_visitor().getPrevList();
+ } else {
+ prevList = CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().getPrevList();
+ }
+ for (int i = 0; i < prevList.size(); i++) {
+ Object item = prevList.get(i);
+ if (item instanceof CheckInQueryItem) {
+ list.add(0, (CheckInQueryItem) item);
}
}
- });
+ }
+
+ sort(list, isSortByDept);
+ final List itemList = new ArrayList();
+ String name = "";
+ String prev = "";
+ for (int i = 0; i < list.size(); i++) {
+ CheckInQueryItem item = list.get(i);
+ if (isSortByDept) {
+ if (item.getDeptName() != null && item.getDeptName().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
+ }
+ } else {
+ if (item.getUsername() != null && item.getUsername().length() > 0)
+ name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
+ }
+ if (!name.equals(prev)) {
+ itemList.add(name);
+ }
+ itemList.add(item);
+ prev = name;
+ }
+ addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
+ if (BaseApplication.getInstance().networkAvailable()) {
+ if (isVisitorList) {
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+ } else {
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+ }
+ } else {
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isVisitorList) {
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+ } else {
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+ }
+ }
+ });
+ }
}
private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) {
if (!BaseApplication.deviceAvailable) {
return;
}
+ if (list == null) {
+ list = new ArrayList<>();
+ }
Collections.sort(list, new Comparator<CheckInQueryItem>() {
@Override
- public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {
+ public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {
if (sortedByDept) {
- String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
- String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
+ String dept1Name = item1.getDeptName()==null?"":item1.getDeptName();
+ String dept2Name = item2.getDeptName()==null?"":item2.getDeptName();
if(!dept1Name.equals(dept2Name)) {
String dept1Name_a = dept1Name.trim();
String dept1Name_b = dept2Name.trim();
@@ -142,13 +191,13 @@
return dept1Name_a.compareTo(dept1Name_b);
}
}
- String name1 = t1.getUsername()==null?"":t1.getUsername();
- String name2 = t2.getUsername()==null?"":t2.getUsername();
- String dept1Name_a = name1.trim();
- String dept1Name_b = name2.trim();
+ String username1 = item1.getUsername()==null?"":item1.getUsername();
+ String username2 = item2.getUsername()==null?"":item2.getUsername();
+ String dept1Name_a = username1.trim();
+ String dept1Name_b = username2.trim();
if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
- dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
- dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+ dept1Name_a = CharacterParser.getInstance().getSelling(username1).toLowerCase();
+ dept1Name_b = CharacterParser.getInstance().getSelling(username2).toLowerCase();
}
return dept1Name_a.compareTo(dept1Name_b);
}
@@ -156,4 +205,11 @@
}
+ public void sendOfflineCheckInToServer(Integer mysqlVisitorId, long sqliteVisitorId) {
+
+ }
+
+ public boolean hasOfflineCheckInData() {
+ return CheckInDao.getInstance().hasOfflineCheckInData();
+ }
}
--
Gitblit v1.8.0