【fix】 【注释】添加文本后，更改颜色-自定义颜色，切换不透明度无效

PDF Office/PDF Master/Class/Common/OC/Batch/KMOCTool.h

@@ -19,6 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
 +(NSAttributedString *)transformAttr:(NSAttributedString *)astring withString:(NSString *)str;
 +(NSDictionary *)convertExcelToPdfFilePath:(NSString *)filePath savePath:(NSString *)savePath;
 +(NSDictionary *)convertOfficeFileToPdf:(NSString *)convertString;
+
++ (NSString *)getModificationDate:(NSDate *)modificationDate;
+
 @end
 
 NS_ASSUME_NONNULL_END

PDF Office/PDF Master/Class/Common/OC/Batch/KMOCTool.m

@@ -289,4 +289,32 @@ static NSData *convertStringsToPDF(NSArray<NSAttributedString *> *strings)
     return dic;
 }
 
++ (NSString *)getModificationDate:(NSDate *)modificationDate {
+    if (!modificationDate) {
+        return nil;
+    }
+    
+    NSTimeZone *timeZone = [NSTimeZone systemTimeZone];
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setTimeZone:timeZone];
+    [formatter setDateFormat:@"yyyyMMddHHmmssZ"];
+    NSString *dateString = [formatter stringFromDate:modificationDate];
+    /* 修改date字符串格式为PDF标准格式 */
+    NSRange tRange;
+    if ([dateString rangeOfString:@"+"].length > 0) {
+        tRange = [dateString rangeOfString:@"+"];
+    } else if ([dateString rangeOfString:@"-"].length > 0) {
+        tRange = [dateString rangeOfString:@"-"];
+    } else if ([dateString rangeOfString:@"Z"].length > 0){
+        tRange = [dateString rangeOfString:@"Z"];
+    }
+    NSMutableString *date = [NSMutableString string];
+    [date appendFormat:@"D:%@", [dateString substringToIndex:tRange.location]];
+    tRange.length = 3;
+    [date appendFormat:@"%@", [dateString substringWithRange:tRange]];
+    tRange.location += 3;
+    [date appendFormat:@"'%@", [dateString substringFromIndex:tRange.location]];
+    return  date;
+}
+
 @end

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -1782,7 +1782,8 @@ let KMColorPickerViewHeight: CGFloat = 64
         if annotationType == .freeText {
             if let fillColorPickerColor = fillColorPickerView.color {
                 annotationModel?.setColor(fillColorPickerColor)
-//                annotationModel?.setOpacity(opacity)
+                let alpha = fillColorPickerColor.getAlphaComponent()
+                annotationModel?.setOpacity(alpha)
             }
         } else {
             annotationModel?.setColor(fillColor)