|
@@ -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;
|
|
|
}
|
|
|
|