From f78d6020a2750ca0d764d3013755710341fb8aa2 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 17:38:21 +0800
Subject: [PATCH] capnproto add lib
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 306 +++++++++++++++++++++++++++++---------------------
1 files changed, 178 insertions(+), 128 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
index d6c24e7..2dd297c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
@@ -2,13 +2,6 @@
import android.widget.Toast;
-import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.base.MainActivity;
-import cn.com.basic.face.dialog.CountryDialog;
-import cn.com.basic.face.dialog.SelectDialog;
-import cn.com.basic.face.discern.query.condition.DictionaryQueryCondition;
-import cn.com.basic.face.util.AppApi;
-
import org.xutils.http.RequestParams;
import org.xutils.x;
@@ -17,26 +10,28 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.dialog.CountryDialog;
+import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.Dictionary;
+import cn.com.basic.face.discern.query.condition.DictionaryQueryCondition;
+import cn.com.basic.face.service.sqlite.DictionaryDao;
+import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.CharacterParser;
import cn.com.basic.face.util.Constant;
+import cn.com.basic.face.util.SqliteSqlUtil;
-public class DictionaryMng {
+public class DictionaryMng extends BaseMng {
public static DictionaryMng instance = new DictionaryMng();
public static DictionaryMng getInstance() {
return instance;
- }
-
- public Map<String, String> idMap = new HashMap<String, String>();
-
- public String getId(String name) {
- return idMap.get(name);
}
public void loadAllDictionaryData() {
@@ -51,41 +46,53 @@
loadResolutionList();
loadProtocolList();
loadCameraBrandList();
+ DepartmentMng.getInstance().loadDepartmentDictionary();
+ PostMng.getInstance().loadPostDictionary();
+ loadAttenderTypeList();
}
public void loadCountries() {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.COUNTRY);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- List<Dictionary> items = getList(Dictionary.class);
- int i=0;
- List<String> uniqueFirstLetterList = new ArrayList<String>();
- HashMap<String,List<String>> countriesGroupByFirstLetter = new HashMap<String,List<String>>();
- sortCountries(items);
- for (Dictionary item : items) {
- idMap.put(item.getName(), item.getDictId()+"");
-
- String firstLetter = item.getName();
- if (item.getName().length() > 0) {
- firstLetter = CharacterParser.getInstance().getSelling(item.getName()).substring(0, 1).toUpperCase();
- }
- List list = countriesGroupByFirstLetter.get(firstLetter);
- if (list == null) {
- list = new ArrayList();
- countriesGroupByFirstLetter.put(firstLetter, list);
- uniqueFirstLetterList.add(0, firstLetter);
- }
- list.add(item.getName());
- i++;
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.COUNTRY);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ loadCountriesAfterReturn(getList(Dictionary.class));
}
- CountryDialog.setCountries(uniqueFirstLetterList, countriesGroupByFirstLetter);
- }
- });
+ });
+ } else {
+ loadCountriesAfterReturn(DictionaryDao.getInstance().loadCountries());
+ }
}
+
+ private void loadCountriesAfterReturn(List<Dictionary> items) {
+ int i=0;
+ List<String> uniqueFirstLetterList = new ArrayList<String>();
+ HashMap<String,List<String>> countriesGroupByFirstLetter = new HashMap<String,List<String>>();
+ sortCountries(items);
+ for (Dictionary item : items) {
+ idMap.put(item.getName(), item.getDictId()+"");
+
+ String firstLetter = item.getName();
+ if (item.getName().length() > 0) {
+ firstLetter = CharacterParser.getInstance().getSelling(item.getName()).substring(0, 1).toUpperCase();
+ }
+ List list = countriesGroupByFirstLetter.get(firstLetter);
+ if (list == null) {
+ list = new ArrayList();
+ countriesGroupByFirstLetter.put(firstLetter, list);
+ uniqueFirstLetterList.add(0, firstLetter);
+ }
+ list.add(item.getName());
+ i++;
+ }
+ CountryDialog.setCountries(uniqueFirstLetterList, countriesGroupByFirstLetter);
+ }
+
private void sortCountries(List<Dictionary> countries) {
if (!BaseApplication.deviceAvailable) {
@@ -111,100 +118,126 @@
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setIdTypeList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setIdTypeList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setIdTypeList(getDictionaryNameList(DictionaryDao.getInstance().loadIdTypeList()));
+ }
}
private void loadGenderList() {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.GENDER);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setGenderList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.GENDER);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setGenderList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setGenderList(getDictionaryNameList(DictionaryDao.getInstance().loadGenderList()));
+ }
}
public void loadVisitReasonList() {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setVisitReasonList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setVisitReasonList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setVisitReasonList(getDictionaryNameList(DictionaryDao.getInstance().loadVisitReasonList()));
+ }
}
public void loadResolutionList() {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.RESOLUTION);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setResolutionList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.RESOLUTION);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setResolutionList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setResolutionList(getDictionaryNameList(DictionaryDao.getInstance().loadResolutionList()));
+ }
}
public void loadProtocolList() {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.PROTOCOL);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setProtocolList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.PROTOCOL);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setProtocolList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setProtocolList(getDictionaryNameList(DictionaryDao.getInstance().loadProtocolList()));
+ }
}
public void loadCameraBrandList() {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.CAMERA_BRAND);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setCameraBrandList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
- }
-
- public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
- List nameList = new ArrayList();
- for (Dictionary dictionary : dictionaryList) {
- idMap.put(dictionary.getName(), dictionary.getDictId()+"");
- nameList.add(dictionary.getName());
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.CAMERA_BRAND);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setCameraBrandList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setCameraBrandList(getDictionaryNameList(DictionaryDao.getInstance().loadCameraBrandList()));
}
- return nameList;
}
private void loadVisitorTypeList() {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISITOR_TYPE);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setVisitorTypeList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISITOR_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setVisitorTypeList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setVisitorTypeList(getDictionaryNameList(DictionaryDao.getInstance().loadVisitorTypeList()));
+ }
}
@@ -212,39 +245,56 @@
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
- params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ATTENDER_TYPE);
- x.http().get(params, new BaseCommonCallBack() {
- public void success() {
- SelectDialog.setAttenderTypeList(getDictionaryNameList(getList(Dictionary.class)));
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ATTENDER_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().get(params, new BaseCommonCallBack() {
+ public void success() {
+ SelectDialog.setAttenderTypeList(getDictionaryNameList(getList(Dictionary.class)));
+ }
+ });
+ } else {
+ SelectDialog.setAttenderTypeList(getDictionaryNameList(DictionaryDao.getInstance().loadAttenderTypeList()));
+ }
}
public void addDictionary(final int type, String type1, String name) {
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.DICTIONARY_ADD);
- params.addBodyParameter(Dictionary.FieldNames.type, type1);
- params.addBodyParameter(Dictionary.FieldNames.name, name);
- params.addBodyParameter(Dictionary.FieldNames.orderBy, "10");
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- List<Dictionary> items = getList(Dictionary.class);
- switch (type) {
- case Constant.DialogSelectType.VISIT_REASON:
- break;
- case Constant.DialogSelectType.RESOLUTION:
- SelectDialog.setResolutionList(getDictionaryNameList(getList(Dictionary.class)));
- break;
- case Constant.DialogSelectType.PROTOCOL:
- SelectDialog.setProtocolList(getDictionaryNameList(getList(Dictionary.class)));
- break;
- case Constant.DialogSelectType.CAMERA_BRAND:
- SelectDialog.setCameraBrandList(getDictionaryNameList(getList(Dictionary.class)));
- break;
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.DICTIONARY_ADD);
+ params.addBodyParameter(Dictionary.FieldNames.type, type1);
+ params.addBodyParameter(Dictionary.FieldNames.name, name);
+ params.addBodyParameter(Dictionary.FieldNames.orderBy, "10");
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+ addDictionaryAfterReturn(getList(Dictionary.class), type);
}
- Toast.makeText(MainActivity.getInstance(), "娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
- }
- });
+ });
+ } else {
+ addDictionaryAfterReturn(DictionaryDao.getInstance().addDictionary(type1, name), type);
+ }
+ }
+
+ public void addDictionaryAfterReturn(List<Dictionary> list, int type) {
+ switch (type) {
+ case Constant.DialogSelectType.VISIT_REASON:
+ break;
+ case Constant.DialogSelectType.RESOLUTION:
+ SelectDialog.setResolutionList(getDictionaryNameList(list));
+ break;
+ case Constant.DialogSelectType.PROTOCOL:
+ SelectDialog.setProtocolList(getDictionaryNameList(list));
+ break;
+ case Constant.DialogSelectType.CAMERA_BRAND:
+ SelectDialog.setCameraBrandList(getDictionaryNameList(list));
+ break;
+ }
+ Toast.makeText(MainActivity.getInstance(), "娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
}
}
--
Gitblit v1.8.0