100Years 3 ماه پیش
والد
کامیت
f0d5b4e8fc

+ 2 - 2
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 = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				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 = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

+ 3 - 4
Girly/Business/Flash/VC/TSNightLightVC.swift

@@ -14,7 +14,7 @@ class TSNightLightVC: TSBaseVC {
     lazy var myTimer: TSCustomTimer = {
         let customTimer = TSCustomTimer(interval: 1.0,repeats: true) { [weak self]  in
             guard let self = self else { return }
-            
+            debugPrint("countdown=\(setToolView.countdown)")
             if setToolView.countdown <= 0{
                 stopMyTimer()//关闭定时器
                 isOpen = false
@@ -56,11 +56,11 @@ class TSNightLightVC: TSBaseVC {
                 if(setToolView.countdown > 0){
                     startMyTimer()
                 }
-                setToolView.submitBtn.setTitle("close".localized, for: .normal)
+                setToolView.submitBtn.setTitle("Close".localized, for: .normal)
             }else{
                 UIDevice.allowScreenSleep()
                 stopMyTimer()
-                setToolView.submitBtn.setTitle("open".localized, for: .normal)
+                setToolView.submitBtn.setTitle("Open".localized, for: .normal)
             }
         }
         
@@ -113,7 +113,6 @@ class TSNightLightVC: TSBaseVC {
     
     deinit {
         UIDevice.allowScreenSleep()
-        myTimer.stop()
     }
 }
 

+ 1 - 1
Girly/Business/Mirror/View/TSMirrorCameraView.swift

@@ -111,7 +111,7 @@ class TSMirrorCameraNoPermissionView: TSBaseView {
     }()
     
     lazy var textLabel: UILabel = {
-        let textLabel = UILabel.createLabel(text: "No camera permission. Can't look in the mirror. Open now.",font: .font(size: 14.0),textColor: .assist,numberOfLines: 0)
+        let textLabel = UILabel.createLabel(text: "No camera permission. Can't look in the mirror.",font: .font(size: 14.0),textColor: .assist,numberOfLines: 0)
         textLabel.setLineSpacing(4,alignment: .center)
         return textLabel
     }()

+ 1 - 1
Girly/Common/ThirdParty/CameraManager/CameraManager.swift

@@ -972,7 +972,7 @@ open class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate, UIGest
             try captureDevice?.lockForConfiguration()
             
             zoomScale = max(1.0, min(beginZoomScale * scale, maxZoomScale))
-            
+            print("zoomScale=\(zoomScale)")
             captureDevice?.videoZoomFactor = zoomScale
             
             captureDevice?.unlockForConfiguration()