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

Author: guangyao

Utils.js

@@ -85,7 +85,6 @@ class Utils {
         RNNeteaseIm.setupWebViewUserAgent();
     }
 
- }
-
-module.exports = new Utils();
+}
 
+export default new Utils();

im/Friend.js

@@ -134,4 +134,4 @@ class Friend {
         return RNNeteaseIm.removeFromBlackList(contactId);
     }
 }
-module.exports = new Friend();
+export default new Friend();

im/Session.js

@@ -301,4 +301,4 @@ class Session {
         }
     }
 }
-module.exports = new Session();
+export default new Session();

im/SystemMsg.js

@@ -133,4 +133,4 @@ class SystemMsg {
         return RNNeteaseIm.resetSystemMessageUnreadCount();
     }
 }
-module.exports = new SystemMsg();
+export default new SystemMsg();

im/Team.js

@@ -212,4 +212,4 @@ class Team {
         return RNNeteaseIm.updateTeamName(teamId, teamName);
     }
 }
-module.exports = new Team();
+export default new Team();

ios/RNNeteaseIm/RNNeteaseIm.xcodeproj/project.pbxproj

@@ -508,7 +508,7 @@
 				GCC_PREFIX_HEADER = RNNeteaseIm/PrefixHeader.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../react-native/React/**",
-					"$(SRCROOT)/../../../../ios/Pods/**",
+					"$(SRCROOT)/../../../../ios/Pods/Headers/Public/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -523,7 +523,7 @@
 				GCC_PREFIX_HEADER = RNNeteaseIm/PrefixHeader.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../react-native/React/**",
-					"$(SRCROOT)/../../../../ios/Pods/**",
+					"$(SRCROOT)/../../../../ios/Pods/Headers/Public/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";

ios/RNNeteaseIm/RNNeteaseIm/ReactNativePermissions.h

@@ -6,10 +6,10 @@
 //  Copyright © 2016 Yonah Forst. All rights reserved.
 //
 
-#if __has_include("RCTBridgeModule.h")
-  #import "RCTBridgeModule.h"
-#else
+#if __has_include(<React/RCTBridgeModule.h>)
   #import <React/RCTBridgeModule.h>
+#elif __has_include("RCTBridgeModule.h")
+  #import "RCTBridgeModule.h"
 #endif
 
 @interface ReactNativePermissions : NSObject <RCTBridgeModule>