Merge branch 'master' of https://github.com/reactnativecomponent/react-native-netease-im

guangyao · guangyao · commit 9d45df82c7a3 · 2017-07-24T17:25:54.000+08:00
diff --git a/android/src/main/java/com/netease/im/ReactCache.java b/android/src/main/java/com/netease/im/ReactCache.java
@@ -93,7 +93,11 @@ public static ReactContext getReactContext() {
     }
 
     public static void emit(String eventName, Object date) {
-        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, date);
+        try {
+            reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static Object createRecentList(List<RecentContact> recents, int unreadNum) {
@@ -114,6 +118,7 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                 String name = "";
                 SessionTypeEnum sessionType = contact.getSessionType();
                 String imagePath = "";
+                Team team = null;
                 if (sessionType == SessionTypeEnum.P2P) {
                     map.putString("teamType", "-1");
                     NimUserInfoCache nimUserInfoCache = NimUserInfoCache.getInstance();
@@ -122,7 +127,7 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                     map.putString("mute", boolean2String(NIMClient.getService(FriendService.class).isNeedMessageNotify(contactId)));
                     name = nimUserInfoCache.getUserDisplayName(contactId);
                 } else if (sessionType == SessionTypeEnum.Team) {
-                    Team team = TeamDataCache.getInstance().getTeamById(contactId);
+                    team = TeamDataCache.getInstance().getTeamById(contactId);
                     if (team != null) {
                         name = team.getName();
                         map.putString("teamType", Integer.toString(team.getType().getValue()));
@@ -168,7 +173,7 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                         }
                         break;
                     case notification:
-                        if (sessionType == SessionTypeEnum.Team) {
+                        if (sessionType == SessionTypeEnum.Team && team != null) {
                             content = TeamNotificationHelper.getTeamNotificationText(contact.getContactId(),
                                     contact.getFromAccount(),
                                     (NotificationAttachment) contact.getAttachment());
@@ -724,7 +729,12 @@ public static WritableMap createMessage(IMMessage item) {
 
         WritableMap user = Arguments.createMap();
         String fromAccount = item.getFromAccount();
-        String fromNick = item.getFromNick();
+        String fromNick = null;
+        try {
+            fromNick = item.getFromNick();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         user.putString("_id", fromAccount);
 
         if (item.getSessionType() == SessionTypeEnum.Team && !TextUtils.equals(LoginService.getInstance().getAccount(), fromAccount)) {
diff --git a/android/src/main/java/com/netease/im/common/ImageLoaderKit.java b/android/src/main/java/com/netease/im/common/ImageLoaderKit.java
@@ -23,7 +23,6 @@
 import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
 import com.nostra13.universalimageloader.core.download.ImageDownloader;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-import com.nostra13.universalimageloader.utils.DiskCacheUtils;
 import com.nostra13.universalimageloader.utils.MemoryCacheUtils;
 import com.nostra13.universalimageloader.utils.StorageUtils;
 
@@ -196,17 +195,18 @@ private static Bitmap getMemoryCachedAvatarBitmap(String url) {
         return null;
     }
 
-    public static String getMemoryCachedAvatar(String url) {
-        if (url == null || !isImageUriValid(url)) {
-            return "";
-        }
-        String key = getAvatarCacheKey(url);
-
-        File file = DiskCacheUtils.findInCache(key, ImageLoader.getInstance().getDiskCache());// 查询磁盘缓存示例
-        if (file == null) {
-//            asyncLoadAvatarBitmapToCache(url);
-        }
-        return file == null ? "" : file.getAbsolutePath();
+    public static String getMemoryCachedAvatar(String url) {//TODO
+        return "";
+//        if (url == null || !isImageUriValid(url)) {
+//            return "";
+//        }
+//        String key = getAvatarCacheKey(url);
+//
+//        File file = DiskCacheUtils.findInCache(key, ImageLoader.getInstance().getDiskCache());// 查询磁盘缓存示例
+//        if (file == null) {
+////            asyncLoadAvatarBitmapToCache(url);
+//        }
+//        return file == null ? "" : file.getAbsolutePath();
     }
 
     private static Set<String> cacheLoad = new HashSet<>();
diff --git a/android/src/main/java/com/netease/im/contact/BlackListObserver.java b/android/src/main/java/com/netease/im/contact/BlackListObserver.java
@@ -25,11 +25,13 @@ public void startBlackList() {
         items.clear();
         final List<String> accounts = NIMClient.getService(FriendService.class).getBlackList();
         List<String> unknownAccounts = new ArrayList<>();
-        for (String contactId : accounts) {
-            if (!NimUserInfoCache.getInstance().hasUser(contactId)) {
-                unknownAccounts.add(contactId);
-            } else {
-                items.add(NimUserInfoCache.getInstance().getUserInfo(contactId));
+        if (accounts != null) {
+            for (String contactId : accounts) {
+                if (!NimUserInfoCache.getInstance().hasUser(contactId)) {
+                    unknownAccounts.add(contactId);
+                } else {
+                    items.add(NimUserInfoCache.getInstance().getUserInfo(contactId));
+                }
             }
         }
 
@@ -53,33 +55,36 @@ public void removeFromBlackList(final String contactId, final RequestCallbackWra
                 .setCallback(new RequestCallbackWrapper<Void>() {
                     @Override
                     public void onResult(int code, Void aVoid, Throwable throwable) {
-                        if(callbackWrapper!=null){
-                            callbackWrapper.onResult(code,aVoid,throwable);
+                        if (callbackWrapper != null) {
+                            callbackWrapper.onResult(code, aVoid, throwable);
                         }
                         if (code == ResponseCode.RES_SUCCESS) {
                             removeBlackList(contactId);
                         }
                     }
                 });
     }
+
     public void addToBlackList(final String contactId, final RequestCallbackWrapper<Void> callbackWrapper) {
         NIMClient.getService(FriendService.class).addToBlackList(contactId)
                 .setCallback(new RequestCallbackWrapper<Void>() {
                     @Override
                     public void onResult(int code, Void aVoid, Throwable throwable) {
-                        if(callbackWrapper!=null){
-                            callbackWrapper.onResult(code,aVoid,throwable);
+                        if (callbackWrapper != null) {
+                            callbackWrapper.onResult(code, aVoid, throwable);
                         }
                         if (code == ResponseCode.RES_SUCCESS) {
                             addBlackList(contactId);
                         }
                     }
                 });
     }
-    void addBlackList(String contactId){
+
+    void addBlackList(String contactId) {
         items.add(NimUserInfoCache.getInstance().getUserInfo(contactId));
         refresh();
     }
+
     private void removeBlackList(String contactId) {
 
         int index = -1;
@@ -98,6 +103,7 @@ private void removeBlackList(String contactId) {
 
         refresh();
     }
+
     void refresh() {
         ReactCache.emit(ReactCache.observeBlackList, ReactCache.createBlackList(items));
     }

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,13 @@ public void startBlackList() {`
`25`	`25`	`items.clear();`
`26`	`26`	`final List<String> accounts = NIMClient.getService(FriendService.class).getBlackList();`
`27`	`27`	`List<String> unknownAccounts = new ArrayList<>();`
`28`		`- for (String contactId : accounts) {`
`29`		`- if (!NimUserInfoCache.getInstance().hasUser(contactId)) {`
`30`		`- unknownAccounts.add(contactId);`
`31`		`- } else {`
`32`		`- items.add(NimUserInfoCache.getInstance().getUserInfo(contactId));`
	`28`	`+ if (accounts != null) {`
	`29`	`+ for (String contactId : accounts) {`
	`30`	`+ if (!NimUserInfoCache.getInstance().hasUser(contactId)) {`
	`31`	`+ unknownAccounts.add(contactId);`
	`32`	`+ } else {`
	`33`	`+ items.add(NimUserInfoCache.getInstance().getUserInfo(contactId));`
	`34`	`+ }`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`
`@@ -53,33 +55,36 @@ public void removeFromBlackList(final String contactId, final RequestCallbackWra`
`53`	`55`	`.setCallback(new RequestCallbackWrapper<Void>() {`
`54`	`56`	`@Override`
`55`	`57`	`public void onResult(int code, Void aVoid, Throwable throwable) {`
`56`		`- if(callbackWrapper!=null){`
`57`		`- callbackWrapper.onResult(code,aVoid,throwable);`
	`58`	`+ if (callbackWrapper != null) {`
	`59`	`+ callbackWrapper.onResult(code, aVoid, throwable);`
`58`	`60`	`}`
`59`	`61`	`if (code == ResponseCode.RES_SUCCESS) {`
`60`	`62`	`removeBlackList(contactId);`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`	`});`
`64`	`66`	`}`
	`67`	`+`
`65`	`68`	`public void addToBlackList(final String contactId, final RequestCallbackWrapper<Void> callbackWrapper) {`
`66`	`69`	`NIMClient.getService(FriendService.class).addToBlackList(contactId)`
`67`	`70`	`.setCallback(new RequestCallbackWrapper<Void>() {`
`68`	`71`	`@Override`
`69`	`72`	`public void onResult(int code, Void aVoid, Throwable throwable) {`
`70`		`- if(callbackWrapper!=null){`
`71`		`- callbackWrapper.onResult(code,aVoid,throwable);`
	`73`	`+ if (callbackWrapper != null) {`
	`74`	`+ callbackWrapper.onResult(code, aVoid, throwable);`
`72`	`75`	`}`
`73`	`76`	`if (code == ResponseCode.RES_SUCCESS) {`
`74`	`77`	`addBlackList(contactId);`
`75`	`78`	`}`
`76`	`79`	`}`
`77`	`80`	`});`
`78`	`81`	`}`
`79`		`- void addBlackList(String contactId){`
	`82`	`+`
	`83`	`+ void addBlackList(String contactId) {`
`80`	`84`	`items.add(NimUserInfoCache.getInstance().getUserInfo(contactId));`
`81`	`85`	`refresh();`
`82`	`86`	`}`
	`87`	`+`
`83`	`88`	`private void removeBlackList(String contactId) {`
`84`	`89`
`85`	`90`	`int index = -1;`
`@@ -98,6 +103,7 @@ private void removeBlackList(String contactId) {`
`98`	`103`
`99`	`104`	`refresh();`
`100`	`105`	`}`
	`106`	`+`
`101`	`107`	`void refresh() {`
`102`	`108`	`ReactCache.emit(ReactCache.observeBlackList, ReactCache.createBlackList(items));`
`103`	`109`	`}`