v1.2

v1.2

Author: Dawninest

J2K-saver/j2k-saver.xcodeproj/project.xcworkspace/xcuserdata/jiangyibo.xcuserdatad/UserInterfaceState.xcuserstate

@@ -9,74 +9,172 @@
 import Foundation
 import ScreenSaver
 
-let SCREEN_W = NSScreen.main?.frame.size.width
-let SCREEN_H = NSScreen.main?.frame.size.height
-
 final class SaverView: ScreenSaverView {
 
     let jikeY = NSColor(red:1, green:0.894, blue:0.066, alpha:1.00) // FFE411
 
+    let ratio: CGFloat = 0.618
+    
     let canDoText = NSTextField()
     let daliyText = NSTextField()
-    let dateNumText = NSTextField()
     let sdfText = NSTextField()
 
+    let dateNumText = NSView()
+    let dateNum_h = NSTextField()
+    let dateNum_m = NSTextField()
+    let dateNum_s = NSTextField()
+    
+    let lineOne = NSView()
+    let lineTwo = NSView()
+    
     override init!(frame: NSRect, isPreview: Bool) {
         super.init(frame: frame, isPreview: isPreview)
 
 
 
     }
 
-    func initUI () {
-        
-        canDoText.frame = NSRect.init(x: 0, y: SCREEN_H! - 280, width: SCREEN_W!, height: 80)
-        canDoText.isEditable = false
-        canDoText.isBordered = false
-        canDoText.drawsBackground = false
-        canDoText.font = NSFont.systemFont(ofSize: 60)
-        canDoText.textColor = jikeY
-        canDoText.alignment = .center
-        self.addSubview(canDoText)
-        
-        daliyText.frame = NSRect.init(x: 0, y: SCREEN_H! - 340, width: SCREEN_W!, height: 50)
-        daliyText.isEditable = false
-        daliyText.isBordered = false
-        daliyText.drawsBackground = false
-        daliyText.font = NSFont.systemFont(ofSize: 30)
-        daliyText.textColor = jikeY
-        daliyText.alignment = .center
-        self.addSubview(daliyText)
-        
-        dateNumText.frame = NSRect.init(x: (SCREEN_W! - 770) / 2 + 10, y: SCREEN_H! - 520, width: 770, height: 200)
-        dateNumText.isEditable = false
-        dateNumText.isBordered = false
-        dateNumText.drawsBackground = false
-        dateNumText.font = NSFont.systemFont(ofSize: 180)
-        dateNumText.textColor = jikeY
-        dateNumText.alignment = .left
-        self.addSubview(dateNumText)
-        
-        let lineOne = NSView.init(frame: NSRect.init(x: 300, y: SCREEN_H! - 550, width: SCREEN_W! - 600, height: 4))
-        lineOne.wantsLayer = true
-        lineOne.layer?.setNeedsDisplay()
-        lineOne.layer?.backgroundColor = jikeY.cgColor
-        self.addSubview(lineOne)
-        
-        let lineTwo = NSView.init(frame: NSRect.init(x: 300, y: SCREEN_H! - 555, width: SCREEN_W! - 600, height: 1))
-        lineTwo.wantsLayer = true
-        lineTwo.layer?.setNeedsDisplay()
-        lineTwo.layer?.backgroundColor = jikeY.cgColor
-        self.addSubview(lineTwo)
-        
-        sdfText.frame = NSRect.init(x: 300, y: SCREEN_H! - 800, width: SCREEN_W! - 600, height: 200)
-        sdfText.isEditable = false
-        sdfText.isBordered = false
-        sdfText.drawsBackground = false
-        sdfText.font = NSFont.systemFont(ofSize: 40)
-        sdfText.textColor = jikeY
-        sdfText.alignment = .center
-        self.addSubview(sdfText)
+    func initUI (_ rect: NSRect) {
+        
+        if (rect.size.width < 300 && rect.size.height < 200) {
+            // 此时为在设置中的预览窗口 296 * 184
+            let width = rect.size.width
+            let height = rect.size.height
+            
+            let tipTitle = NSTextField()
+            tipTitle.frame = NSRect.init(x: width * 0.05, y: height * 0.618 + 10, width: width * 0.9, height: 30)
+            tipTitle.isEditable = false
+            tipTitle.isBordered = false
+            tipTitle.drawsBackground = false
+            tipTitle.font = NSFont.systemFont(ofSize: 20)
+            tipTitle.textColor = jikeY
+            tipTitle.alignment = .center
+            tipTitle.stringValue = "即刻黄历saver版"
+            self.addSubview(tipTitle)
+            
+            let tipLine = NSView.init(frame: NSRect.init(x: width * 0.05, y: height * 0.618, width: width * 0.9, height: 1))
+            tipLine.wantsLayer = true
+            tipLine.layer?.setNeedsDisplay()
+            tipLine.layer?.backgroundColor = jikeY.cgColor
+            self.addSubview(tipLine)
+            
+            let tipText = NSTextField()
+            tipText.frame = NSRect.init(x: width * 0.05, y: 10, width: width * 0.9, height: height * 0.618 - 20)
+            tipText.isEditable = false
+            tipText.isBordered = false
+            tipText.drawsBackground = false
+            tipText.font = NSFont.systemFont(ofSize: 12)
+            tipText.textColor = jikeY
+            tipText.alignment = .left
+            tipText.stringValue = "1.请在一起下载到的 j2k.app(dock工具) 中登录即刻账号以获得每日运势和即友金句\n2.请勿点击下面的 '屏幕保护程序选项...' 按钮"
+            self.addSubview(tipText)
+            
+        } else {
+            // 多屏幕下通过制定到当前window去取当前的窗口的尺寸
+            let width: CGFloat = (self.window?.screen?.frame.size.width)!
+            let height: CGFloat = (self.window?.screen?.frame.size.height)!
+            
+            let showWith = width * ratio
+            let widthPadding = width * (1 - ratio) / 2
+            let lineHeight = height * (1 - ratio)
+            canDoText.frame = NSRect.init(x: widthPadding, y: lineHeight + 280, width: showWith, height: 80)
+            canDoText.isEditable = false
+            canDoText.isBordered = false
+            canDoText.drawsBackground = false
+            canDoText.font = NSFont.systemFont(ofSize: 60)
+            canDoText.textColor = jikeY
+            canDoText.alignment = .center
+            self.addSubview(canDoText)
+            
+            daliyText.frame = NSRect.init(x: widthPadding, y: lineHeight + 220, width: showWith, height: 50)
+            daliyText.isEditable = false
+            daliyText.isBordered = false
+            daliyText.drawsBackground = false
+            daliyText.font = NSFont.systemFont(ofSize: 30)
+            daliyText.textColor = jikeY
+            daliyText.alignment = .center
+            self.addSubview(daliyText)
+            
+            
+            
+            dateNumText.frame = NSRect.init(x: widthPadding, y: lineHeight + 30, width: showWith, height: 200)
+            
+            let leftPadding = ( showWith - 840 ) / 2
+            
+            dateNum_h.frame = NSRect.init(x: leftPadding, y: 0, width: 240, height: 200)
+            dateNum_h.isEditable = false
+            dateNum_h.isBordered = false
+            dateNum_h.drawsBackground = false
+            dateNum_h.font = NSFont.systemFont(ofSize: 180)
+            dateNum_h.textColor = jikeY
+            dateNum_h.alignment = .center
+            dateNumText.addSubview(dateNum_h)
+            
+            let dateSignOne = NSTextField()
+            dateSignOne.frame = NSRect.init(x: leftPadding + 240, y: 0, width: 60, height: 200)
+            dateSignOne.isEditable = false
+            dateSignOne.isBordered = false
+            dateSignOne.drawsBackground = false
+            dateSignOne.font = NSFont.systemFont(ofSize: 180)
+            dateSignOne.textColor = jikeY
+            dateSignOne.alignment = .center
+            dateSignOne.stringValue = ":"
+            dateNumText.addSubview(dateSignOne)
+            
+            dateNum_m.frame = NSRect.init(x: leftPadding + 300, y: 0, width: 240, height: 200)
+            dateNum_m.isEditable = false
+            dateNum_m.isBordered = false
+            dateNum_m.drawsBackground = false
+            dateNum_m.font = NSFont.systemFont(ofSize: 180)
+            dateNum_m.textColor = jikeY
+            dateNum_m.alignment = .center
+            dateNumText.addSubview(dateNum_m)
+            
+            let dateSignTwo = NSTextField()
+            dateSignTwo.frame = NSRect.init(x: leftPadding + 540, y: 0, width: 60, height: 200)
+            dateSignTwo.isEditable = false
+            dateSignTwo.isBordered = false
+            dateSignTwo.drawsBackground = false
+            dateSignTwo.font = NSFont.systemFont(ofSize: 180)
+            dateSignTwo.textColor = jikeY
+            dateSignTwo.alignment = .center
+            dateSignTwo.stringValue = ":"
+            dateNumText.addSubview(dateSignTwo)
+            
+            dateNum_s.frame = NSRect.init(x: leftPadding + 600, y: 0, width: 240, height: 200)
+            dateNum_s.isEditable = false
+            dateNum_s.isBordered = false
+            dateNum_s.drawsBackground = false
+            dateNum_s.font = NSFont.systemFont(ofSize: 180)
+            dateNum_s.textColor = jikeY
+            dateNum_s.alignment = .center
+            dateNumText.addSubview(dateNum_s)
+            
+            self.addSubview(dateNumText)
+            
+            lineOne.frame = NSRect.init(x: widthPadding, y: lineHeight + 5, width: showWith, height: 4)
+            lineOne.wantsLayer = true
+            lineOne.layer?.setNeedsDisplay()
+            lineOne.layer?.backgroundColor = jikeY.cgColor
+            self.addSubview(lineOne)
+            
+            lineTwo.frame = NSRect.init(x: widthPadding, y: lineHeight, width: showWith, height: 1)
+            lineTwo.wantsLayer = true
+            lineTwo.layer?.setNeedsDisplay()
+            lineTwo.layer?.backgroundColor = jikeY.cgColor
+            self.addSubview(lineTwo)
+            
+            sdfText.frame = NSRect.init(x: widthPadding, y: lineHeight - 250, width: showWith, height: 200)
+            sdfText.isEditable = false
+            sdfText.isBordered = false
+            sdfText.drawsBackground = false
+            sdfText.font = NSFont.systemFont(ofSize: 40)
+            sdfText.textColor = jikeY
+            sdfText.alignment = .center
+            self.addSubview(sdfText)
+        }
+        
+
 
 
     }
@@ -163,7 +261,7 @@ final class SaverView: ScreenSaverView {
 
     override func draw(_ rect: NSRect) {
         super.draw(rect)
-        self.initUI()
+        self.initUI(rect)
         self.initData()
     }
 
@@ -212,7 +310,10 @@ final class SaverView: ScreenSaverView {
         let sec = theComponents.second! < 10 ? "0\(secStr)" : secStr
 
         daliyText.stringValue = "\(year) 年 \(mouth) 月 \(day) 日  \(week)"
-        dateNumText.stringValue = "\(hour):\(min):\(sec)"
+        dateNum_h.stringValue = "\(hour)"
+        dateNum_m.stringValue = "\(min)"
+        dateNum_s.stringValue = "\(sec)"
+        
     }
 
     override var hasConfigureSheet: Bool {

J2K-saver/j2k-saver/SaverView.swift

@@ -20,9 +20,9 @@
 
 人家不想在屏保中做扫码登录了嘛
 
-效果图大约是这样,macOS 没法截图屏保,我也很绝望啊
+4.28 修复了在大屏幕和多屏幕显示的BUG,现在效果图是这样(macOS 没法截图屏保)
 
-<img src="./readSupport/saver.jpeg" width=400 height=300/>
+<img src="./readSupport/saver.jpeg" width=300 height=400/>
 
 ------
 
@@ -37,13 +37,13 @@ star越多,我敲代码的手就越快[死不要脸求star]
 todo list:
 
 1. 指定场景/定时弹出(hard)
-2. saver 的多显示器兼容问题
+2. ~~saver 的多显示器兼容问题~~
 3. saver 的 macOS 支持问题(修改工程的Deployment Target 到 10.11 ,依然反馈不支持,怀疑是低版本macOS对Swift 5 的支持问题,如果需要用OC或低版本Swift 重构的话,我可能不会处理这个问题)
 4. issues 反馈的崩溃问题跟踪
 
 ------
 
-下载:    [[点击下载]](https://github.com/Dawninest/jikeCalendar-macOS/releases/download/v2.0/J2K.zip)
+下载:    [[点击下载]](https://github.com/Dawninest/jikeCalendar-macOS/releases/download/v1.2/J2K.zip) (v1.2)
 
 要求macOS版本 10.11及以上