Browse Source

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

wanjun 11 months ago
parent
commit
b97c5bae1a

+ 1 - 7
PDF Office/PDF Master/Class/KMAdvertisement/Config/KMAdvertisementConfig.swift

@@ -114,17 +114,11 @@
     public var language: KMAdvertisementLanguageType = .unknow
     
     func activityBaseURL() -> String {
-        #if DEBUG
-        if (isDebug) {
-            // 测试 服务器
+        if kTestMode == 1{
             return "http://test-store.kdan.cn:3019"
         } else {
-            //正式版 服务器
             return "https://store.filmagepro.com:3018"
         }
-        #else
-        return "https://store.filmagepro.com:3018"
-        #endif
     }
     
     public func initParameters(appName: KMAdvertisementAppNameType, subscribeType:KMAdvertisementSubscribeType, platform: KMAdvertisementPlatformType) {

+ 4 - 4
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationSelectLinkViewController.swift

@@ -338,11 +338,11 @@ enum KMAnnotationLinkType: UInt {
         }
         
         if urlRecord!.isEmpty {
-            goButton.layer!.backgroundColor = KMAppearance.Interactive.m0Color().cgColor
-            goButton.setTitleColor(KMAppearance.Layout.w0Color())
-        } else {
             goButton.layer!.backgroundColor = KMAppearance.Interactive.m0Color().withAlphaComponent(0.4).cgColor
             goButton.setTitleColor(KMAppearance.Layout.w0Color().withAlphaComponent(0.4))
+        } else {
+            goButton.layer!.backgroundColor = KMAppearance.Interactive.m0Color().cgColor
+            goButton.setTitleColor(KMAppearance.Layout.w0Color())
         }
     }
     
@@ -493,7 +493,7 @@ enum KMAnnotationLinkType: UInt {
             } else {
                 isGo = true
                 dexPage = Int(startPage!) ?? 0
-                goButton.title = NSLocalizedString("Go", tableName: "MainMenu", comment: "")
+                goButton.title = NSLocalizedString("Go", comment: "")
             }
 
             goButton.setTitleColor(KMAppearance.Layout.w0Color())