【PDFull】订阅状态调整

PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m

@@ -1070,36 +1070,36 @@ static VerificationManager *__verificationManager = nil;
 
 - (ActivityStatus)status {
     ActivityStatus tStatus = ActivityStatusTrialExpire;
-//    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
-//        tStatus  = ActivityStatusLicenseExpire;
-//    }else{
-//        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
+    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
+        tStatus  = ActivityStatusLicenseExpire;
+    }else{
+        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
             tStatus = ActivityStatusVerification;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
-//            tStatus = ActivityStatusTrial;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
-//            tStatus = ActivityStatusTrialExpire;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//    }
-//
-//    if (ActivityStatusTrial == tStatus) {
-//        if (self.expireDate &&
-//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-//            tStatus = ActivityStatusTrialExpire;
-//        }
-//    }else if (ActivityStatusVerification == tStatus) {
-//        if (self.expireDate &&
-//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//        if (self[@"dejvice"][@"status"] &&
-//            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
-//            //激活码过期
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//    }
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
+            tStatus = ActivityStatusTrial;
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
+            tStatus = ActivityStatusTrialExpire;
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
+            tStatus = ActivityStatusVerifExpire;
+        }
+    }
+
+    if (ActivityStatusTrial == tStatus) {
+        if (self.expireDate &&
+            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+            tStatus = ActivityStatusTrialExpire;
+        }
+    }else if (ActivityStatusVerification == tStatus) {
+        if (self.expireDate &&
+            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+            tStatus = ActivityStatusVerifExpire;
+        }
+        if (self[@"dejvice"][@"status"] &&
+            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
+            //激活码过期
+            tStatus = ActivityStatusVerifExpire;
+        }
+    }
     return tStatus;
 }
 

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -460,54 +460,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2165F2F5-6F54-411F-A275-5E0427B5B23E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Purchase/DMG/Verification/KMVerificationInfoViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "66"
-            endingLineNumber = "66"
-            landmarkName = "-loadView"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "2165F2F5-6F54-411F-A275-5E0427B5B23E - 6dd99888fbba401"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMVerificationInfoViewController loadView]"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/KMVerificationInfoViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "66"
-                  endingLineNumber = "66"
-                  offsetFromSymbolStart = "1460">
-               </Location>
-               <Location
-                  uuid = "2165F2F5-6F54-411F-A275-5E0427B5B23E - 745cea3590645bc0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMVerificationInfoViewController loadView]"
-                  moduleName = "PDFull"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/KMVerificationInfoViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "66"
-                  endingLineNumber = "66"
-                  offsetFromSymbolStart = "1416">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent