ソースを参照

【PDFull】图标换色替换

niehaoyu 2 ヶ月 前
コミット
b58a44a1dc

+ 1 - 1
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "ic_sidebar_annotation_hightlight.pdf",
+      "filename" : "ic_subtoolbar_mytools_highlight_nor.pdf",
       "idiom" : "universal"
     }
   ],

BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/ic_sidebar_annotation_hightlight.pdf


+ 88 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/ic_subtoolbar_mytools_highlight_nor.pdf

@@ -0,0 +1,88 @@
+%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 3.000000 3.500000 cm
+0.439216 0.392157 1.000000 scn
+12.607775 1.000021 m
+7.696358 13.278564 l
+6.303642 13.278564 l
+1.392225 1.000021 l
+0.000000 1.000021 l
+0.000000 0.000021 l
+4.000000 0.000021 l
+4.000000 1.000021 l
+3.007762 1.000021 l
+4.107717 3.750021 l
+9.892282 3.750021 l
+10.992238 1.000021 l
+10.000000 1.000021 l
+10.000000 0.000021 l
+14.000000 0.000021 l
+14.000000 1.000021 l
+12.607775 1.000021 l
+h
+9.492299 4.750021 m
+7.000000 10.981022 l
+4.507701 4.750021 l
+9.492299 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /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
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/ic 1.pdf


+ 1 - 1
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFText.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "edit 1.pdf",
+      "filename" : "ic.pdf",
       "idiom" : "universal"
     },
     {

+ 0 - 155
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFText.imageset/edit 1.pdf

@@ -1,155 +0,0 @@
-%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 4.000000 5.500000 cm
-1.000000 1.000000 1.000000 scn
-8.000000 9.000000 m
-8.000000 6.500000 l
-6.500000 6.500000 l
-6.500000 7.500000 l
-4.750000 7.500000 l
-4.750000 1.500000 l
-5.500000 1.500000 l
-5.500000 0.000000 l
-2.500000 0.000000 l
-2.500000 1.500000 l
-3.250000 1.500000 l
-3.250000 7.500000 l
-1.500000 7.500000 l
-1.500000 6.500000 l
-0.000000 6.500000 l
-0.000000 9.000000 l
-8.000000 9.000000 l
-h
-f*
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 1.750000 2.250000 cm
-1.000000 1.000000 1.000000 scn
-16.500000 1.500000 m
-16.500000 0.750000 l
-17.250000 0.750000 l
-17.250000 1.500000 l
-16.500000 1.500000 l
-h
-0.000000 1.500000 m
--0.750000 1.500000 l
--0.750000 0.750000 l
-0.000000 0.750000 l
-0.000000 1.500000 l
-h
-0.000000 14.000000 m
-0.000000 14.750000 l
--0.750000 14.750000 l
--0.750000 14.000000 l
-0.000000 14.000000 l
-h
-16.500000 2.250000 m
-0.000000 2.250000 l
-0.000000 0.750000 l
-16.500000 0.750000 l
-16.500000 2.250000 l
-h
-0.750000 1.500000 m
-0.750000 14.000000 l
--0.750000 14.000000 l
--0.750000 1.500000 l
-0.750000 1.500000 l
-h
-0.000000 13.250000 m
-11.250000 13.250000 l
-11.250000 14.750000 l
-0.000000 14.750000 l
-0.000000 13.250000 l
-h
-15.750000 7.750000 m
-15.750000 1.500000 l
-17.250000 1.500000 l
-17.250000 7.750000 l
-15.750000 7.750000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 14.000000 12.500000 cm
-1.000000 1.000000 1.000000 scn
-0.000000 0.750000 m
-6.000000 0.750000 l
-6.000000 2.250000 l
-0.000000 2.250000 l
-0.000000 0.750000 l
-h
-f
-n
-Q
-q
--0.000000 -1.000000 1.000000 -0.000000 11.000000 17.000000 cm
-1.000000 1.000000 1.000000 scn
-0.000000 5.250000 m
-6.000000 5.250000 l
-6.000000 6.750000 l
--0.000000 6.750000 l
-0.000000 5.250000 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1717
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /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
-0000001807 00000 n
-0000001830 00000 n
-0000002003 00000 n
-0000002077 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-2136
-%%EOF

+ 59 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFText.imageset/ic.pdf

@@ -0,0 +1,59 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Filter /FlateDecode
+     /Length 3 0 R
+  >>
+stream
+x•”ÁNÃ@Dïû9#5ͦMB¯€Äø„¨(HI%T‰ïg6ªÇ#a(õÅ“—Øk{7»}:~}ŒÇ×ç‡êñ-mýi<§Ï”ëfµª1±¡â»½‰®îà Æ%5õ~whs�Èâ»Á¿?�§to‹³Þò̉’BØ`bNûzXuȲ3–1¶6§ö/&±»º]uȤ¾Žš16xXÈ8«Ùg%lJïwé”^þ»oÙæÓZÁ×÷-³.V¿l,%º,kÈp�*�‚9]º¸ä"œRÈÐ"&Áºr<¬@ÆûB¿R8¨&€ƒNÒ+‡.‹‘I<³ë B(Ñ¥«Ë쵬cLjŠËjñ¥¦Ÿ¬¬«2>ŽD6íµ:•z‚J<æ×Ù'ƒ	,F(…ÅG��á€ˆŸé¦‰³Ë¼&®ÿMÌÃÉ.¸ÝàaÎÊ�Ó-flÄ$Öñ²7¬‚Â_b“à`¦»¥•ÎÊ‘VȤ•ÞKôµ’I°õò
ŠDI‘
+endstream
+endobj
+
+3 0 obj
+  380
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /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
+0000000498 00000 n
+0000000520 00000 n
+0000000693 00000 n
+0000000767 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+826
+%%EOF

+ 29 - 29
PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m

@@ -1070,36 +1070,36 @@ static VerificationManager *__verificationManager = nil;
 
 - (ActivityStatus)status {
     ActivityStatus tStatus = ActivityStatusTrialExpire;
-//    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
-//        tStatus  = ActivityStatusLicenseExpire;
-//    }else{
-//        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
+    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
+        tStatus  = ActivityStatusLicenseExpire;
+    }else{
+        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
             tStatus = ActivityStatusVerification;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
-//            tStatus = ActivityStatusTrial;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
-//            tStatus = ActivityStatusTrialExpire;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//    }
-//
-//    if (ActivityStatusTrial == tStatus) {
-//        if (self.expireDate &&
-//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-//            tStatus = ActivityStatusTrialExpire;
-//        }
-//    }else if (ActivityStatusVerification == tStatus) {
-//        if (self.expireDate &&
-//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//        if (self[@"dejvice"][@"status"] &&
-//            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
-//            //激活码过期
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//    }
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
+            tStatus = ActivityStatusTrial;
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
+            tStatus = ActivityStatusTrialExpire;
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
+            tStatus = ActivityStatusVerifExpire;
+        }
+    }
+
+    if (ActivityStatusTrial == tStatus) {
+        if (self.expireDate &&
+            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+            tStatus = ActivityStatusTrialExpire;
+        }
+    }else if (ActivityStatusVerification == tStatus) {
+        if (self.expireDate &&
+            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+            tStatus = ActivityStatusVerifExpire;
+        }
+        if (self[@"dejvice"][@"status"] &&
+            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
+            //激活码过期
+            tStatus = ActivityStatusVerifExpire;
+        }
+    }
     return tStatus;
 }