From a9c8b39ffcb8f8a5f922cb0fce18861b3463d438 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 四月 2017 11:30:45 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java |  138 +++++++++++++++++++++++++++------------------
 1 files changed, 82 insertions(+), 56 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 9b363f1..4e5da2d 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,22 +1,27 @@
 package cn.com.basic.face.service;
 
 import cn.com.basic.face.dialog.CountryDialog;
-import cn.com.basic.face.fragment.RegisterFragment;
-import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.dialog.SelectDialog;
+import cn.com.basic.face.discern.query.condition.DictionaryQueryCondition;
+import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
 import cn.com.basic.face.util.AppApi;
 
 import org.xutils.http.RequestParams;
 import org.xutils.x;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.entity.Dictionary;
+import cn.com.basic.face.util.CharacterParser;
 
-public class DictionaryMng extends BaseMng {
+public class DictionaryMng {
 
     public static DictionaryMng instance = new DictionaryMng();
 
@@ -24,33 +29,37 @@
         return instance;
     }
 
-    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> 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 Map<String, String> idMap = new HashMap<String, String>();
+
+    public String getId(String name) {
+        return idMap.get(name);
+    }
 
     public void loadAllDictionaryData() {
         loadCountries();
-        loadCredentialsList();
-        loadSexList();
-        loadVisitPurposeList();
+        loadIdTypeList();
+        loadGenderList();
+        loadVisitReasonList();
+        loadVisitorTypeList();
     }
 
     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>>();
+                sortCountries(items);
                 for (Dictionary item : items) {
-                    idMap.put(item.getName(), item.getId()+"");
-                    nationList.add(item.getName());
-                    String firstLetter = item.getRemark();
+                    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();
@@ -58,60 +67,77 @@
                         uniqueFirstLetterList.add(0, firstLetter);
                     }
                     list.add(item.getName());
-                    countryWordData[i] = item.getName();
                     i++;
                 }
                 CountryDialog.setCountries(uniqueFirstLetterList, countriesGroupByFirstLetter);
             }
         });
-
     }
 
-    public void loadCredentialsList() {
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
-        params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.CREDENTIALS);
-        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());
+    private void sortCountries(List<Dictionary> countries) {
+        Collections.sort(countries, new Comparator<Dictionary>() {
+            @Override
+            public int compare(Dictionary t1, Dictionary t2) {
+                String name1 = t1.getName()==null?"":t1.getName();
+                String name2 = t2.getName()==null?"":t2.getName();
+                String dept1Name_a = name1.trim();
+                String dept1Name_b = name2.trim();
+                if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
+                    dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
+                    dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
                 }
-                RegisterFragment.getInstance().setCredentialsList(mCredentialsList);
+                return dept1Name_b.compareTo(dept1Name_a);
             }
         });
     }
 
-    private void loadSexList() {
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
-        params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.SEX);
+    public void loadIdTypeList() {
+        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() {
-                List<Dictionary> items = getList(Dictionary.class);
-                for (Dictionary item : items) {
-                    idMap.put(item.getName(), item.getId()+"");
-                    mSexList.add(item.getName());
-                }
-                RegisterFragment.getInstance().setSexList(mSexList);
-            }
-        });
-
-    }
-
-    private void loadVisitPurposeList() {
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
-        params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_PURPOSE);
-        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.setIdTypeList(getDictionaryNameList(getList(Dictionary.class)));
             }
         });
     }
 
+    private void loadGenderList() {
+        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)));
+            }
+        });
+    }
+
+    public void loadVisitReasonList() {
+        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)));
+            }
+        });
+    }
+
+    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());
+        }
+        return nameList;
+    }
+
+    private void loadVisitorTypeList() {
+        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() {
+                SelectDialog.setVisitorTypeList(getDictionaryNameList(getList(Dictionary.class)));
+            }
+        });
+    }
 
 }

--
Gitblit v1.8.0