Merge pull request #51 from froyomu/master

QIMSDk增加支持本地人员和群搜索的api;

Author: froyomu

imlib/src/main/java/com/qunar/im/ui/sdk/QIMSdk.java

@@ -12,6 +12,8 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.ViewTarget;
 import com.facebook.imagepipeline.core.ImagePipelineFactory;
+import com.qunar.im.base.module.IMGroup;
+import com.qunar.im.base.module.Nick;
 import com.qunar.im.log.LogDatabaseManager;
 import com.qunar.im.ui.presenter.impl.QChatLoginPresenter;
 import com.qunar.im.utils.ConnectionUtil;
@@ -342,6 +344,24 @@ public Fragment getContactsFragment(){
         return QtalkNavicationService.getInstance().getNavConfigResult().RNAndroidAbility.RNContactView ? new RNContactsFragment() : new BuddiesFragment();
     }
 
+    /**
+     * 搜索本地组织架构人员
+     * @param ser 关键字
+     * @param limit
+     */
+    public List<Nick> searchLocalUser(String ser, int limit){
+        return ConnectionUtil.getInstance().SelectContactsByLike(ser,limit);
+    }
+
+    /**
+     * 搜索本地群组
+     * @param ser 关键字
+     * @param limit
+     */
+    public List<IMGroup> searchLocalMuc(String ser, int limit){
+        return ConnectionUtil.getInstance().SelectIMGroupByLike(ser,limit);
+    }
+
     /**
      * 无domain的userid
      * @return

imlib/src/main/java/com/qunar/im/ui/util/EmotionUtils.java

@@ -122,6 +122,7 @@ public static boolean isExistsEmoticon(String shortCut, String pkgId, boolean ch
             return false;
         } else {
             if (defaultEmotion!=null&&defaultEmotion.packgeId.equals(pkgId)) return defaultEmotion.containKey(shortCut);
+            else if(defaultEmotion1 !=null && defaultEmotion1.packgeId.equals(pkgId)) return defaultEmotion1.containKey(shortCut);
             return checkExt && pkgId2Name.containsKey(pkgId) &&
                     extEmotions.containsKey(pkgId2Name.get(pkgId))
                     && extEmotions.get(pkgId2Name.get(pkgId)).containKey(shortCut);