From 610a326b47ca65ab71f76fd09b2a01f1ef788379 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 12 四月 2017 11:36:02 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 c2b9799..e1ff676 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
@@ -3,13 +3,15 @@
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.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;
@@ -17,6 +19,7 @@
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 {
@@ -49,9 +52,14 @@
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.getRemark();
+
+ 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();
@@ -64,7 +72,23 @@
CountryDialog.setCountries(uniqueFirstLetterList, countriesGroupByFirstLetter);
}
});
+ }
+ 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();
+ }
+ return dept1Name_b.compareTo(dept1Name_a);
+ }
+ });
}
public void loadIdTypeList() {
--
Gitblit v1.8.0