jsonwang 3 år sedan
förälder
incheckning
dc4802a8f6

+ 1 - 1
Introduce/Record/INIntroduceController.swift

@@ -57,7 +57,7 @@ class INIntroduceController: BFBaseViewController {
         exportBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#389AFF")
         exportBtn.setTitle("导出", for: .normal)
         exportBtn.addCorner(corner: 4)
-        exportBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16)
+        exportBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16)
         exportBtn.addTarget(self, action: #selector(exportAction), for: .touchUpInside)
         navHeadImageView?.addSubview(exportBtn)
         exportBtn.frame = CGRect(x: (navHeadImageView?.frame.width ?? 0) - 12 - 60, y: 0, width: 60, height: 36)

+ 2 - 2
Introduce/Record/INPhotoVideosController.swift

@@ -166,10 +166,10 @@ class INPhotoVideosController: BFBaseViewController {
         view.addSubview(bottomV)
 
         let nextBtn = UIButton(type: .custom)
-        nextBtn.frame = CGRect(x: cScreenWidth - 80, y: 10, width: 70, height: 29)
+        nextBtn.frame = CGRect(x: cScreenWidth - 94, y: 10, width: 78, height: 36)
         nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#389AFF")
         nextBtn.setTitle("下一步", for: .normal)
-        nextBtn.titleLabel?.font = UIFont.systemFont(ofSize: 12)
+        nextBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16)
         nextBtn.layer.cornerRadius = 4
         nextBtn.addTarget(self, action: #selector(nextBtnClick(sender:)), for: .touchUpInside)
         bottomV.addSubview(nextBtn)

+ 47 - 25
Introduce/Record/INRecorderController.swift

@@ -17,16 +17,16 @@ import BFAnalyzeKit
 public let cUserProtocol = "https://weapppiccdn.yishihui.com/resources/agreements/shishuo/videoservice.html?type=20"
 /** 隐私政策 */
 public let cPrivacy = "https://weapppiccdn.yishihui.com/resources/agreements/shishuo/videoagreement.html?type=20"
- 
+
 class INRecorderController: BFBaseViewController {
     lazy var addVideoBtn: UIButton = {
         let btn = UIButton(type: .custom)
-//        btn.setTitle("Add", for: .normal)
+        //        btn.setTitle("Add", for: .normal)
         btn.setImage(UIImage(named: "add"), for: .normal)
         btn.addTarget(self, action: #selector(addVideo), for: .touchUpInside)
         return btn
     }()
-
+    
     lazy var bgView:UIImageView = {
         let bgView = UIImageView.init(frame: CGRect.init(x: 0, y: 0, width: cScreenWidth, height: cScreenHeigth))
         bgView.contentMode = .scaleAspectFill
@@ -34,6 +34,13 @@ class INRecorderController: BFBaseViewController {
         return bgView
     }()
     
+    //欢迎界面
+    lazy var centerView:UIView = {
+        let view = UIView.init()
+        return view
+        
+    }()
+    
     //欢迎界面
     lazy var welcomeView:UIView = {
         let view = UIView.init()
@@ -51,7 +58,7 @@ class INRecorderController: BFBaseViewController {
     }()
     
     lazy var welcomeTitle:UILabel = {
-       
+        
         let l = UILabel()
         l.text = "欢迎使用"
         l.textColor = .black
@@ -71,7 +78,7 @@ class INRecorderController: BFBaseViewController {
         protocolLab.text = "在您使用视说服务前,请认真阅读"
         protocolLab.textColor = UIColor(red: 0.262, green: 0.262, blue: 0.262, alpha: 1)
         protocolLab.appendLink(withText: "《视说用户协议》、 ", linkFont: UIFont.systemFont(ofSize: 14), linkColor: UIColor.hexColor(hexadecimal: "#90a9d2"),  underLineStyle:CTUnderlineStyle(), linkData: cUserProtocol)
-
+        
         protocolLab.appendLink(withText: "  《用户隐私政策》", linkFont: UIFont.systemFont(ofSize: 14), linkColor: UIColor.hexColor(hexadecimal: "#90a9d2"), underLineStyle:CTUnderlineStyle(), linkData: cPrivacy)
         
         protocolLab.appendLink(withText: ",以了解用户权利义务和个人信息处理规则。\n\n", linkFont: UIFont.systemFont(ofSize: 14), linkColor: UIColor.hexColor(hexadecimal: "#434343"), underLineStyle: CTUnderlineStyle(), linkData: nil)
@@ -109,32 +116,47 @@ class INRecorderController: BFBaseViewController {
         // 曝光上报
         BFEventTrackAdaptor.baseReportUpload(businessType: .bt_pageView, objectType: nil, pageSource: .sp_homePage, commonParams: commonParams())
     }
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .black
         view.addSubview(bgView)
         
-        view.addSubview(addVideoBtn)
-        addVideoBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(170)
+        view.addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.width.equalTo(140)
+            make.height.equalTo(209)
             make.center.equalToSuperview()
         }
-
+        
+        centerView.addSubview(addVideoBtn)
+        addVideoBtn.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(5)
+            make.left.equalToSuperview().offset(5)
+            make.width.height.equalTo(130)
+        }
         let l = UILabel()
         l.text = "选择视频/图片\n开始讲解"
-        l.textColor = .white
-        l.font = UIFont.systemFont(ofSize: 16)
-        l.textAlignment = .center
-        view.addSubview(l)
+        l.textColor = UIColor.hexColor(hexadecimal: "#8C9399")
+        l.font = UIFont.systemFont(ofSize: 17)
+        centerView.addSubview(l)
+        let text = l.text
+        let attributedString = NSMutableAttributedString.init(string: text!)
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = 7
+        paragraphStyle.alignment = .center
+        attributedString.addAttribute(.paragraphStyle, value: paragraphStyle, range: .init(location: 0, length: l.text?.count ?? 0))
+        
+        l.attributedText = attributedString
+        l.sizeToFit()
         l.numberOfLines = 2
         l.snp.makeConstraints { make in
-            make.top.equalTo(addVideoBtn.snp.bottom)
+            make.top.equalTo(addVideoBtn.snp.bottom).offset(19)
             make.centerX.equalToSuperview()
             make.width.equalTo(200)
-            make.height.equalTo(48)
+            make.height.equalTo(60)
         }
-    
+        
         //欢迎界面
         if(getUserDefaults(key: "welcomeViewisshow") == nil){
             view.addSubview(welcomeBackView)
@@ -163,7 +185,7 @@ class INRecorderController: BFBaseViewController {
                 make.top.equalTo(welcomeTitle.snp.bottom).offset(16)
                 make.height.equalTo(140)
             }
-     
+            
             doneBtn.snp.makeConstraints { make in
                 make.centerX.equalToSuperview()
                 make.width.equalTo(230)
@@ -182,31 +204,31 @@ class INRecorderController: BFBaseViewController {
         // add by ak 取 nsl token
         BFRecordScreenViewModel.getNlsAccessToken { [weak self] token, appkey in
             BFLog(message: "提前取一次nls appkey is \(appkey), token is \(token)")
-       
+            
         }
-   
+        
     }
     
     @objc func doneAction() {
         welcomeBackView.isHidden = true
         
         saveUserDefaults(key: "welcomeViewisshow", value: "true")
-       
+        
     }
     
     
     @objc func cancleAction() {
         welcomeBackView.isHidden = true
- 
+        
         exit(-1)
-
+        
     }
-
+    
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
-
+    
     @objc func addVideo() {
         if (getUserDefaults(key: "welcomeViewisshow") == nil) {
             welcomeBackView.isHidden = false