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

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m

@@ -1105,7 +1105,7 @@
 #pragma mark - Text
 
 - (CPDFTextAnnotationIconType)anchoredIconType {
-    CPDFTextAnnotationIconType anchoredIconType = CPDFTextAnnotationIconNote;
+    CPDFTextAnnotationIconType anchoredIconType = CPDFTextAnnotationIconComment;
     //多选注释去拿注释类型的默认值
     if (_annotation && self.annotations.count == 1) {
         if([_annotation isKindOfClass:[CPDFTextAnnotation class]]) {

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -3650,7 +3650,9 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             NSData *tiffData = image.TIFFRepresentation;
             
             [tiffData writeToURL:savePanel.URL atomically:YES];
-
+            if ([[NSFileManager defaultManager] fileExistsAtPath:savePanel.URL.path]) {
+                [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[savePanel.URL]];
+            }
         }
     }];
 }

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/InitialUserDefaults.plist

@@ -49,7 +49,7 @@
 		<key>CAnchoredNoteOpacity</key>
 		<integer>1</integer>
 		<key>CAnchoredNoteIconType</key>
-		<integer>2</integer>
+		<integer>0</integer>
 		<key>CCircleNoteColor</key>
 		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAQAAAYY=</data>
 		<key>CCircleNoteOpacity</key>