修复视频通话socket解析

artimenring-iOS/Artimenring/Classes/Data/VideoManager+socket.m

@@ -20,12 +20,14 @@
         }
     } else {
         if (self.uid.length > 0 && self.mTicket.length > 0) {
-            [EasyTextView showInfoText:NSLocalizedString(@"Video.Error.User.Busy", nil)];
+            //[EasyTextView showInfoText:NSLocalizedString(@"Video.Error.User.Busy", nil)];
+            [self termWithRefuse];
         } else {
+            SocketContentModel* content = [SocketContentModel mj_objectWithKeyValues:model.content];
+            self.mToken = content.videoCallToken;
+            self.roomId = content.roomId;
             self.uid = [DataManager shared].loginModel.uid;
             self.mTicket = [[DataManager shared] getDevice:model.sendId].ticket;
-            self.mToken = ((SocketContentModel*)model.content).token;
-            self.roomId = ((SocketContentModel*)model.content).roomId;
             [self videoCallIn];
         }
     }

artimenring-iOS/Artimenring/Classes/Data/VideoManager.h

@@ -52,6 +52,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)termWithSelf;
 - (void)termWithOther;
 - (void)termWithTimeout;
+//别人呼叫我，我拒接
+- (void)termWithRefuse;
 
 - (BOOL)isVideoTalking;
 - (NSString*)getTalkName;

artimenring-iOS/Artimenring/Classes/Data/VideoManager.m

@@ -32,6 +32,10 @@
 - (void)clearManager {
     [self logoutJuphoon];
     [self clearAgora];
+    [self clearValue];
+}
+
+- (void)clearValue {
     self.uid = @"";
     self.mTicket = @"";
     self.mToken = @"";
@@ -110,6 +114,12 @@
     [self term];
 }
 
+//别人呼叫我，我拒接
+- (void)termWithRefuse {
+    [self requestVideo:self.uid ticket:self.mTicket dial:-1 callback:^(BOOL isOK, NSString *token) {
+    }];
+}
+
 - (void)term {
     DeviceModel* model = [[DataManager shared] getDeviceWithTicket:self.mTicket];
     if (model.videoType == VIDEO_TYPE_JUPHOON) {
@@ -119,6 +129,7 @@
         [self termAgora];
         [self removeInCallVC];
     }
+    [self clearValue];
 }
 
 - (void)switchCamera {

artimenring-iOS/Artimenring/Classes/Model/EModel.h

@@ -308,12 +308,6 @@ typedef enum : NSUInteger {
 - (NSArray*)getMembersAvatars;
 @end
 
-@interface SocketContentModel : BaseModel
-@property(nonatomic, copy) NSString* raw;
-@property(nonatomic, copy) NSString* token;
-@property(nonatomic, copy) NSString* roomId;
-@end
-
 @interface SocketModel : BaseModel
 @property(nonatomic, assign) NSInteger msgType;
 @property(nonatomic, assign) double sendTime;
@@ -323,11 +317,20 @@ typedef enum : NSUInteger {
 @property(nonatomic, copy) id content;
 @end
 
+@interface SocketContentModel : BaseModel
+@property(nonatomic, copy) NSString* raw;
+@property(nonatomic, copy) NSString* videoCallToken;
+@property(nonatomic, copy) NSString* roomId;
+@end
+
 @interface SocketChatModel : SocketModel
 @property(nonatomic, copy) NSString* messageId;
 @property(nonatomic, copy) NSString* sessionId;
 @end
 
+@interface SocketVideoModel : BaseModel
+@end
+
 @interface SocketCoordinatesModel : BaseCoordinatesModel
 @property(nonatomic, copy) NSString* lon;
 @property(nonatomic, copy) NSString* lat;

artimenring-iOS/Artimenring/Classes/Model/EModel.m

@@ -266,7 +266,7 @@
     if (self) {
         self.did = -1;
         self.match = [[CloudMatchModel alloc] init];
-        self.videoType = VIDEO_TYPE_JUPHOON;
+        self.videoType = VIDEO_TYPE_AGORA;
     }
     return self;
 }

artimenring-iOS/SikeyComm.xcodeproj/project.pbxproj

@@ -3434,7 +3434,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = YHJXY25X52;
 				ENABLE_BITCODE = NO;
@@ -3499,7 +3499,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = YHJXY25X52;
 				ENABLE_BITCODE = NO;
@@ -3626,7 +3626,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = YHJXY25X52;
 				ENABLE_BITCODE = NO;