xuxiuxi

2017-04-12 fae4c47aa2842f08294d0eaaf9aef4df4001c111

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java

@@ -34,10 +34,18 @@
                String prev = "";

                for (int i = 0; i < list.size(); i++) {

                    PhoneCallQueryItem item = list.get(i);

                    if (isSortByDept) {

                        name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);

                    } else {

                        name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);

                    try {

                        if (isSortByDept) {

                            if (item.getDeptName() != null && item.getDeptName().length() > 0) {

                                name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);

                            }

                        } else {

                            if (item.getUsername() != null && item.getUsername().length() > 0) {

                                name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);

                            }

                        }

                    } catch (Exception e) {



                    }

                    if (!name.equals(prev)) {

                        allItems.add(name);

@@ -58,15 +66,23 @@
                    String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();

                    String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();

                    if(!dept1Name.equals(dept2Name)) {

                        String dept1Name_a = CharacterParser.getInstance().getSelling(dept1Name).toLowerCase();

                        String dept1Name_b = CharacterParser.getInstance().getSelling(dept2Name).toLowerCase();

                        String dept1Name_a = dept1Name.trim();

                        String dept1Name_b = dept2Name.trim();

                        if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {

                            dept1Name_a = CharacterParser.getInstance().getSelling(dept1Name).toLowerCase();

                            dept1Name_b = CharacterParser.getInstance().getSelling(dept2Name).toLowerCase();

                        }

                        return dept1Name_a.compareTo(dept1Name_b);

                    }

                }

                String name1 = t1.getUsername()==null?"":t1.getUsername();

                String name2 = t2.getUsername()==null?"":t2.getUsername();

                String dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();

                String dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();

                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_a.compareTo(dept1Name_b);

            }

        });