Sfoglia il codice sorgente

视频 manager兼容, 拆分出 view

liuzhenxing1118 7 mesi fa
parent
commit
61627108f1

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

@@ -8,6 +8,7 @@
 
 #import "VideoManager+juphoon.h"
 #import "VideoManager+timer.h"
+#import "VideoManager+view.h"
 
 #define APP_KEY_JUPHOON @"99c9063b9f54482e1d586e08" //@"75e06df8717cb0df36b35097"
 #define kCallIetmKey @"kCallIetmKey"

+ 20 - 0
artimenring-iOS/Artimenring/Classes/Data/VideoManager+view.h

@@ -0,0 +1,20 @@
+//
+//  VideoManager+view.h
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/18.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "VideoManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VideoManager (view)
+
+- (void)showInCallVC;
+- (void)removeInCallVC;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 30 - 0
artimenring-iOS/Artimenring/Classes/Data/VideoManager+view.m

@@ -0,0 +1,30 @@
+//
+//  VideoManager+view.m
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/18.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "VideoManager+view.h"
+
+@implementation VideoManager (view)
+
+- (void)showInCallVC {
+    if (self.mInCallVC)
+        return;
+    NSLog(@"VideoManager: showInCallVC");
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
+    self.mInCallVC = [storyboard instantiateViewControllerWithIdentifier:@"InCallVC"];
+    [self.mInCallVC setHidesBottomBarWhenPushed:YES];
+    [EUtil pushViewController:self.mInCallVC animated:YES];
+}
+
+- (void)removeInCallVC {
+    if (self.mInCallVC) {
+        [self.mInCallVC.navigationController popViewControllerAnimated:YES];
+    }
+    self.mInCallVC = nil;
+}
+
+@end

+ 0 - 2
artimenring-iOS/Artimenring/Classes/Data/VideoManager.h

@@ -50,8 +50,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)actionFromSocket:(SocketModel*)model dial:(NSInteger)dial;
 - (void)termWithTimeout;
-- (void)showInCallVC;
-- (void)removeInCallVC;
 
 - (BOOL)isVideoTalking;
 - (JCCallItem*)getActiveCall;

+ 1 - 17
artimenring-iOS/Artimenring/Classes/Data/VideoManager.m

@@ -11,6 +11,7 @@
 #import "VideoManager+agora.h"
 #import "VideoManager+http.h"
 #import "VideoManager+timer.h"
+#import "VideoManager+view.h"
 
 @implementation VideoManager
 
@@ -138,23 +139,6 @@
     }
 }
 
-- (void)showInCallVC {
-    if (self.mInCallVC)
-        return;
-    NSLog(@"VideoManager: showInCallVC");
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
-    self.mInCallVC = [storyboard instantiateViewControllerWithIdentifier:@"InCallVC"];
-    [self.mInCallVC setHidesBottomBarWhenPushed:YES];
-    [EUtil pushViewController:self.mInCallVC animated:YES];
-}
-
-- (void)removeInCallVC {
-    if (self.mInCallVC) {
-        [self.mInCallVC.navigationController popViewControllerAnimated:YES];
-    }
-    self.mInCallVC = nil;
-}
-
 - (BOOL)isVideoTalking {
     DeviceModel* model = [[DataManager shared] getDeviceWithTicket:self.mTicket];
     if (model.videoType == VIDEO_TYPE_JUPHOON) {

+ 6 - 0
artimenring-iOS/SikeyComm.xcodeproj/project.pbxproj

@@ -181,6 +181,7 @@
 		E4010C2E2BEA3C4C00C0A23F /* video_start.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E4010C2C2BEA3C4C00C0A23F /* video_start.mp3 */; };
 		E41849612B8C8CCB000C18DB /* SKAlarmClockTitleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E41849602B8C8CCB000C18DB /* SKAlarmClockTitleViewController.m */; };
 		E418538B2D64745B00F9C739 /* VideoManager+http.m in Sources */ = {isa = PBXBuildFile; fileRef = E418538A2D64745B00F9C739 /* VideoManager+http.m */; };
+		E418538E2D64767100F9C739 /* VideoManager+view.m in Sources */ = {isa = PBXBuildFile; fileRef = E418538D2D64767100F9C739 /* VideoManager+view.m */; };
 		E41ECB5C2CF95C6C00C4C36C /* SKMainViewController+location.m in Sources */ = {isa = PBXBuildFile; fileRef = E41ECB4C2CF95C6B00C4C36C /* SKMainViewController+location.m */; };
 		E41ECB5D2CF95C6C00C4C36C /* SKMainViewController+realpos.m in Sources */ = {isa = PBXBuildFile; fileRef = E41ECB4D2CF95C6B00C4C36C /* SKMainViewController+realpos.m */; };
 		E41ECB5E2CF95C6C00C4C36C /* SKMainViewController+banner.m in Sources */ = {isa = PBXBuildFile; fileRef = E41ECB4E2CF95C6B00C4C36C /* SKMainViewController+banner.m */; };
@@ -710,6 +711,8 @@
 		E41849602B8C8CCB000C18DB /* SKAlarmClockTitleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKAlarmClockTitleViewController.m; sourceTree = "<group>"; };
 		E41853892D64745B00F9C739 /* VideoManager+http.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "VideoManager+http.h"; sourceTree = "<group>"; };
 		E418538A2D64745B00F9C739 /* VideoManager+http.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "VideoManager+http.m"; sourceTree = "<group>"; };
+		E418538C2D64767100F9C739 /* VideoManager+view.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "VideoManager+view.h"; sourceTree = "<group>"; };
+		E418538D2D64767100F9C739 /* VideoManager+view.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "VideoManager+view.m"; sourceTree = "<group>"; };
 		E41ECB4C2CF95C6B00C4C36C /* SKMainViewController+location.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SKMainViewController+location.m"; sourceTree = "<group>"; };
 		E41ECB4D2CF95C6B00C4C36C /* SKMainViewController+realpos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SKMainViewController+realpos.m"; sourceTree = "<group>"; };
 		E41ECB4E2CF95C6B00C4C36C /* SKMainViewController+banner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SKMainViewController+banner.m"; sourceTree = "<group>"; };
@@ -2409,6 +2412,8 @@
 				E4499A7F2D5B4DF000653B56 /* VideoManager+ringtone.m */,
 				E4499A802D5B4DF000653B56 /* VideoManager+timer.h */,
 				E4499A812D5B4DF000653B56 /* VideoManager+timer.m */,
+				E418538C2D64767100F9C739 /* VideoManager+view.h */,
+				E418538D2D64767100F9C739 /* VideoManager+view.m */,
 			);
 			path = Data;
 			sourceTree = "<group>";
@@ -3203,6 +3208,7 @@
 				E4499A822D5B4DF000653B56 /* VideoManager+ringtone.m in Sources */,
 				E4B1123A2B9B269900F48C90 /* EBaseHeaderTitleView.m in Sources */,
 				2731415B1FCD3A8F004AA5F4 /* SKWatchViewController.m in Sources */,
+				E418538E2D64767100F9C739 /* VideoManager+view.m in Sources */,
 				E4FE9B882AD9465100DEABCA /* FMDatabaseQueue.m in Sources */,
 				E459F0872B6B3D16002571E3 /* WatchSMSRecordViewController.m in Sources */,
 				E4B1123B2B9B269900F48C90 /* BaseCheckboxCell.m in Sources */,