Browse Source

Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

liujiajie 10 months ago
parent
commit
8216c731fd

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

@@ -3846,6 +3846,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 self.enterPageEdit(pages)
             }
         } else if type == .editPDF {
+            self.listView.updateActiveAnnotations([])
+            self.listView.setNeedsDisplayForVisiblePages()
             self.listView.commitEditFormText()
             self.listView.annotationType = .editTextImage
         } else if type == .Annatiton {

+ 2 - 0
PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/AIInfoManager.m

@@ -467,6 +467,7 @@ static AIInfoManager *__Manager = nil;
     
     if (self.infoDict[@"start_date"]) {
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+        [formatter setLocale:[NSLocale systemLocale]];
         [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
         self.startDate = [formatter dateFromString:self.infoDict[@"start_date"]] ?: [[NSDate alloc] initWithTimeIntervalSince1970:0];
     } else {
@@ -474,6 +475,7 @@ static AIInfoManager *__Manager = nil;
     }
     if (self.infoDict[@"end_date"]) {
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+        [formatter setLocale:[NSLocale systemLocale]];
         [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
         self.endDate = [formatter dateFromString:self.infoDict[@"end_date"]] ?: [[NSDate alloc] initWithTimeIntervalSince1970:0];
     } else {