Browse Source

【数字签名】添加了两个签名的签名文档,签名状态栏显示异常且Icon不对 -- 优化

lizhe 10 months ago
parent
commit
f1ca97f86a

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/ImageNameSigntureVerifyFailure.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "sign.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "sign 1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 203 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/ImageNameSigntureVerifyFailure.imageset/sign 1.pdf

@@ -0,0 +1,203 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.753052 6.345093 cm
+0.133333 0.478431 1.000000 scn
+8.261871 -0.000008 m
+10.286839 -0.000008 11.858215 1.239273 12.854500 3.312840 c
+24.477819 3.312840 l
+24.899014 3.312840 25.223007 3.661136 25.223007 4.074229 c
+25.223007 4.487323 24.899014 4.827518 24.477819 4.827518 c
+13.437691 4.827518 l
+13.818385 6.066798 14.037082 7.500475 14.093781 9.071851 c
+14.604073 9.185249 15.130565 9.241948 15.673256 9.241948 c
+15.859553 9.241948 15.956752 9.160950 15.956752 9.031352 c
+15.956752 8.423862 15.551758 7.905469 15.551758 7.119781 c
+15.551758 6.390793 16.086349 5.912900 16.839638 5.912900 c
+18.597311 5.912900 20.695179 8.634458 21.221670 8.634458 c
+21.675262 8.634458 21.237869 6.244995 23.303337 6.244995 c
+23.716431 6.244995 24.202423 6.358394 24.566917 6.601390 c
+24.834213 6.787687 25.020510 7.054983 25.020510 7.403277 c
+25.020510 7.856871 24.712715 8.261864 24.234823 8.261864 c
+23.975628 8.261864 23.740730 8.083667 23.546333 8.083667 c
+22.922644 8.083667 23.530134 10.691826 21.707663 10.691826 c
+20.209187 10.691826 18.257116 8.302363 17.795424 8.302363 c
+17.722525 8.302363 17.682024 8.334763 17.682024 8.415761 c
+17.682024 8.634458 17.860222 8.990852 17.860222 9.379646 c
+17.860222 10.416430 17.115034 11.023920 15.908153 11.023920 c
+15.276362 11.023920 14.660771 10.967222 14.069481 10.861923 c
+13.769786 15.243956 11.574720 18.492004 8.464369 18.492004 c
+6.099205 18.492004 4.446831 16.693832 4.446831 14.190971 c
+4.446831 11.445114 6.188304 9.160950 8.075575 7.662473 c
+7.192688 6.771486 6.504199 5.791403 6.074905 4.827518 c
+0.745188 4.827518 l
+0.323995 4.827518 0.000000 4.487323 0.000000 4.074229 c
+0.000000 3.669235 0.332095 3.312840 0.745188 3.312840 c
+5.621313 3.312840 l
+5.597013 3.110344 5.580813 2.907847 5.580813 2.721550 c
+5.580813 1.052977 6.520399 -0.000008 8.261871 -0.000008 c
+h
+9.420372 8.820711 m
+7.889496 9.995193 6.237122 11.817665 6.237122 14.199028 c
+6.237122 15.648905 7.152407 16.701889 8.472687 16.701889 c
+10.627254 16.701889 12.166229 13.988431 12.312027 10.383987 c
+11.250943 9.995193 10.270859 9.452501 9.420372 8.820711 c
+h
+1.271676 6.180330 m
+2.178862 7.087516 l
+3.086048 6.188430 l
+3.361444 5.921134 3.766437 5.921134 4.041833 6.188430 c
+4.309129 6.455726 4.309129 6.876920 4.041833 7.144216 c
+3.134647 8.043302 l
+4.041833 8.950487 l
+4.309129 9.217783 4.309129 9.630877 4.041833 9.898172 c
+3.774537 10.173569 3.353344 10.173569 3.086048 9.906273 c
+2.178862 8.999086 l
+1.271676 9.898172 l
+0.996281 10.165468 0.583187 10.165468 0.315891 9.898172 c
+0.040496 9.638977 0.040496 9.209683 0.315891 8.942388 c
+1.214977 8.043302 l
+0.315891 7.144216 l
+0.040496 6.868820 0.048595 6.463826 0.315891 6.188430 c
+0.583187 5.913034 1.004380 5.921134 1.271676 6.180330 c
+h
+11.526215 4.827563 m
+8.124268 4.827563 l
+8.488762 5.426953 8.990954 6.058743 9.606544 6.641934 c
+9.744243 6.560936 9.873840 6.496137 10.003439 6.431338 c
+10.165436 6.342239 10.319334 6.309840 10.473231 6.309840 c
+10.926825 6.309840 11.307518 6.641934 11.307518 7.079328 c
+11.307518 7.322324 11.218420 7.549121 10.999723 7.743518 c
+11.396617 8.010814 11.817811 8.253810 12.271403 8.456306 c
+12.166105 7.087428 11.906909 5.856247 11.526215 4.827563 c
+h
+8.472598 1.781921 m
+7.800308 1.781921 7.460114 2.219315 7.460114 2.899704 c
+7.460114 3.029302 7.476313 3.167000 7.500613 3.312798 c
+10.781062 3.312798 l
+10.149272 2.340813 9.355484 1.781921 8.472598 1.781921 c
+h
+f*
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 15.093994 0.000000 cm
+0.749020 0.188235 0.188235 scn
+0.000000 6.744792 m
+0.000000 10.268483 2.856517 13.125000 6.380208 13.125000 c
+6.744792 13.125000 l
+10.268483 13.125000 13.125000 10.268483 13.125000 6.744792 c
+13.125000 6.380208 l
+13.125000 2.856517 10.268483 0.000000 6.744792 0.000000 c
+6.380208 0.000000 l
+2.856517 0.000000 0.000000 2.856517 0.000000 6.380208 c
+0.000000 6.744792 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 19.468994 2.054810 cm
+1.000000 1.000000 1.000000 scn
+4.955049 6.115142 m
+5.535097 6.695190 l
+4.375000 7.855288 l
+3.794951 7.275239 l
+4.955049 6.115142 l
+h
+-0.580049 2.900239 m
+-1.160097 2.320190 l
+0.000000 1.160093 l
+0.580049 1.740142 l
+-0.580049 2.900239 l
+h
+3.794951 7.275239 m
+-0.580049 2.900239 l
+0.580049 1.740142 l
+4.955049 6.115142 l
+3.794951 7.275239 l
+h
+f
+n
+Q
+q
+-1.000000 -0.000000 -0.000000 1.000000 23.843994 2.054810 cm
+1.000000 1.000000 1.000000 scn
+4.955049 6.115142 m
+5.535097 6.695190 l
+4.375000 7.855288 l
+3.794951 7.275239 l
+4.955049 6.115142 l
+h
+-0.580049 2.900239 m
+-1.160097 2.320190 l
+0.000000 1.160093 l
+0.580049 1.740142 l
+-0.580049 2.900239 l
+h
+3.794951 7.275239 m
+-0.580049 2.900239 l
+0.580049 1.740142 l
+4.955049 6.115142 l
+3.794951 7.275239 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  4690
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 28.218994 28.218689 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000004780 00000 n
+0000004803 00000 n
+0000004976 00000 n
+0000005050 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+5109
+%%EOF

