Merge branch 'master' of https://git.yishihui.com/iOS/Introduce

* 'master' of https://git.yishihui.com/iOS/Introduce:
  ui 调整
  使用系统提示框
  启动图显示设置

Introduce.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		4A426DDD275484DF00B3733B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A426DDC275484DF00B3733B /* AppDelegate.swift */; };
 		4A426DE4275484DF00B3733B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A426DE2275484DF00B3733B /* Main.storyboard */; };
 		4A426DE6275484E000B3733B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A426DE5275484E000B3733B /* Assets.xcassets */; };
-		4A426DE9275484E000B3733B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A426DE7275484E000B3733B /* LaunchScreen.storyboard */; };
 		4A426DF22754A1E300B3733B /* INTabbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A426DF12754A1E300B3733B /* INTabbarController.swift */; };
 		4A426DF52754A27D00B3733B /* INRecorderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A426DF42754A27D00B3733B /* INRecorderController.swift */; };
 		4A426DFA2754A47700B3733B /* INPhotoVideosController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A426DF92754A47700B3733B /* INPhotoVideosController.swift */; };
@@ -30,7 +29,6 @@
 		4A426DDC275484DF00B3733B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		4A426DE3275484DF00B3733B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		4A426DE5275484E000B3733B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		4A426DE8275484E000B3733B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		4A426DEA275484E000B3733B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4A426DF12754A1E300B3733B /* INTabbarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = INTabbarController.swift; sourceTree = "<group>"; };
 		4A426DF42754A27D00B3733B /* INRecorderController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = INRecorderController.swift; sourceTree = "<group>"; };
@@ -87,7 +85,6 @@
 				4A426DF32754A26600B3733B /* Record */,
 				4A426DE2275484DF00B3733B /* Main.storyboard */,
 				4A426DE5275484E000B3733B /* Assets.xcassets */,
-				4A426DE7275484E000B3733B /* LaunchScreen.storyboard */,
 				41A112782766E12C0093BBF0 /* PQConfig.plist */,
 				415C49D12763022900814766 /* Resources.bundle */,
 				4A426DEA275484E000B3733B /* Info.plist */,
@@ -201,7 +198,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				41A112792766E12C0093BBF0 /* PQConfig.plist in Resources */,
-				4A426DE9275484E000B3733B /* LaunchScreen.storyboard in Resources */,
 				4A426DE6275484E000B3733B /* Assets.xcassets in Resources */,
 				4A426DE4275484DF00B3733B /* Main.storyboard in Resources */,
 				415C49D22763022900814766 /* Resources.bundle in Resources */,
@@ -294,14 +290,6 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
-		4A426DE7275484E000B3733B /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				4A426DE8275484E000B3733B /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
@@ -427,6 +415,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 0.51;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
@@ -436,11 +425,12 @@
 				INFOPLIST_FILE = Introduce/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "开讲";
 				INFOPLIST_KEY_NSCameraUsageDescription = "请点击\"允许\"以允许访问,以便于反馈，上传头像等功能图片上传";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "请点击\"允许\"以允许访问,以便于更精确的推荐喜欢的视频";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "请点击\"允许\"以允许访问,以便于使用视频制作功能";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "请点击\"允许\"以允许访问,以便于图片保存";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "请点击\"允许\"以允许访问,以便于反馈，上传头像等功能图片上传";
+				INFOPLIST_KEY_NSUserTrackingUsageDescription = "请放心,开启权限不会获取你在其他站点的隐私信息,该权限仅用于标识设备并保障服务安全与提升浏览体验";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
-				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UIStatusBarHidden = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
@@ -465,6 +455,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 0.51;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
@@ -474,11 +465,12 @@
 				INFOPLIST_FILE = Introduce/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "开讲";
 				INFOPLIST_KEY_NSCameraUsageDescription = "请点击\"允许\"以允许访问,以便于反馈，上传头像等功能图片上传";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "请点击\"允许\"以允许访问,以便于更精确的推荐喜欢的视频";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "请点击\"允许\"以允许访问,以便于使用视频制作功能";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "请点击\"允许\"以允许访问,以便于图片保存";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "请点击\"允许\"以允许访问,以便于反馈，上传头像等功能图片上传";
+				INFOPLIST_KEY_NSUserTrackingUsageDescription = "请放心,开启权限不会获取你在其他站点的隐私信息,该权限仅用于标识设备并保障服务安全与提升浏览体验";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
-				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UIStatusBarHidden = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;

Introduce/Record/INIntroduceController.swift

@@ -77,26 +77,24 @@ class INIntroduceController: BFBaseViewController {
     }
 
     override func backBtnClick() {
-        let remindData = BFBaseModel()
-        remindData.summary = "退出将不会保存当前操作"
-        let alertV = BFRemindView(frame: view.bounds)
-        alertV.isBanned = true
-        alertV.confirmBtn.setTitle("不退出", for: .normal)
-        alertV.confirmBtn.titleLabel?.font = UIFont.systemFont(ofSize: 20, weight: .medium)
-        alertV.cancelBtn.setTitle("确认退出", for: .normal)
-        alertV.cancelBtn.titleLabel?.font = UIFont.systemFont(ofSize: 20, weight: .medium)
-        alertV.contentLab.font = UIFont.systemFont(ofSize: 20, weight: .medium)
-        alertV.remindData = remindData
-        alertV.confirmBtn.setTitleColor(UIColor.black, for: .normal)
-        alertV.cancelBtn.setTitleColor(UIColor.red, for: .normal)
-        alertV.contentLab.textColor = .black
-        alertV.remindBlock = { [weak self] item, _ in
-            if item.tag == 1 { // 确定返回到上一层
-                self?.recordScreenVC.backBtnClick()
-                self?.super_back()
-            }
-        }
-        UIApplication.shared.keyWindow?.addSubview(alertV)
+  
+        let alertController = UIAlertController(title: "退出将不会保存当前操作",
+                       message: "", preferredStyle: .alert)
+        let cancelAction = UIAlertAction(title: "不退出", style: .default, handler: nil)
+
+        let okAction = UIAlertAction(title: "确认退出", style: .cancel, handler: {[weak self]
+           action in
+           print("点击了确定")
+           self?.recordScreenVC.backBtnClick()
+            self?.super_back()
+        })
+        okAction.setValue(UIColor.red, forKey:"titleTextColor")
+
+        alertController.addAction(okAction)
+        alertController.addAction(cancelAction)
+
+        self.present(alertController, animated: true, completion: nil)
+        
     }
 
     private func super_back() {

Introduce/Record/INRecorderController.swift

@@ -112,16 +112,17 @@ class INRecorderController: BFBaseViewController {
         }
 
         let l = UILabel()
-        l.text = "选择视频，开始讲解"
+        l.text = "选择视频/图片\n开始讲解"
         l.textColor = .white
         l.font = UIFont.systemFont(ofSize: 16)
         l.textAlignment = .center
         view.addSubview(l)
+        l.numberOfLines = 2
         l.snp.makeConstraints { make in
             make.top.equalTo(addVideoBtn.snp.bottom)
             make.centerX.equalToSuperview()
             make.width.equalTo(200)
-            make.height.equalTo(24)
+            make.height.equalTo(48)
         }
     
         //欢迎界面