【广告SDK】数据接入

PDF Office/PDF Office DMG/AppDelegate.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMAdvertisement
 
 @main
 class AppDelegate: NSObject, NSApplicationDelegate {

PDF Office/PDF Office Pro/AppDelegate.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMAdvertisement
 
 @main
 class AppDelegate: NSObject, NSApplicationDelegate {

PDF Office/PDF Office.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2122,7 +2122,7 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "05DD0923-44A7-40F2-9B68-9FC2A560DBBB - 76fab475810e21cd"
+                  uuid = "05DD0923-44A7-40F2-9B68-9FC2A560DBBB - 76fab475810e2e86"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -2132,12 +2132,12 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Controller/Login&amp;Register/KMLoginWindowController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "163"
-                  endingLineNumber = "163"
+                  startingLineNumber = "138"
+                  endingLineNumber = "138"
                   offsetFromSymbolStart = "672">
                </Location>
                <Location
-                  uuid = "05DD0923-44A7-40F2-9B68-9FC2A560DBBB - a772ce92ca9dc1e3"
+                  uuid = "05DD0923-44A7-40F2-9B68-9FC2A560DBBB - a772ce92ca9dcea8"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -2147,8 +2147,8 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Controller/Login&amp;Register/KMLoginWindowController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "163"
-                  endingLineNumber = "163"
+                  startingLineNumber = "138"
+                  endingLineNumber = "138"
                   offsetFromSymbolStart = "120">
                </Location>
             </Locations>
@@ -2266,5 +2266,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "98111161-EF3C-4C1E-8882-E656CF41DB82"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Office/Class/Home/ViewController/KMHomeViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "145"
+            endingLineNumber = "145"
+            landmarkName = "initNetworkingData()"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "98111161-EF3C-4C1E-8882-E656CF41DB82 - f3d9a85a13a2e14f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Office.KMHomeViewController.initNetworkingData() -&gt; ()"
+                  moduleName = "PDF Office"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/Home/ViewController/KMHomeViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "146"
+                  endingLineNumber = "146"
+                  offsetFromSymbolStart = "28">
+               </Location>
+               <Location
+                  uuid = "98111161-EF3C-4C1E-8882-E656CF41DB82 - c38ab69fbc6a4d1e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Swift.Optional&lt;Swift.Array&lt;KMAdvertisement.KMAdvertisementModel&gt;&gt;, Swift.Optional&lt;Swift.AnyObject&gt;, Swift.Optional&lt;Swift.Error&gt;) -&gt; () in PDF_Office.KMHomeViewController.initNetworkingData() -&gt; ()"
+                  moduleName = "PDF Office"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/Home/ViewController/KMHomeViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "146"
+                  endingLineNumber = "146"
+                  offsetFromSymbolStart = "140">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

PDF Office/PDF Office/AppDelegate.swift

@@ -34,6 +34,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         // Insert code here to initialize your application
+        //MARK: 广告数据初始化
+        KMAdvertisementManager.manager.initConfig(appName: .PDFReaderProMac,
+                                                  subscribeType: .unsubscribed,
+                                                  platform: .Mac)
+        //测试模式，默认false
+        KMAdvertisementManager.manager.debug = true
         
         self.initMainMenu()
         /// pro
@@ -42,13 +48,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         DBClientsManager.setup(withAppKeyDesktop: "jxjlqfm1cfp2mjj")
         
         reopenDocument(forPaths: [])
-        
-        //广告数据初始化
-        KMAdvertisementManager.manager.initConfig(appName: .PDFReaderProMac,
-                                                  subscribeType: .unsubscribed,
-                                                  platform: .Mac)
-        //测试模式，默认false
-        KMAdvertisementManager.manager.debug = true
     }
     
     func application(_ application: NSApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {

PDF Office/PDF Office/Class/Home/ViewController/KMHomeViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMAdvertisement
 
 @objc enum KMHomeToolState : Int {
     case OpenPDF = 0
@@ -110,16 +111,15 @@ import Cocoa
         
         self.productPromotionPDFProSeries = ["Windows", "iPhone / iPad", "Android"]
         self.productPromotionOthers = ["ComPDFKit", "ComVideoKit", "SignFlow", "FiImage Editor", "FiImage Screen", "Free PDF Templates"]
-        self.productPromotionData = ["Windows": ["Name" : "Windows", "Image" : "icon_home_logo_windows"],
-                                     "iPhone / iPad" : ["Name" : "iPhone / iPad", "Image" : "icon_home_logo_mac"],
-                                     "Android" : ["Name" : "Android", "Image" : "icon_home_logo_android"],
-                                     "ComPDFKit" : ["Name" : "ComPDFKit", "Image" : "icon_home_logo_comPDFKit"],
-                                     "ComVideoKit" : ["Name" : "ComVideoKit", "Image" : "icon_home_logo_comVideoKit"],
-                                     "SignFlow" : ["Name" : "SignFlow", "Image" : "icon_home_logo_signflow"],
-                                     "FiImage Editor" : ["Name" : "FiImage Editor", "Image" : "icon_home_logo_editor"],
-                                     "FiImage Screen" : ["Name" : "FiImage Screen", "Image" : "icon_home_logo_screen"],
-                                     "Free PDF Templates" : ["Name" : "Free PDF Templates", "Image" : "icon_home_logo_templates"]]
-        
+        self.productPromotionData = ["Windows": ["Name" : "Windows", "Image" : "icon_home_logo_windows", "link":""],
+                                     "iPhone / iPad" : ["Name" : "iPhone / iPad", "Image" : "icon_home_logo_mac", "link":""],
+                                     "Android" : ["Name" : "Android", "Image" : "icon_home_logo_android", "link":""],
+                                     "ComPDFKit" : ["Name" : "ComPDFKit", "Image" : "icon_home_logo_comPDFKit", "link":""],
+                                     "ComVideoKit" : ["Name" : "ComVideoKit", "Image" : "icon_home_logo_comVideoKit", "link":""],
+                                     "SignFlow" : ["Name" : "SignFlow", "Image" : "icon_home_logo_signflow", "link":""],
+                                     "FiImage Editor" : ["Name" : "FiImage Editor", "Image" : "icon_home_logo_editor", "link":""],
+                                     "FiImage Screen" : ["Name" : "FiImage Screen", "Image" : "icon_home_logo_screen", "link":""],
+                                     "Free PDF Templates" : ["Name" : "Free PDF Templates", "Image" : "icon_home_logo_templates"], "link":""]
         NSEvent.addLocalMonitorForEvents(matching: .keyDown) { (aEvent) -> NSEvent? in
             self.keyDown(with: aEvent)
             return aEvent
@@ -132,7 +132,7 @@ import Cocoa
             self.otherMouseDown(with: aEvent)
             return aEvent
         }
-        
+        self.initNetworkingData()
         self.initLocalization()
         self.initializeUI()
         
@@ -141,6 +141,21 @@ import Cocoa
         NotificationCenter.default.addObserver(self, selector: #selector(homeFileRectChange(_:)), name: Notification.Name("KMHomeFileRectChange"), object: nil)
     }
     
+    func initNetworkingData() {
+        KMAdvertisementManager.manager.fetchData { [unowned self] data, responseObject, error in
+            print("获取广告数据成功")
+//            print(error)
+//            print(responseObject)
+            if data != nil {
+                for model in data! {
+                    if model.showType == .list {
+                        
+                    }
+                }
+            }
+        }
+    }
+    
     // MARK: Init
     
     func initializeUI() {

PDF Office/PDF Office/Class/Home/ViewController/KMHomeViewController.xib

@@ -282,7 +282,7 @@
                                                         <rect key="frame" x="-100" y="-100" width="253" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="eMA-3D-xnv" customClass="KMToolSetScroller" customModule="PDF_Office" customModuleProvider="target">
+                                                    <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="eMA-3D-xnv" customClass="KMToolSetScroller" customModule="PDF_Office" customModuleProvider="target">
                                                         <rect key="frame" x="255" y="0.0" width="15" height="652"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>

PDF Office/PDF Office/Info.plist

@@ -295,6 +295,11 @@
 			</array>
 		</dict>
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIAppFonts</key>
 	<array>
 		<string>SF-Pro-Text-Regular.otf</string>

PDF Office/PDF Office/Third Pard Library/KMAdvertisement.framework/Versions/A/Headers/KMAdvertisement-Swift.h

@@ -341,7 +341,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) KMAdvertisem
 /// @abstract 获取数据
 /// @param data 传入参数 类型为KMAdvertisementModel
 /// @return
-- (void)fetchDataWithCompletion:(void (^ _Nonnull)(NSArray<KMAdvertisementModel *> * _Nullable, NSError * _Nullable))completion;
+- (void)fetchDataWithCompletion:(void (^ _Nonnull)(NSArray<KMAdvertisementModel *> * _Nullable, id _Nullable, NSError * _Nullable))completion;
 @end
 
 enum KMAdvertisementShowType : NSInteger;
@@ -389,6 +389,7 @@ SWIFT_CLASS("_TtC15KMAdvertisement24KMAdvertisementModelItem")
 @property (nonatomic, readonly, copy) NSString * _Nullable startTime;
 @property (nonatomic, readonly, copy) NSString * _Nullable endTime;
 @property (nonatomic, readonly, strong) Language * _Nullable linkURL;
+@property (nonatomic, readonly, strong) Language * _Nullable tips;
 @property (nonatomic) enum KMAdvertisementActionType actionType;
 @end
 
@@ -835,7 +836,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) KMAdvertisem
 /// @abstract 获取数据
 /// @param data 传入参数 类型为KMAdvertisementModel
 /// @return
-- (void)fetchDataWithCompletion:(void (^ _Nonnull)(NSArray<KMAdvertisementModel *> * _Nullable, NSError * _Nullable))completion;
+- (void)fetchDataWithCompletion:(void (^ _Nonnull)(NSArray<KMAdvertisementModel *> * _Nullable, id _Nullable, NSError * _Nullable))completion;
 @end
 
 enum KMAdvertisementShowType : NSInteger;
@@ -883,6 +884,7 @@ SWIFT_CLASS("_TtC15KMAdvertisement24KMAdvertisementModelItem")
 @property (nonatomic, readonly, copy) NSString * _Nullable startTime;
 @property (nonatomic, readonly, copy) NSString * _Nullable endTime;
 @property (nonatomic, readonly, strong) Language * _Nullable linkURL;
+@property (nonatomic, readonly, strong) Language * _Nullable tips;
 @property (nonatomic) enum KMAdvertisementActionType actionType;
 @end
 

PDF Office/PDF Office/Third Pard Library/KMAdvertisement.framework/Versions/A/Headers/KMAdvertisementManager.swift

@@ -66,7 +66,7 @@ extension KMAdvertisementManager {
      @param data 传入参数 类型为KMAdvertisementModel
      @return
       */
-    @objc public func fetchData(completion:@escaping (_ data: [KMAdvertisementModel]?, _ error:Error?) -> Void) -> Void {
+    @objc public func fetchData(completion:@escaping (_ data: [KMAdvertisementModel]?, _ responseObject: AnyObject?, _ error:Error?) -> Void) -> Void {
         print("开始获取数据")
         var version: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString").debugDescription
         if (version.count == 0) {
@@ -82,7 +82,7 @@ extension KMAdvertisementManager {
         let cacheData = KMAdvertisementCache.default.readData()
         if cacheData.count != 0 {
             self.parseData(data: cacheData) { data in
-                completion(data, nil)
+                completion(data, nil, nil)
             }
         }
         
@@ -93,11 +93,18 @@ extension KMAdvertisementManager {
                 let array = responseObject?["list"] ?? []
                 if array != nil {
                     //解析数据
+                    print("开始解析数据")
                     weakSelf.parseData(data: array as! [NSDictionary]) { data in
                         print("数据处理完毕")
-                        completion(data, nil)
+                        completion(data, responseObject, nil)
                     }
+                } else {
+                    print("解析数据失败array")
+                    completion(nil, responseObject, error)
                 }
+            } else {
+                print("解析数据失败数据不存在")
+                completion(nil, responseObject, error)
             }
         }
     }

PDF Office/PDF Office/Third Pard Library/KMAdvertisement.framework/Versions/A/Headers/KMAdvertisementModel.swift

@@ -45,25 +45,25 @@
     public let endTime: String? //结束时间 时间戳
     public var hidden: Bool?
     
-    var index: Int?
-    let title: Text?
-    let imageURL: Image?
-    let ipadImageURL: Image?
+    public var index: Int?
+    public let title: Text?
+    public let imageURL: Image?
+    public let ipadImageURL: Image?
     public let linkURL: Language?
-    let tips: Language?
-    let button: Text?
+    public let tips: Language?
+    public let button: Text?
     public var actionType: KMAdvertisementActionType = .URL
     
     public struct Text: Codable {
-        let font: Font?
-        let color: Color?
-        let background: Background?
-        let language: Language?
+        public let font: Font?
+        public let color: Color?
+        public let background: Background?
+        public let language: Language?
     }
     
     public struct Font: Codable {
-        let name: String?
-        let size: Int?
+        public let name: String?
+        public let size: Int?
     }
     
     public struct Color: Codable {
@@ -71,12 +71,12 @@
         let normal: ColorState?
         
         struct ColorState: Codable {
-            let dark: ColorInfo?
-            let universal: ColorInfo?
+            public let dark: ColorInfo?
+            public let universal: ColorInfo?
             
             struct ColorInfo: Codable {
-                var hex: String?
-                var alpha: Float?
+                public var hex: String?
+                public var alpha: Float?
             }
         }
     }
@@ -86,26 +86,26 @@
         let layer: Layer?
         
         struct Layer: Codable {
-            let cornerRadius: CGFloat?
-            let borderWidth: CGFloat?
-            let borderColor: Color?
+            public let cornerRadius: CGFloat?
+            public let borderWidth: CGFloat?
+            public let borderColor: Color?
         }
     }
     
     public struct Image: Codable {
-        let height: ImageInfo?
-        let normal: ImageInfo?
-        let background: Background?
+        public let height: ImageInfo?
+        public let normal: ImageInfo?
+        public let background: Background?
     }
     
     public struct ImageInfo: Codable {
-        let dark: Language?
-        let universal: Language?
+        public let dark: Language?
+        public let universal: Language?
     }
     
     public class Language: NSObject, Codable {
-        let en: String?
-        let zh_TW: String?
-        let zh_CN: String?
+        public let en: String?
+        public let zh_TW: String?
+        public let zh_CN: String?
     }
 }

PDF Office/PDF Office/Third Pard Library/KMAdvertisement.framework/Versions/A/_CodeSignature/CodeResources

@@ -51,7 +51,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			KLSyoK2/5K6UuRFEXEYR4zWInqv7e71GGt/8+VQtGIM=
+			kTtZTl5ukGAEzvO5SgMywTkoF4Eqf3cmB8wX61ECnCo=
 			</data>
 		</dict>
 		<key>Headers/KMAdvertisement.h</key>
@@ -72,14 +72,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			ZeVH1uQSo5DQkYrwCzg4oSRrEGugOPeggrAUOW4hSQ4=
+			ehHaq5sIPeLM/oemAtC+6mjSsNlTDSbChZAkjaUVyzE=
 			</data>
 		</dict>
 		<key>Headers/KMAdvertisementModel.swift</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			VC2rMFY2disua97ohMT7LWCVpZstH8TyKDnKkcexoP4=
+			ljkiyhZBadrpmWRtl/sEItXlFUXYz6UwpQf2kWTge1w=
 			</data>
 		</dict>
 		<key>Headers/KMAdvertisementRequestServer.swift</key>
@@ -100,14 +100,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			gduzDxaL9B3Trmf94etebjV0700AE2KQ/YEsS8fNf2k=
+			OuJBK0Sej+Uw8+xN74Mdm4c7k9fKvRPxSw9KgRtKzQ0=
 			</data>
 		</dict>
 		<key>Modules/KMAdvertisement.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			ZLcCJ9kO+1nsIMtzskG467tKtL19Hmh9iIj5j2IMw0o=
+			FggQ8amdrOrDnBhFmGV/UQfhTsAnPyePKxAlhBjUU3I=
 			</data>
 		</dict>
 		<key>Modules/KMAdvertisement.swiftmodule/arm64-apple-macos.abi.json</key>
@@ -128,7 +128,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			6WBMsLw9DExXRML8bb9XoPmSrCoqcKpSTKihxcX69Hk=
+			FWDZQNrOrIkI6ZlxFZ7tA1SBjg7she+2wHizZK8ttg0=
 			</data>
 		</dict>
 		<key>Modules/KMAdvertisement.swiftmodule/x86_64-apple-macos.abi.json</key>
@@ -149,7 +149,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			6UyUbXL91KqyGklLG2g2DDqVCeGCQF3y20FMy/Sb+C4=
+			/BTWxWZeW4g628hXYk565yvV4WHh9Zm1iRhXLsiAsKI=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

PDF Office/PDF-Office-DMG-Info.plist

@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIAppFonts</key>
 	<array>
 		<string>SF-Pro-Text-Regular.otf</string>

PDF Office/PDF-Office-Pro-Info.plist

@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIAppFonts</key>
 	<array>
 		<string>SF-Pro-Text-Regular.otf</string>