更新iOS Demo 源码

shengcui2018 · shengcui2018 · commit 8123416ef736 · 2019-01-11T21:38:32.000+08:00
diff --git a/iOS/TRTCDemo/TRTC/TRTCMainViewController.m b/iOS/TRTCDemo/TRTC/TRTCMainViewController.m
@@ -332,7 +332,7 @@ - (void)enterRoom {
     [self toastTip:@"开始进房"];
     
     // 进房
-    [_trtc enterRoom:self.param];
+    [_trtc enterRoom:self.param appScene:TRTCAppSceneVideoCall];
 }
 
 - (void)onStatistics:(TRTCStatistics *)statistics
diff --git a/iOS/TRTCDemo/TRTC/TRTCNewViewController.m b/iOS/TRTCDemo/TRTC/TRTCNewViewController.m
@@ -39,7 +39,9 @@ @implementation TRTCNewViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.title = @"TRTC";
+    self.title = @"腾讯视频通话";
+    
+    
     [self.view setBackgroundColor:UIColorFromRGB(0x333333)];
     
     _tipLabel = [[UILabel alloc] initWithFrame:CGRectMake(18, 100, 200, 30)];
@@ -209,6 +211,7 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     [self.view endEditing:NO];
 }
 
+
 #pragma mark - picker
 - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
 {
diff --git a/iOS/TRTCDemo/TRTC/TRTCSettingViewController.m b/iOS/TRTCDemo/TRTC/TRTCSettingViewController.m
@@ -14,7 +14,6 @@
 #define TRTC_SETTING_FPS        @"TRTC_SETTING_FPS"
 #define TRTC_SETTING_BITRATE    @"TRTC_SETTING_BITRATE"
 #define TRTC_SETTING_QOS_TYPE   @"TRTC_SETTING_QOS_TYPE"
-#define TRTC_SETTING_QOS_CTRL_TYPE   @"TRTC_SETTING_QOS_CTRL_TYPE" // 客户端控、云控
 #define TRTC_SETTING_ENABLE_SMALL_STREAM    @"TRTC_SETTING_ENABLE_SMALL_STREAM"
 #define TRTC_SETTING_PRIOR_SMALL_STREAM     @"TRTC_SETTING_PRIOR_SMALL_STREAM"
 
@@ -63,7 +62,6 @@ @interface TRTCSettingViewController () <UITableViewDelegate, UITableViewDataSou
     int _selectResolution;
     int _selectBitrate;
     int _selectFps;
-    int _selectCtrlQos;
     int _selectQosType;
     
     UIActionSheet *_actionSheet;
@@ -183,11 +181,7 @@ + (int)getQosType {
 }
 
 + (int)getQosCtrlType {
-    NSNumber *d = [[NSUserDefaults standardUserDefaults] objectForKey:TRTC_SETTING_QOS_CTRL_TYPE];
-    if (d != nil) {
-        return [d intValue];
-    }
-    return 0;
+    return TRTCQosControlModeServer;
 }
 
 + (BOOL)getEnableSmallStream {
@@ -228,7 +222,6 @@ - (void)onClickedOK:(id)sender {
         [[NSUserDefaults standardUserDefaults] setObject:@(_selectResolution) forKey:TRTC_SETTING_RESOLUTION];
         [[NSUserDefaults standardUserDefaults] setObject:@(_selectFps) forKey:TRTC_SETTING_FPS];
         [[NSUserDefaults standardUserDefaults] setObject:@(_selectBitrate) forKey:TRTC_SETTING_BITRATE];
-        [[NSUserDefaults standardUserDefaults] setObject:@(_selectCtrlQos) forKey:TRTC_SETTING_QOS_CTRL_TYPE];
         [[NSUserDefaults standardUserDefaults] setObject:@(_selectQosType) forKey:TRTC_SETTING_QOS_TYPE];
         [[NSUserDefaults standardUserDefaults] setObject:@(_smallStreamSwitch.on) forKey:TRTC_SETTING_ENABLE_SMALL_STREAM];
         [[NSUserDefaults standardUserDefaults] setObject:@(_priorSmallStreamSwitch.on) forKey:TRTC_SETTING_PRIOR_SMALL_STREAM];

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ - (void)enterRoom {`
`332`	`332`	`[self toastTip:@"开始进房"];`
`333`	`333`
`334`	`334`	`// 进房`
`335`		`- [_trtc enterRoom:self.param];`
	`335`	`+ [_trtc enterRoom:self.param appScene:TRTCAppSceneVideoCall];`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`- (void)onStatistics:(TRTCStatistics *)statistics`