From 16acacd5bd4b15a15e96720a07f91ce8e4aa086c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 11:31:37 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 44 ++++++++++++++++----------------------------
1 files changed, 16 insertions(+), 28 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 665c466..c2b9799 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,6 +2,7 @@
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.discern.query.item.VistorTypeQueryItem;
import cn.com.basic.face.util.AppApi;
@@ -31,14 +32,6 @@
return idMap.get(name);
}
- public static List<String> nationList = new ArrayList<String>();
- public static List<String> mCredentialsList = new ArrayList<String>();
- public static List<String> genderList = new ArrayList<String>();
- public static List<String> uniqueFirstLetterList = new ArrayList<String>();
- public static HashMap<String,List<String>> countriesGroupByFirstLetter = new HashMap<String,List<String>>();
- public static String[] countryWordData = new String[]{};
- public static List<String> visitReasonList = new ArrayList<String>();
-
public void loadAllDictionaryData() {
loadCountries();
loadIdTypeList();
@@ -48,16 +41,16 @@
}
public void loadCountries() {
- RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
- params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.COUNTRY);
+ 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);
- countryWordData = new String[items.size()];
int i=0;
+ List<String> uniqueFirstLetterList = new ArrayList<String>();
+ HashMap<String,List<String>> countriesGroupByFirstLetter = new HashMap<String,List<String>>();
for (Dictionary item : items) {
- idMap.put(item.getName(), item.getId()+"");
- nationList.add(item.getName());
+ idMap.put(item.getName(), item.getDictId()+"");
String firstLetter = item.getRemark();
List list = countriesGroupByFirstLetter.get(firstLetter);
if (list == null) {
@@ -66,7 +59,6 @@
uniqueFirstLetterList.add(0, firstLetter);
}
list.add(item.getName());
- countryWordData[i] = item.getName();
i++;
}
CountryDialog.setCountries(uniqueFirstLetterList, countriesGroupByFirstLetter);
@@ -76,8 +68,8 @@
}
public void loadIdTypeList() {
- RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
- params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE);
+ 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)));
@@ -86,8 +78,8 @@
}
private void loadGenderList() {
- RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
- params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.GENDER);
+ 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)));
@@ -96,8 +88,8 @@
}
private void loadVisitReasonList() {
- RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
- params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON);
+ 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)));
@@ -108,22 +100,18 @@
public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
List nameList = new ArrayList();
for (Dictionary dictionary : dictionaryList) {
- idMap.put(dictionary.getName(), dictionary.getId()+"");
+ idMap.put(dictionary.getName(), dictionary.getDictId()+"");
nameList.add(dictionary.getName());
}
return nameList;
}
private void loadVisitorTypeList() {
- RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_TYPE_LIST);
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+ params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISIT_TYPE);
x.http().get(params, new BaseCommonCallBack() {
public void success() {
- List<String> mVisitorTypeList = new ArrayList<String>();
- for (VistorTypeQueryItem item : getList(VistorTypeQueryItem.class)) {
- mVisitorTypeList.add(item.getLabel());
- idMap.put(item.getLabel(), item.getId()+"");
- }
- SelectDialog.setVisitorTypeList(mVisitorTypeList);
+ SelectDialog.setVisitorTypeList(getDictionaryNameList(getList(Dictionary.class)));
}
});
}
--
Gitblit v1.8.0