完善亮度逻辑

Girly.xcodeproj/project.pbxproj

@@ -750,7 +750,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -785,7 +785,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

Girly/Business/Light/VC/TSFullScreenVC.swift

@@ -25,7 +25,7 @@ class TSFullScreenVC: TSBaseVC {
     }()
     
     var color:UIColor = .white
-    var colorString:String = ""
+    var cgcolors:[CGColor] = [UIColor.white.cgColor]
     var shapeNamed:String = ""
     
     override func createView() {
@@ -60,7 +60,7 @@ class TSFullScreenVC: TSBaseVC {
         }else if type == 1 {
             colorView.isHidden = false
             shapeView.isHidden = true
-            colorView.addGradientBg(colors: colorString.cgColors(separator: "-"))
+            colorView.addGradientBg(colors: cgcolors)
         }else if type == 2 {
             colorView.isHidden = true
             shapeView.isHidden = false
@@ -68,7 +68,7 @@ class TSFullScreenVC: TSBaseVC {
             shapeView.color = color
             shapeView.imageNamed = shapeNamed
         }
-        
+        UIDevice.brightness(brightness: 1.0)
         UIDevice.keepScreenAwake()
     }
     
@@ -91,10 +91,10 @@ extension TSFullScreenVC {
         return vc
     }
     
-    static func creatGradientVC(colorString:String) -> TSFullScreenVC{
+    static func creatGradientVC(cgcolors:[CGColor]) -> TSFullScreenVC{
         let vc = TSFullScreenVC()
         vc.type = 1
-        vc.colorString = colorString
+        vc.cgcolors = cgcolors
         return vc
     }
     

Girly/Business/Light/VC/TSLightGradientVC.swift

@@ -40,7 +40,7 @@ class TSLightGradientVC: TSBaseVC{
         let colorPaletteView = TSLightColorPaletteView()
         colorPaletteView.changedBrightnessComplete = { [weak self] floatNum in
             guard let self = self else { return }
-            UIDevice.brightness(brightness: floatNum)
+            brightnessNum = floatNum
         }
         
         colorPaletteView.changedSaturationComplete = { [weak self] floatNum in
@@ -66,7 +66,7 @@ class TSLightGradientVC: TSBaseVC{
         
         let fullScreenBtn = UIButton.createButton(image: UIImage(named: "fullScreen"),backgroundColor: UIColor.fromHex("000000", alpha: 0.2),corner: 8.0) { [weak self]  in
             guard let self = self else { return }
-            kPresentModalVC(target: self, modelVC: TSFullScreenVC.creatGradientVC(colorString: currentColorString),transitionStyle: .crossDissolve)
+            kPresentModalVC(target: self, modelVC: TSFullScreenVC.creatGradientVC(cgcolors:getCurrentColorGradient()),transitionStyle: .crossDissolve)
         }
         view.addSubview(fullScreenBtn)
         fullScreenBtn.snp.makeConstraints { make in
@@ -115,14 +115,18 @@ class TSLightGradientVC: TSBaseVC{
     
     
     func updateColorView(){
+        topView.addGradientBg(colors: getCurrentColorGradient())
+    }
+    
+    func getCurrentColorGradient() -> [CGColor] {
         let array = currentColorString.components(separatedBy: "-")
         var colors = [CGColor]()
         for string in array {
             var color = string.color
-            color = color.adjusted(saturation: saturationNum)
+            color = color.adjusted(brightness: brightnessNum,saturation: saturationNum)
             colors.append(color.cgColor)
         }
-        topView.addGradientBg(colors: colors)
+        return colors
     }
 }
 

Girly/Business/Light/VC/TSLightShapeVC.swift

@@ -16,7 +16,11 @@ class TSLightShapeVC: TSBaseVC{
     
     lazy var brightnessNum:CGFloat =  {
         return 1.0
-    }()
+    }(){
+        didSet{
+            updateColorView()
+        }
+    }
     
     lazy var saturationNum:CGFloat =  {
         return 1.0
@@ -30,7 +34,7 @@ class TSLightShapeVC: TSBaseVC{
         let colorPaletteView = TSLightColorPaletteView()
         colorPaletteView.changedBrightnessComplete = { [weak self] floatNum in
             guard let self = self else { return }
-            UIDevice.brightness(brightness: floatNum)
+            brightnessNum = floatNum
         }
         
         colorPaletteView.changedSaturationComplete = { [weak self] floatNum in

Girly/Business/Light/VC/TSLightSolidColorVC.swift

@@ -36,7 +36,7 @@ class TSLightSolidColorVC: TSBaseVC{
         let colorPaletteView = TSLightColorPaletteView()
         colorPaletteView.changedBrightnessComplete = { [weak self] floatNum in
             guard let self = self else { return }
-            UIDevice.brightness(brightness: floatNum)
+            brightnessNum = floatNum
         }
         
         colorPaletteView.changedSaturationComplete = { [weak self] floatNum in
@@ -62,7 +62,7 @@ class TSLightSolidColorVC: TSBaseVC{
 
         let fullScreenBtn = UIButton.createButton(image: UIImage(named: "fullScreen"),backgroundColor: UIColor.fromHex("000000", alpha: 0.2),corner: 8.0) { [weak self]  in
             guard let self = self else { return }
-            kPresentModalVC(target: self, modelVC: TSFullScreenVC.creatSolidColorVC(color: currentColor),transitionStyle: .crossDissolve)
+            kPresentModalVC(target: self, modelVC: TSFullScreenVC.creatSolidColorVC(color: topView.backgroundColor ?? .white),transitionStyle: .crossDissolve)
         }
         view.addSubview(fullScreenBtn)
         fullScreenBtn.snp.makeConstraints { make in

Girly/Business/Mirror/TSMirrorVC.swift

@@ -11,6 +11,13 @@ class TSMirrorVC: TSBaseVC{
     
     let kViewTop:CGFloat = k_Height_StatusBar+47
     
+    lazy var brightnessNum:CGFloat =  {
+        return 1.0
+    }(){
+        didSet{
+            UIDevice.brightness(brightness: brightnessNum)
+        }
+    }
     
     lazy var cameraView: TSMirrorCameraView = {
         let cameraView = TSMirrorCameraView()
@@ -65,7 +72,11 @@ class TSMirrorVC: TSBaseVC{
             make.bottom.equalTo(0)
         }
 
-        
+       
+    }
+    
+    override func dealThings() {
+        brightnessNum = 1.0
     }
     
     
@@ -73,11 +84,12 @@ class TSMirrorVC: TSBaseVC{
         cameraView.startCapture()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        UIDevice.brightness(brightness: brightnessNum)
+    }
     
     override func viewDidDisappear(_ animated: Bool) {
         cameraView.endCapture()
     }
-    
-    
 }