+ 203 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/ImageNameSigntureVerifyFailure.imageset/sign.pdf

@@ -0,0 +1,203 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.752930 6.345215 cm
+0.286275 0.509804 0.901961 scn
+8.261871 0.000175 m
+10.286839 0.000175 11.858215 1.239456 12.854500 3.313024 c
+24.477819 3.313024 l
+24.899014 3.313024 25.223007 3.661319 25.223007 4.074412 c
+25.223007 4.487506 24.899014 4.827701 24.477819 4.827701 c
+13.437691 4.827701 l
+13.818385 6.066981 14.037082 7.500658 14.093781 9.072034 c
+14.604073 9.185432 15.130565 9.242131 15.673256 9.242131 c
+15.859553 9.242131 15.956752 9.161133 15.956752 9.031535 c
+15.956752 8.424045 15.551758 7.905652 15.551758 7.119965 c
+15.551758 6.390976 16.086349 5.913083 16.839638 5.913083 c
+18.597311 5.913083 20.695179 8.634641 21.221670 8.634641 c
+21.675262 8.634641 21.237869 6.245178 23.303337 6.245178 c
+23.716431 6.245178 24.202423 6.358577 24.566917 6.601573 c
+24.834213 6.787870 25.020510 7.055166 25.020510 7.403461 c
+25.020510 7.857054 24.712715 8.262047 24.234823 8.262047 c
+23.975628 8.262047 23.740730 8.083850 23.546333 8.083850 c
+22.922644 8.083850 23.530134 10.692009 21.707663 10.692009 c
+20.209187 10.692009 18.257116 8.302547 17.795424 8.302547 c
+17.722525 8.302547 17.682024 8.334946 17.682024 8.415944 c
+17.682024 8.634641 17.860222 8.991035 17.860222 9.379829 c
+17.860222 10.416614 17.115034 11.024103 15.908153 11.024103 c
+15.276362 11.024103 14.660771 10.967405 14.069481 10.862106 c
+13.769786 15.244139 11.574720 18.492188 8.464369 18.492188 c
+6.099205 18.492188 4.446831 16.694016 4.446831 14.191154 c
+4.446831 11.445297 6.188304 9.161133 8.075575 7.662656 c
+7.192688 6.771669 6.504199 5.791586 6.074905 4.827701 c
+0.745188 4.827701 l
+0.323995 4.827701 0.000000 4.487506 0.000000 4.074412 c
+0.000000 3.669418 0.332095 3.313024 0.745188 3.313024 c
+5.621313 3.313024 l
+5.597013 3.110527 5.580813 2.908031 5.580813 2.721733 c
+5.580813 1.053160 6.520399 0.000175 8.261871 0.000175 c
+h
+9.420067 8.820971 m
+7.889191 9.995453 6.236816 11.817924 6.236816 14.199287 c
+6.236816 15.649164 7.152102 16.702148 8.472382 16.702148 c
+10.626948 16.702148 12.165924 13.988690 12.311722 10.384247 c
+11.250638 9.995453 10.270554 9.452761 9.420067 8.820971 c
+h
+1.271585 6.180910 m
+2.178771 7.088096 l
+3.085956 6.189010 l
+3.361352 5.921714 3.766346 5.921714 4.041741 6.189010 c
+4.309037 6.456306 4.309037 6.877500 4.041741 7.144795 c
+3.134556 8.043881 l
+4.041741 8.951067 l
+4.309037 9.218363 4.309037 9.631456 4.041741 9.898752 c
+3.774445 10.174149 3.353252 10.174149 3.085956 9.906853 c
+2.178771 8.999666 l
+1.271585 9.898752 l
+0.996189 10.166048 0.583095 10.166048 0.315800 9.898752 c
+0.040404 9.639557 0.040404 9.210263 0.315800 8.942967 c
+1.214886 8.043881 l
+0.315800 7.144795 l
+0.040404 6.869400 0.048504 6.464406 0.315800 6.189010 c
+0.583095 5.913614 1.004289 5.921714 1.271585 6.180910 c
+h
+11.525909 4.827556 m
+8.123962 4.827556 l
+8.488457 5.426946 8.990649 6.058736 9.606239 6.641927 c
+9.743937 6.560928 9.873535 6.496129 10.003134 6.431331 c
+10.165131 6.342232 10.319029 6.309833 10.472926 6.309833 c
+10.926519 6.309833 11.307213 6.641927 11.307213 7.079320 c
+11.307213 7.322316 11.218115 7.549113 10.999418 7.743510 c
+11.396312 8.010806 11.817506 8.253802 12.271098 8.456299 c
+12.165800 7.087420 11.906604 5.856239 11.525909 4.827556 c
+h
+8.472507 1.782234 m
+7.800217 1.782234 7.460022 2.219627 7.460022 2.900017 c
+7.460022 3.029614 7.476222 3.167313 7.500521 3.313110 c
+10.780971 3.313110 l
+10.149180 2.341125 9.355392 1.782234 8.472507 1.782234 c
+h
+f*
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 15.093750 0.000000 cm
+0.749020 0.188235 0.188235 scn
+0.000000 6.744792 m
+0.000000 10.268483 2.856517 13.125000 6.380208 13.125000 c
+6.744792 13.125000 l
+10.268483 13.125000 13.125000 10.268483 13.125000 6.744792 c
+13.125000 6.380208 l
+13.125000 2.856517 10.268483 0.000000 6.744792 0.000000 c
+6.380208 0.000000 l
+2.856517 0.000000 0.000000 2.856517 0.000000 6.380208 c
+0.000000 6.744792 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 19.468750 2.054688 cm
+1.000000 1.000000 1.000000 scn
+4.955049 6.115264 m
+5.535097 6.695312 l
+4.375000 7.855410 l
+3.794951 7.275361 l
+4.955049 6.115264 l
+h
+-0.580049 2.900361 m
+-1.160097 2.320312 l
+0.000000 1.160215 l
+0.580049 1.740264 l
+-0.580049 2.900361 l
+h
+3.794951 7.275361 m
+-0.580049 2.900361 l
+0.580049 1.740264 l
+4.955049 6.115264 l
+3.794951 7.275361 l
+h
+f
+n
+Q
+q
+-1.000000 -0.000000 -0.000000 1.000000 23.843750 2.054688 cm
+1.000000 1.000000 1.000000 scn
+4.955049 6.115264 m
+5.535097 6.695312 l
+4.375000 7.855410 l
+3.794951 7.275361 l
+4.955049 6.115264 l
+h
+-0.580049 2.900361 m
+-1.160097 2.320312 l
+0.000000 1.160215 l
+0.580049 1.740264 l
+-0.580049 2.900361 l
+h
+3.794951 7.275361 m
+-0.580049 2.900361 l
+0.580049 1.740264 l
+4.955049 6.115264 l
+3.794951 7.275361 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  4686
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 28.218750 28.218750 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000004776 00000 n
+0000004799 00000 n
+0000004972 00000 n
+0000005046 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+5105
+%%EOF

