iOS修改单例逻辑

.gitignore

@@ -13,14 +13,14 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+#xcuserdata
 *.xccheckout
 *.moved-aside
 DerivedData
 *.hmap
 *.ipa
-*.xcuserstate
-project.xcworkspace
+#*.xcuserstate
+#project.xcworkspace
 
 # Android/IntelliJ
 #
@@ -50,4 +50,5 @@ buck-out/
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots
+android/src/main/res/drawable/

index.js

@@ -1,6 +1,6 @@
 
 import _AgoraView from './AgoraView'
-import _RTCEngine from './RTCEngine'
+import _RtcEngine from './RtcEngine'
 
 export const AgoraView = _AgoraView;
-export const RTCEngine = _RTCEngine;
+export const RtcEngine = _RtcEngine;

ios/RCTAgora.xcodeproj/project.pbxproj

@@ -9,6 +9,9 @@
 /* Begin PBXBuildFile section */
 		23AF28211EEFECD800D771AB /* RCTAgora.m in Sources */ = {isa = PBXBuildFile; fileRef = 23AF28201EEFECD800D771AB /* RCTAgora.m */; };
 		23AF28221EEFECD800D771AB /* RCTAgora.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 23AF281F1EEFECD800D771AB /* RCTAgora.h */; };
+		23C20DD11F0A6ED80095F60C /* AgoraConst.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C20DCC1F0A6ED80095F60C /* AgoraConst.m */; };
+		23C20DD21F0A6ED80095F60C /* RCTAgoraVideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C20DCE1F0A6ED80095F60C /* RCTAgoraVideoView.m */; };
+		23C20DD31F0A6ED80095F60C /* RCTAgoraViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C20DD01F0A6ED80095F60C /* RCTAgoraViewManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -29,6 +32,12 @@
 		23AF281C1EEFECD800D771AB /* libRCTAgora.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAgora.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		23AF281F1EEFECD800D771AB /* RCTAgora.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTAgora.h; sourceTree = "<group>"; };
 		23AF28201EEFECD800D771AB /* RCTAgora.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTAgora.m; sourceTree = "<group>"; };
+		23C20DCB1F0A6ED80095F60C /* AgoraConst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AgoraConst.h; sourceTree = "<group>"; };
+		23C20DCC1F0A6ED80095F60C /* AgoraConst.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AgoraConst.m; sourceTree = "<group>"; };
+		23C20DCD1F0A6ED80095F60C /* RCTAgoraVideoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAgoraVideoView.h; sourceTree = "<group>"; };
+		23C20DCE1F0A6ED80095F60C /* RCTAgoraVideoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAgoraVideoView.m; sourceTree = "<group>"; };
+		23C20DCF1F0A6ED80095F60C /* RCTAgoraViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAgoraViewManager.h; sourceTree = "<group>"; };
+		23C20DD01F0A6ED80095F60C /* RCTAgoraViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAgoraViewManager.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -62,6 +71,12 @@
 			isa = PBXGroup;
 			children = (
 				23ACF47C1EF0CF9500801BC7 /* libs */,
+				23C20DCB1F0A6ED80095F60C /* AgoraConst.h */,
+				23C20DCC1F0A6ED80095F60C /* AgoraConst.m */,
+				23C20DCD1F0A6ED80095F60C /* RCTAgoraVideoView.h */,
+				23C20DCE1F0A6ED80095F60C /* RCTAgoraVideoView.m */,
+				23C20DCF1F0A6ED80095F60C /* RCTAgoraViewManager.h */,
+				23C20DD01F0A6ED80095F60C /* RCTAgoraViewManager.m */,
 				23AF281F1EEFECD800D771AB /* RCTAgora.h */,
 				23AF28201EEFECD800D771AB /* RCTAgora.m */,
 			);
@@ -126,6 +141,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				23C20DD21F0A6ED80095F60C /* RCTAgoraVideoView.m in Sources */,
+				23C20DD31F0A6ED80095F60C /* RCTAgoraViewManager.m in Sources */,
+				23C20DD11F0A6ED80095F60C /* AgoraConst.m in Sources */,
 				23AF28211EEFECD800D771AB /* RCTAgora.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

ios/RCTAgora/AgoraConst.h

@@ -12,6 +12,8 @@
 
 @property (nonatomic, copy) NSString *appid;
 
+@property (strong, nonatomic) AgoraRtcEngineKit *rtcEngine;
+
 + (instancetype)share;
 
 @end

ios/RCTAgora/RCTAgora.m

@@ -52,6 +52,8 @@ RCT_EXPORT_METHOD(init:(NSDictionary *)options) {
     
     self.rtcEngine = [AgoraRtcEngineKit sharedEngineWithAppId:options[@"appid"] delegate:self];
     
+    [AgoraConst share].rtcEngine = self.rtcEngine;
+    
     //频道模式
     [self.rtcEngine setChannelProfile:[options[@"channelProfile"] integerValue]];
     //启用双流模式

ios/RCTAgora/RCTAgoraVideoView.m

@@ -13,7 +13,7 @@
 - (instancetype)init{
     
     if (self == [super init]) {
-        _rtcEngine =  [AgoraRtcEngineKit sharedEngineWithAppId:[AgoraConst share].appid delegate:nil];
+        _rtcEngine = [AgoraConst share].rtcEngine;
     }
     
     return self;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-agora",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "声网Agora",
   "main": "index.js",
   "scripts": {