【fix】【主页/阅读页】激活高级序列码后，右上角AI账户信息按钮消失（重启APP正常）bug修复

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -292,18 +292,23 @@ import Cocoa
                     self.rightMessageVC = KMVerificationMessageViewController.init()
                 }
                 self.rightMessageVC.frameUpdateHandle = { [weak self] rect in
-                    var superRect = self?.rightToolbarItemView?.frame
-                    superRect?.size.width = (self?.rightMessageVC.view.frame.size.width)! + 8
+                    guard let rsView = self?.rightToolbarItemView else {
+                        return
+                    }
+                    var superRect = rsView.frame
+                    if (superRect.size.width < self!.rightMessageVC.view.frame.size.width + 8) {
+                        superRect.size.width = self!.rightMessageVC.view.frame.size.width + 8
+                    }
                     
-                    if self?.rightToolbarItemView.superview != nil {
-                        let viewRect = self?.rightToolbarItemView.superview?.frame
-                        if (superRect?.origin.x)! + (superRect?.size.width)! > (viewRect?.origin.x)! + (viewRect?.size.width)!{
-                            let offsetValue = ((superRect?.origin.x)! + (superRect?.size.width)! - (viewRect?.origin.x)! - (viewRect?.size.width)! )
-                            superRect?.origin.x -= offsetValue
+                    if let supView = rsView.superview {
+                        let viewRect = supView.frame
+                        if (superRect.origin.x) + (superRect.size.width) > (viewRect.origin.x) + (viewRect.size.width) {
+                            let offsetValue = ((superRect.origin.x) + (superRect.size.width) - (viewRect.origin.x) - (viewRect.size.width))
+                            superRect.origin.x -= offsetValue
                         }
                     }
                     
-                    self?.rightToolbarItemView.frame = superRect!;
+                    self?.rightToolbarItemView.frame = superRect
                 }
                 var rect = self.rightMessageVC.view.frame;
                 rect.origin.x = CGRectGetWidth(self.rightToolbarItemView.frame) - rect.size.width - 8

PDF Office/PDF Master/Class/Document/KMMainDocument.swift

@@ -195,7 +195,9 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
             mainViewController?.document = pdfDocument
         }
         
-        convertNotesUsingPDFDocument((mainViewController?.document)!)
+        if let pdfDoc = self.mainViewController?.document {
+            self.convertNotesUsingPDFDocument(pdfDoc)
+        }
         self.view = mainViewController?.view
         
         if let currentBrowser = currentWindowController?.browser {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController+Note.swift

@@ -793,9 +793,10 @@ extension KMLeftSideViewController {
                    } 
                 }
                 for annotation in annos {
-                    if annotation.isKind(of: KMTableAnnotation.self) {
-                        annos.removeObject(annotation)
-                    } else if annotation.annotationShouldDisplay() == false {
+//                    if annotation.isKind(of: KMTableAnnotation.self) {
+//                        annos.removeObject(annotation)
+//                    } else
+                    if annotation.annotationShouldDisplay() == false {
                         annos.removeObject(annotation)
                     }
                 }
@@ -1026,11 +1027,11 @@ extension KMLeftSideViewController {
         guard let data = annos else {
             return false
         }
-        for anno in data {
-            if anno.isKind(of: KMTableAnnotation.self) == false {
-                return true
-            }
-        }
-        return false
+//        for anno in data {
+//            if anno.isKind(of: KMTableAnnotation.self) == false {
+//                return true
+//            }
+//        }
+        return true
     }
 }

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -3794,7 +3794,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, scanOCRModel selectedTag: Int) {
-//        VerificationManager.default().updateStatus(., postNo: <#T##Bool#>)
         if(0 == selectedTag) {
 //            self.documentAIViewController?.enteredIncreaseAllPage()
 //            self.documentAIViewController?.updateToolState(false)

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

@@ -162,13 +162,14 @@ typedef void(^ActivityComplention)(ActivityStatus status, NSDictionary *info, NS
 
 @end
 
-//#if DUBUG
+#if DUBUG
 @interface VerificationManager (Test)
 
+- (void)updateVerificationStatus;
 - (void)updateStatus:(ActivityStatus)status postNo:(bool)postNo;
 
 @end
-//#endif
+#endif
 
 /// Notification
 extern NSString *kDeviceVerifyFinishNotification;//调用验证接口结束后发送通知

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

@@ -950,39 +950,48 @@ static VerificationManager *__verificationManager = nil;
 
 #pragma mark - Test
 
-//#if DUBUG
+#if DUBUG
 @implementation VerificationManager (Test)
 
+- (void)updateVerificationStatus {
+    [self updateStatus:ActivityStatusVerification postNo:true];
+}
+
 - (void)updateStatus:(ActivityStatus)status postNo:(bool)postNo {
     NSString *subValue = @"";
-    NSString *deviceValue = @""
+    NSString *deviceValue = @"";
     if (status == ActivityStatusNone) {
         deviceValue = @"";
-    } else (statue == ActivityStatusTrial) {
+    } else if (status == ActivityStatusTrial) {
         deviceValue = @"on_trial";
-    } else (statue == ActivityStatusTrialExpire) {
+    } else if (status == ActivityStatusTrialExpire) {
         deviceValue = @"expired_trial";
-    } else (statue == ActivityStatusVerification) {
+    } else if (status == ActivityStatusVerification) {
         deviceValue = @"activated";
-    } else (statue == ActivityStatusVerifExpire) {
+    } else if (status == ActivityStatusVerifExpire) {
         deviceValue = @"expired_license";
-    } else (statue == ActivityStatusLicenseExpire) {
+    } else if (status == ActivityStatusLicenseExpire) {
         deviceValue = @"";
         subValue = @"expired";
     }
     
-    self.detailInfo[@"subscription"][@"status"] = subValue
-    self.detailInfo[@"device"][@"status"] = deviceValue
+
     
-    //发送通知
-    NSString *notificationName = (NSString *)kDeviceActivateStatusChangeNotification;
-    [[NSNotificationCenter defaultCenter] postNotificationName:notificationName
-                                                        object:self
-                                                      userInfo:nil];
+    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:self.detailInfo];
+    dict[@"subscription"][@"status"] = subValue;
+    dict[@"device"][@"status"] = deviceValue;
+    self.detailInfo = dict;
+    if (postNo) {
+        //发送通知
+        NSString *notificationName = (NSString *)kDeviceActivateStatusChangeNotification;
+        [[NSNotificationCenter defaultCenter] postNotificationName:notificationName
+                                                            object:self
+                                                          userInfo:nil];
+    }
 }
 
 @end
-//#endif
+#endif
 
 #pragma mark - NSDictionary + ActivityInfo
 @implementation NSDictionary (ActivityInfo)

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

@@ -142,8 +142,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "351"
-            endingLineNumber = "351"
+            startingLineNumber = "356"
+            endingLineNumber = "356"
             landmarkName = "commandDispatch(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -471,16 +471,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "6C3FD68A-C55F-42AF-A5C8-6828984B7EB8"
+            uuid = "66FD91AF-68F3-4C5A-9ED4-84C775043CFB"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3798"
-            endingLineNumber = "3798"
-            landmarkName = "toolbarViewController(_:scanOCRModel:)"
+            startingLineNumber = "3813"
+            endingLineNumber = "3813"
+            landmarkName = "mainToolDidClicked(_:_:_:_:_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>