From d9e4437efa13fa133668a1606caefd6a570e782f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 01 四月 2017 14:37:21 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 66 +++++++++++++++------------------
1 files changed, 30 insertions(+), 36 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 2a656f1..7b2e127 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
@@ -1,5 +1,7 @@
package cn.com.basic.face.service;
+import cn.com.basic.face.dialog.CountryDialog;
+import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.fragment.RegisterFragment;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.util.AppApi;
@@ -25,17 +27,17 @@
public static List<String> nationList = new ArrayList<String>();
public static List<String> mCredentialsList = new ArrayList<String>();
- public static List<String> mSexList = new ArrayList<String>();
- public static List<String> countryWordList = new ArrayList<String>();
- public static HashMap<String,List<String>> countryData = new HashMap<String,List<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> visitPurposeList = new ArrayList<String>();
+ public static List<String> visitReasonList = new ArrayList<String>();
public void loadAllDictionaryData() {
loadCountries();
- loadCredentialsList();
- loadSexList();
- loadVisitPurposeList();
+ loadIdTypeList();
+ loadGenderList();
+ loadVisitReasonList();
}
public void loadCountries() {
@@ -50,67 +52,59 @@
idMap.put(item.getName(), item.getId()+"");
nationList.add(item.getName());
String firstLetter = item.getRemark();
- List list = countryData.get(firstLetter);
+ List list = countriesGroupByFirstLetter.get(firstLetter);
if (list == null) {
list = new ArrayList();
- countryData.put(firstLetter, list);
- countryWordList.add(0, firstLetter);
+ countriesGroupByFirstLetter.put(firstLetter, list);
+ uniqueFirstLetterList.add(0, firstLetter);
}
list.add(item.getName());
countryWordData[i] = item.getName();
i++;
}
- RegisterFragment.getInstance().setCountryData(countryWordData, countryWordList, countryData);
+ CountryDialog.setCountries(uniqueFirstLetterList, countriesGroupByFirstLetter);
}
});
}
- public void loadCredentialsList() {
+ public void loadIdTypeList() {
RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
- params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.CREDENTIALS);
+ params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE);
x.http().get(params, new BaseCommonCallBack() {
public void success() {
- List<Dictionary> items = getList(Dictionary.class);
- for (Dictionary item : items) {
- idMap.put(item.getName(), item.getId()+"");
- mCredentialsList.add(item.getName());
- }
- RegisterFragment.getInstance().setCredentialsList(mCredentialsList);
+ SelectDialog.setIdTypeList(getDictionaryNameList(getList(Dictionary.class)));
}
});
}
- private void loadSexList() {
+ private void loadGenderList() {
RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
- params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.SEX);
+ params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.GENDER);
x.http().get(params, new BaseCommonCallBack() {
public void success() {
- List<Dictionary> items = getList(Dictionary.class);
- for (Dictionary item : items) {
- idMap.put(item.getName(), item.getId()+"");
- mSexList.add(item.getName());
- }
- RegisterFragment.getInstance().setSexList(mSexList);
+ SelectDialog.setGenderList(getDictionaryNameList(getList(Dictionary.class)));
}
});
-
}
- private void loadVisitPurposeList() {
+ private void loadVisitReasonList() {
RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
- params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_PURPOSE);
+ params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON);
x.http().get(params, new BaseCommonCallBack() {
public void success() {
- List<Dictionary> items = getList(Dictionary.class);
- for (Dictionary item : items) {
- idMap.put(CommonVariables.DictionaryType.VISIT_PURPOSE+item.getName(), item.getId()+"");
- visitPurposeList.add(item.getName());
- }
- CheckInFragment.getInstance().setVisitPurposeList(visitPurposeList);
+ SelectDialog.setVisitReason(getDictionaryNameList(getList(Dictionary.class)));
}
});
}
+ public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
+ List nameList = new ArrayList();
+ for (Dictionary dictionary : dictionaryList) {
+ idMap.put(dictionary.getName(), dictionary.getId()+"");
+ nameList.add(dictionary.getName());
+ }
+ return nameList;
+ }
}
--
Gitblit v1.8.0