【fix】【测量】首次添加多边形或者矩形时，填充颜色默认变成黑色

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

@@ -2305,10 +2305,11 @@
         NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
         switch (_annotationType) {
             case CAnnotationTypePolyGon:
-                color = [userDefaults PDFListViewColorForKey:CMeasurePolygonalLineColorKey] ? : [NSColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:0.0];
+//                color = [userDefaults PDFListViewColorForKey:CMeasurePolygonalLineColorKey] ? : [NSColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:0.0];
+                color = [userDefaults PDFListViewColorForKey:CMeasurePolygonalLineColorKey];
                 break;
             case CAnnotationTypeSquare:
-                color = [userDefaults PDFListViewColorForKey:CMeasureRectanglesLineColorKey] ? : [NSColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:0.0];
+                color = [userDefaults PDFListViewColorForKey:CMeasureRectanglesLineColorKey];
                 break;
             default:
                 break;

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFPolygonAnnotation+PDFListView.swift

@@ -12,7 +12,13 @@ import Foundation
         self.init(document: document)
         if let model = CPDFAnnotationModel(annotationType: annotationType) {
             self.color = model.measureBorderColor() ?? NSColor.blue
-            self.interiorColor = model.measureLineColor() ?? NSColor.clear
+//            self.interiorColor = model.measureLineColor() ?? NSColor.clear
+//            self.interiorColor = model.measureLineColor()
+            if let data = model.measureLineColor() {
+                self.interiorColor = data
+            } else {
+                self.removeInteriorColor()
+            }
             self.border = CPDFBorder(style: model.measureLineStyle(), lineWidth: model.measureLineWidth(), dashPattern: model.measureDashPattern())
             self.opacity = model.measureOpacity()
             if let font = CPDFFont.mappingFont(withFontString: model.measureFontName()) {