SKJuphoon->VideoManager

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

@@ -38,7 +38,7 @@
     
     JCClientLoginParam* loginParam = [[JCClientLoginParam alloc] init];
     BOOL isOK = [self.mJuphoonClient login:uid password:password loginParam:loginParam];
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: login call: %d", isOK]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: login call: %d", isOK]));
 }
 
 - (void)logoutJuphoon {
@@ -61,7 +61,7 @@
  */
 - (void)onLogin:(bool)result reason:(JCClientReason)reason {
     @weakify(self);
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: login Result:%d Reason:%ld", result, reason]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: login Result:%d Reason:%ld", result, reason]));
     if (result) {// 登录成功
         
     } else if (reason == JCClientReasonAuth) {// 账号密码错误
@@ -85,7 +85,7 @@
  * @param reason 登出失败原因，参见：@ref JCClientReason  "错误原因"
  */
 - (void)onLogout:(JCClientReason)reason {
-    HDNormalLog(@"SKJuphoon: onLogout");
+    HDNormalLog(@"VideoManager: onLogout");
 }
 
 /**
@@ -116,7 +116,7 @@
  * @param item JCCallItem 对象
  */
 - (void)onCallItemAdd:(JCCallItem* __nonnull)item {
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: onCallItemAdd direction: %ld", (long)item.direction]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: onCallItemAdd direction: %ld", (long)item.direction]));
     NSDictionary *dic = @{kCallIetmKey:item};
     [[NSNotificationCenter defaultCenter] postNotificationName:kCallNotification object:nil userInfo:dic];
     if (self.mJuphoonCall.callItems.count == 1) {
@@ -134,7 +134,7 @@
  * @param description 通话结束原因的描述，只有被动挂断的时候，才会收到这个值，其他情况下则返回空字符串
  */
 - (void)onCallItemRemove:(JCCallItem *)item reason:(JCCallReason)reason description:(NSString *)description {
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: onCallItemRemove reason:%ld", reason]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: onCallItemRemove reason:%ld", reason]));
     [[NSNotificationCenter defaultCenter] postNotificationName:kCallNotification object:nil];
     [self removeInCallVC];
     switch (reason) {

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

@@ -36,7 +36,7 @@
 }
 
 - (void)requestVideo:(NSString*)sid ticket:(NSString*)ticket dial:(NSInteger)dial {
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: requestVideo ticket:%@ dial:%ld", ticket, dial]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: requestVideo ticket:%@ dial:%ld", ticket, dial]));
     NSDictionary *param = @{
         @"sid":sid,
         @"roomId":ticket,
@@ -59,7 +59,7 @@
         [EasyTextView showErrorText:NSLocalizedString(@"Network.Error", nil)];
         return;
     }
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: videoStart: sid:%@  ticket:%@  dial:%ld", sid, ticket, dial]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: videoStart: sid:%@  ticket:%@  dial:%ld", sid, ticket, dial]));
     self.mSID = sid;
     self.mTicket = ticket;
     JCCallParam* callParam = [JCCallParam callParamWithExtraParam:@"" ticket:ticket];
@@ -75,7 +75,7 @@
 }
 
 - (void)videoEnd:(BOOL)isIncomming isSendMessage:(BOOL)isSendMessage {
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: videoEnd:%d", isIncomming]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: videoEnd:%d", isIncomming]));
     //发消息
     if (isSendMessage) {
         JCCallItem *activeCall = self.mJuphoonCall.callItems.firstObject;
@@ -106,7 +106,7 @@
 - (void)showInCallVC {
     if (self.mInCallVC)
         return;
-    NSLog(@"SKJuphoon: showInCallVC");
+    NSLog(@"VideoManager: showInCallVC");
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
     self.mInCallVC = [storyboard instantiateViewControllerWithIdentifier:@"InCallVC"];
     [self.mInCallVC setHidesBottomBarWhenPushed:YES];

artimenring-iOS/Artimenring/Classes/ViewController/Call/SKInCallViewController.m

@@ -117,7 +117,7 @@
 - (void)updateUI:(NSNotification *)noti {
     NSInteger count = [VideoManager shared].mJuphoonCall.callItems.count;
     JCCallItem *activeCall = [VideoManager shared].mJuphoonCall.callItems.firstObject;
-    HDNormalLog(([NSString stringWithFormat:@"SKJuphoon: updateUI count:%ld updateUI: %ld", count, activeCall.state]));
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: updateUI count:%ld updateUI: %ld", count, activeCall.state]));
 
     if (activeCall.state == JCCallStateInit || activeCall.state == JCCallStatePending) {