修改了iOS10打开相机crash的问题，在info.plist增加相机和麦克风权限即可。

修复了键盘弹出的bug。修复了search界面适配的问题。
liamxujia · Nov 3, 2016 · 9149113 · 9149113
1 parent d1dfeb4
commit 9149113
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 16 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/高仿映客.xcodeproj/project.pbxproj b/高仿映客.xcodeproj/project.pbxproj
@@ -2541,6 +2541,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = LZGGBJSZG3;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2558,7 +2559,7 @@
 					"$(PROJECT_DIR)/Framework",
 					"$(PROJECT_DIR)/高仿映客/Class/Main/Libs/librtmp-iOS/lib",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.xujiahehehe;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xujiahehehe.1228;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2568,6 +2569,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = LZGGBJSZG3;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2585,7 +2587,7 @@
 					"$(PROJECT_DIR)/Framework",
 					"$(PROJECT_DIR)/高仿映客/Class/Main/Libs/librtmp-iOS/lib",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.xujiahehehe;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xujiahehehe.1228;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

diff --git a/高仿映客/Class/Camera/Controller/CameraViewController.m b/高仿映客/Class/Camera/Controller/CameraViewController.m
@@ -20,14 +20,17 @@ @interface CameraViewController ()
 
 @implementation CameraViewController
 
+- (void)viewDidDisappear:(BOOL)animated {
+    //隐藏状态栏
+    [[UIApplication sharedApplication] setStatusBarHidden:TRUE];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
 
     //设置背景图片高斯模糊
     [self gaussianImage];
 
-    //隐藏状态栏
-    [[UIApplication sharedApplication] setStatusBarHidden:TRUE];
+
 
     //设置键盘TextField
     [self setupTextField];
@@ -62,17 +65,24 @@ - (void)gaussianImage {
 - (IBAction)backMain {
 
     [self dismissViewControllerAnimated:YES completion:nil];
+
+    // 显示状态栏
+    [[UIApplication sharedApplication] setStatusBarHidden:false];
 }
 
 //开始直播采集
 - (IBAction)startLiveStream {
 
     StartLiveView *view = [[StartLiveView alloc] initWithFrame:self.view.bounds];
     [self.view addSubview:view];
-
+    [self.myTitle resignFirstResponder];
     _backBtn.hidden = YES;
     _middleView.hidden = YES;
 
 }
 
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+    [self.myTitle resignFirstResponder];
+}
+
 @end
diff --git a/高仿映客/Class/Camera/View/StartLiveView.m b/高仿映客/Class/Camera/View/StartLiveView.m
@@ -154,6 +154,9 @@ - (UIView*)containerView{
 #pragma mark ---- <关闭界面>
 - (UIButton*)closeButton{
 
+    // 显示状态栏
+    [[UIApplication sharedApplication] setStatusBarHidden:false];
+
     if(!_closeButton){
         _closeButton = [UIButton new];
 

diff --git a/高仿映客/Class/Live/Controller/LiveViewController.m b/高仿映客/Class/Live/Controller/LiveViewController.m
@@ -43,6 +43,20 @@ - (NSMutableArray *)titleButtons {
     return _titleButtons;
 }
 
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    if (_isInitial == NO) {
+        // 添加标题
+        [self setupAllTitle];
+        _isInitial = YES;
+    }
+
+    // 显示导航栏
+    [[UIApplication sharedApplication] setStatusBarHidden:true];
+
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // 设置导航条内容
@@ -83,16 +97,6 @@ - (void)setupAllChildViewController {
 
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    if (_isInitial == NO) {
-        // 添加标题
-        [self setupAllTitle];
-        _isInitial = YES;
-    }
-
-}
 
 #pragma mark - 选中标题按钮
 - (void)selButton:(UIButton *)titleButton

diff --git a/高仿映客/Class/Live/Controller/SearchViewController.m b/高仿映客/Class/Live/Controller/SearchViewController.m
@@ -43,7 +43,7 @@ - (void)setupRightItem {
 - (void)setupLeftsearchBar {
 
     self.view.backgroundColor = [UIColor whiteColor];
-    CGFloat w = XJScreenW - 65;
+    CGFloat w = XJScreenW - 80;
     UISearchBar *searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, w, 28)];
 
     searchBar.placeholder = @"输入映客号或昵称";

diff --git a/高仿映客/Info.plist b/高仿映客/Info.plist
@@ -50,5 +50,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSCameraUsageDescription</key>
+	<string>cameraDesciption</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>microphoneDesciption</string>
 </dict>
 </plist>