【综合】xcode兼容处理

PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -541,17 +541,17 @@ import Cocoa
                                 self.userScenarioType == .lite_type6 ||
                                 self.userScenarioType == .lite_type10 ||
                                 self.userScenarioType == .lite_type12 ||
-                                userScenarioType == .pro_type2 ||
-                                userScenarioType == .pro_type5{
+                                self.userScenarioType == .pro_type2 ||
+                                self.userScenarioType == .pro_type5{
                         
-                    } else if userScenarioType == .pro_type1 ||
-                                userScenarioType == .pro_type3 ||
-                                userScenarioType == .pro_type4 {
+                    } else if self.userScenarioType == .pro_type1 ||
+                                self.userScenarioType == .pro_type3 ||
+                                self.userScenarioType == .pro_type4 {
                         KMProductCompareWC.shared.orientation = true
-                        if userScenarioType == .pro_type1 ||
-                            userScenarioType == .pro_type4 {
+                        if self.userScenarioType == .pro_type1 ||
+                            self.userScenarioType == .pro_type4 {
                             KMProductCompareWC.shared.orientationType = .pro_Advanced
-                        } else if userScenarioType == .pro_type3 {
+                        } else if self.userScenarioType == .pro_type3 {
                             KMProductCompareWC.shared.orientationType = .pro_Base
                         }
                         KMProductCompareWC.shared.showWindow(nil)

PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.swift

@@ -79,7 +79,7 @@ class KMEnterVerificationCodeView: KMBaseXibView {
             if self.viewModel.sendBoxSelect { return }
             if downEntered {
                 self.sendBox.fillColor = NSColor(named: "273C62_0.4") ?? NSColor.blue
-                viewModel.countDown(type: .reset)
+                self.viewModel.countDown(type: .reset)
             }
         }
     }

PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift

@@ -197,7 +197,7 @@ class KMSignUpView: KMBaseXibView {
             if self.viewModel.sendBoxSelect { return }
             if downEntered {
                 self.sendBox.fillColor = NSColor(named: "273C62_0.4") ?? NSColor.blue
-                viewModel.countDown(type: .login)
+                self.viewModel.countDown(type: .login)
             }
         }
     }

PDF Office/PDF Master/MemberCenter/ViewModel/KMSignUpViewModel.swift

@@ -113,7 +113,7 @@ class KMSignUpViewModel: ObservableObject {
                     // 倒计时结束，停止定时器
                     self.timer?.cancel()
                     self.sendContent = NSLocalizedString("Resend", tableName: "MemberCenterLocalizable", comment: "")
-                    sendBoxSelect = false
+                    self.sendBoxSelect = false
                 }
             }
     }
@@ -273,7 +273,7 @@ class KMSignUpViewModel: ObservableObject {
                         alert.runModal()
                         return
                     }
-                    KMMemberCenterManager.manager.getUserDeviceList(email: email) { [weak self] success, result in
+                    KMMemberCenterManager.manager.getUserDeviceList(email: self.email) { [weak self] success, result in
                         guard self != nil else { return }
                         if success {
                             KMMemberCenterWindowController.shared.showWindow(nil)
@@ -288,8 +288,8 @@ class KMSignUpViewModel: ObservableObject {
                     let response = alert.runModal()
                     if response == .alertFirstButtonReturn {
                         if(resultDict.code == 317) {
-                            signUpState = .verificationCode
-                            countDown(type: .login)
+                            self.signUpState = .verificationCode
+                            self.countDown(type: .login)
                         } else {
                             
                         }

PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.swift

@@ -93,7 +93,7 @@ class KMOpenDMGPopupBootWC: NSWindowController {
         freeBox.downCallback = { [weak self](downEntered: Bool, mouseBox: KMBox, event) -> Void in
             guard let self = self else { return }
             if downEntered {
-                viewModel.getVipFree()
+                self.viewModel.getVipFree()
                 self.window?.close()
             }
         }

PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.swift

@@ -114,7 +114,7 @@ class KMCloseVerificationWC: NSWindowController {
             if self.signUpModel.sendBoxSelect { return }
             if downEntered {
                 self.sendBox.fillColor = NSColor(named: "273C62_0.4") ?? NSColor.blue
-                signUpModel.countDown(type: .logout)
+                self.signUpModel.countDown(type: .logout)
             }
         }