+ 12 - 12
PDF Office/PDF Master/Class/DigtalSignature/CPDFDigtalView/KMPDFDigitalSignViewController.swift

@@ -145,24 +145,24 @@ class KMPDFDigitalSignViewController: NSViewController, CPDFViewDelegate, CPDFDi
             self.type = .failure;
         }
         
-        if (.Success == self.type) {
-            self.stateButton.image = NSImage(named: "ImageNameSigntureVerifySuccess")
-            self.stateLbl.stringValue = NSLocalizedString("Signature is valid.", comment: "")
-        } else if(.Unknown == self.type) {
-            self.stateButton.image = NSImage(named: "ImageNameSigntureTrustedFailure")
-            if(self.signatures.count > 1) {
-                self.stateLbl.stringValue = NSLocalizedString("At least one signature is invalid.", comment: "")
-            } else {
-                self.stateLbl.stringValue = NSLocalizedString("Signature is invalid", comment: "")
-            }
-        } else {
+//        if (.Success == self.type) {
+//            self.stateButton.image = NSImage(named: "ImageNameSigntureVerifySuccess")
+//            self.stateLbl.stringValue = NSLocalizedString("Signature is valid.", comment: "")
+//        } else if(.Unknown == self.type) {
+//            self.stateButton.image = NSImage(named: "ImageNameSigntureTrustedFailure")
+//            if(self.signatures.count > 1) {
+//                self.stateLbl.stringValue = NSLocalizedString("At least one signature is invalid.", comment: "")
+//            } else {
+//                self.stateLbl.stringValue = NSLocalizedString("Signature is invalid", comment: "")
+//            }
+//        } else {
             self.stateButton.image = NSImage(named: "ImageNameSigntureVerifyFailure")
             if(self.signatures.count > 1) {
                 self.stateLbl.stringValue = NSLocalizedString("At least one signature is invalid.", comment: "")
             } else {
                 self.stateLbl.stringValue = NSLocalizedString("Signature is invalid", comment: "")
             }
-        }
+//        }
     }
     
     func writeSignatureToWidget(_ widget: CPDFSignatureWidgetAnnotation, _ path: String, _ password: String, _ config: CPDFSignatureConfig, _ isLock: Bool) ->() {