From c8ee119caace4b4abe641b1959729e05e88407e1 Mon Sep 17 00:00:00 2001
From: bluesea <307723040@qq.com>
Date: Sun, 28 Apr 2024 10:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9C=87=E5=8A=A8=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CCSpatialVideoDisplayController.swift     |  2 +-
 .../ZZHCustomSlider.swift                     | 29 +++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift
index 291bb56..1781e3c 100644
--- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift
+++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift
@@ -432,7 +432,7 @@ class CCSpatialVideoDisplayController: BaseController {
         //已连接
         if(isScreenMirroring){
             self.dealTaskWhenExternalScreenConnect()
-            customPlayer.currentED = 0//串流中,就将ed默认设置为0
+            customPlayer.currentED = -1//串流中,就将ed默认设置为0
             CustomParamBoardView.exHidenBoard()
         }else{
             //未连接
diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift
index 1de537b..282d619 100644
--- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift
+++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import UIKit
+import AudioToolbox
 typealias CustomSliderProcessChangeValueCallback =  (_ currentValue:Float,_ isMoving:Bool)->Void
 class ZZHCustomSlider: UIView {
     
@@ -283,7 +284,7 @@ class CCSlider: UIView{
         guard let callback else {
             return
         }
-        var currentValue = max(0, min(value, 1))
+        let currentValue = max(0, min(value, 1))
 
         preValue = currentValue
         callback(preValue,isMoving)
@@ -324,7 +325,10 @@ class CustomParamBoardView: UIView {
     
     var edSlider:CCSlider?
     var edTitleLabel:UILabel?
-    
+    //标记是否能够scale震动
+    var canScalePlaySound = true
+    //标记是否能够ed震动
+    var canEDPlaySound = true
     //标记是否在串流,串流中,则隐藏瞳距,不允许调节
     var isPlayingOnExternalScreen = false {
         didSet {
@@ -485,10 +489,21 @@ class CustomParamBoardView: UIView {
     
     //更新缩放的标题文本
     func updateScaleTitleWithValue(value:Float) {
+        
         let minValue = 0.3
         let maxValue = 1.8
         let resultValue = minValue + (maxValue - minValue) * Double(value)
-        let formattedValue = String(format: "\(NSLocalizedString("v1.6_缩放", comment: ""))%.f%%", (resultValue) * 100)
+        let fr = Int(resultValue*100)
+        if canScalePlaySound &&  fr == 100{
+            AudioServicesPlaySystemSound(1519)
+            canScalePlaySound = false//防止连续震动
+        }
+        
+        if fr > 101 || fr < 99 {
+            canScalePlaySound = true
+        }
+        
+        let formattedValue = String(format: "\(NSLocalizedString("v1.6_缩放", comment: ""))%d%%", fr)
         self.scaleTitleLabel?.text = formattedValue
         if let scaleCallback = self.scaleCallback {
             scaleCallback(CGFloat(resultValue))
@@ -497,6 +512,7 @@ class CustomParamBoardView: UIView {
     
     //提供给它的类方法调用
     func exUpdateScaleTitleWithValue(resultValue:CGFloat) {
+        
         let formattedValue = String(format: "\(NSLocalizedString("v1.6_缩放", comment: ""))%.f%%", (resultValue) * 100)
         self.scaleTitleLabel?.text = formattedValue
         let minValue = 0.3
@@ -511,6 +527,13 @@ class CustomParamBoardView: UIView {
         if let edCallback = self.edCallback {
             edCallback(Int(currED))
         }
+        if canEDPlaySound && currED == 0{
+            AudioServicesPlaySystemSound(1519)
+            canEDPlaySound = false//防止连续震动
+        }
+        if currED > 1 || currED < -1{
+            canEDPlaySound = true
+        }
         let formattedValue = String(format: "\(NSLocalizedString("v1.6_瞳距", comment: ""))%dmm", currED)
         self.edTitleLabel?.text = formattedValue
     }