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

* 'master' of https://git.yishihui.com/iOS/Introduce:
  1.上报

Introduce/Record/INIntroduceController.swift

@@ -70,15 +70,13 @@ class INIntroduceController: BFBaseViewController {
         recordScreenVC.changeItemHandle = { [weak self] index in
             self?.stripSwithView?.changeSwitchStatus(index: index)
         }
-        recordScreenVC.recordRndHandle = {model in
+        recordScreenVC.recordEndHandle = {model in
             // 录音完成时上报
-            let assert = AVURLAsset(url: URL(fileURLWithPath:model?.wavFilePath ?? ""))
-        
-            BFEventTrackAdaptor.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_speekButton, pageSource: .sp_speekPage,extParams: ["duration":Int((assert.duration.seconds) * 1000)],commonParams: commonParams())
+            BFEventTrackAdaptor.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_speekButton, pageSource: .sp_speekPage,extParams: ["duration":Int(((model?.endCMTime.seconds ?? 0) - (model?.startCMTime.seconds ?? 0)) * 1000)],commonParams: commonParams())
         }
         recordScreenVC.subTitleBtnClickHandle = { isOn in
             // 点击字幕按钮上报
-            BFEventTrackAdaptor.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_captionsButton, pageSource: .sp_speekPage,extParams: ["subtitleSwitch":isOn ? "on" : "off"],commonParams: commonParams())
+            BFEventTrackAdaptor.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_captionsButton, pageSource: .sp_speekPage,extParams: ["isSubtitlesClose":isOn],commonParams: commonParams())
         }
         if assets != nil, (assets?.count ?? 0) > 1 {
             stripSwithView = BFStripSwithView(frame: CGRect(x: (backButton?.frame.maxX ?? 0), y: 0, width: exportBtn.frame.minX - (backButton?.frame.maxX ?? 0) - 10, height: cDevice_iPhoneNavBarHei), items: assets?.count ?? 1,space: 4)

Introduce/Record/INRecorderController.swift

@@ -117,12 +117,51 @@ class INRecorderController: BFBaseViewController {
         BFEventTrackAdaptor.baseReportUpload(businessType: .bt_pageView, objectType: nil, pageSource: .sp_homePage, commonParams: commonParams())
     }
     
+    lazy var bottomView:UIView = {
+        let bottomView = UIView(frame:CGRect.init(x: 0, y: view.frame.height - cSafeAreaHeight - 48 - 30, width: view.frame.width, height: 30))
+        let userProBtn = UIButton.init(type: .custom)
+        userProBtn.setTitle("用户协议", for: .normal)
+        userProBtn.tag = 1
+        userProBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
+        userProBtn.setTitleColor(UIColor.hexColor(hexadecimal: "6E7F9A"), for: .normal)
+        userProBtn.addTarget(self, action: #selector(protocolClick(sender:)), for: .touchUpInside)
+        
+        let lineLab = UILabel()
+        lineLab.text = "   |   "
+        lineLab.font = UIFont.systemFont(ofSize: 13)
+        lineLab.textColor = UIColor.hexColor(hexadecimal: "6E7F9A")
+        
+        let priProBtn = UIButton.init(type: .custom)
+        priProBtn.setTitle("隐私协议", for: .normal)
+        priProBtn.tag = 2
+        priProBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
+        priProBtn.setTitleColor(UIColor.hexColor(hexadecimal: "6E7F9A"), for: .normal)
+        priProBtn.addTarget(self, action: #selector(protocolClick(sender:)), for: .touchUpInside)
+        
+        bottomView.addSubview(userProBtn)
+        bottomView.addSubview(lineLab)
+        bottomView.addSubview(priProBtn)
+        lineLab.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+        }
+        userProBtn.snp.makeConstraints { make in
+            make.right.equalTo(lineLab.snp.left)
+            make.centerY.equalToSuperview()
+        }
+        priProBtn.snp.makeConstraints { make in
+            make.left.equalTo(lineLab.snp.right)
+            make.centerY.equalToSuperview()
+        }
+        return bottomView
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .black
         view.addSubview(bgView)
         
         view.addSubview(centerView)
+        view.addSubview(bottomView)
         centerView.snp.makeConstraints { make in
             make.width.equalTo(140)
             make.height.equalTo(209)
@@ -240,6 +279,20 @@ class INRecorderController: BFBaseViewController {
             BFEventTrackAdaptor.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_addVideo, pageSource: .sp_homePage, commonParams: commonParams())
         }
     }
+    
+    @objc func protocolClick(sender:UIButton) {
+        var link: String?
+        if sender.tag == 1 {
+            link = cUserProtocol
+        } else {
+            link = cPrivacy
+        }
+        if link != nil, (link?.count ?? 0) > 0 {
+            let detail = BFBaseWebViewController()
+            detail.baseUrl = link
+            self.navigationController?.pushViewController(detail, animated: true)
+        }
+    }
 }