【2025】【Home】Home界面整体架构调整

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Card/ComponentCardPDFTool/ComponentCardPDFTool.swift

@@ -105,12 +105,9 @@ public class ComponentCardPDFTool: ComponentBaseXibView {
             self.titleLabel.autoresizingMask = [.minYMargin, .maxXMargin, .maxYMargin]
             
             self.subTitleLabel.isHidden = false
-            var subSize = CGSize(width: CGRectGetWidth(self.frame)-56-12, height: 38)
-            if checkBox.isHidden == false {
-                subSize = CGSize(width: CGRectGetWidth(self.frame)-44-40, height: 38)
-            }
-            self.subTitleLabel.frame = CGRectMake(CGRectGetMaxX(self.iconImage.frame)+8, CGRectGetMinY(self.titleLabel.frame)-4-subSize.height, subSize.width, subSize.height)
+            self.subTitleLabel.frame = CGRectMake(self.iconWidthConst.constant+8+12, CGRectGetMinY(self.titleLabel.frame)-4-38, CGRectGetWidth(self.frame)-self.iconWidthConst.constant-20-12-12, 38)
             self.subTitleLabel.autoresizingMask = [.minYMargin, .maxXMargin, .maxYMargin, .width]
+            
         }
     }
     

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowser.swift

@@ -193,7 +193,7 @@ import Cocoa
                             let response = alert.runModal()
                             if (response == .alertFirstButtonReturn) { // 保存
                                 if let home = self.tabContents(at: 0) as? KMMainDocument, home.isHome { // 标记 home 最近列表需要强制刷新
-                                    home.homeViewController?.historyFileViewController.isForceReload = true
+//                                    home.homeViewController?.historyFileViewController.isForceReload = true
                                 }
                                 
                                 currentDocument.save(nil)

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -19,7 +19,7 @@ import Cocoa
     var rightMessageVC: KMVerificationMessageViewController!
     var rightToolbarItemView: NSView!
     
-    private var homeVC: KMHomeViewController?
+    private var homeVC: KMNHomeViewController?
     
     var savedNormalSetup: NSMutableDictionary = NSMutableDictionary()
     
@@ -734,7 +734,7 @@ extension KMBrowserWindowController: NSMenuDelegate, NSMenuItemValidation {
                     menuItem.action == KMSystemMenu.File.saveAsFlattenedPDFSelector) {
                     return false
                 }
-                return document.homeViewController!.validateMenuItem(menuItem)
+//                return document.homeViewController!.validateMenuItem(menuItem)
             } else {
                 return document.mainViewController!.validateMenuItem(menuItem)
             }
@@ -775,7 +775,7 @@ extension KMBrowserWindowController: NSMenuDelegate, NSMenuItemValidation {
             }
         }
         if (KMSystemMenu.isWindowSelector(sel: action)) {
-            return document.isHome ? document.homeViewController!.validateMenuItem(menuItem) : document.mainViewController!.validateMenuItem(menuItem)
+//            return document.isHome ? document.homeViewController!.validateMenuItem(menuItem) : document.mainViewController!.validateMenuItem(menuItem)
         }
         
         if action == #selector(redactAction) {
@@ -814,30 +814,30 @@ extension KMBrowserWindowController {
     @IBAction func importFromFile(_ sender: Any) {
         let document = self.browser?.activeTabContents() as? KMMainDocument
         if let data = document?.isHome, data {
-            document?.homeViewController?.importFromFile(sender)
+//            document?.homeViewController?.importFromFile(sender)
         } else {
-            self.homeVC = KMHomeViewController()
-            self.homeVC?.importFromFile(sender)
+            self.homeVC = KMNHomeViewController()
+//            self.homeVC?.importFromFile(sender)
         }
     }
     
     @IBAction func openBlankPage(_ sender: Any) {
         let document = self.browser?.activeTabContents() as? KMMainDocument
         if let data = document?.isHome, data {
-            document?.homeViewController?.openBlankPage()
+//            document?.homeViewController?.openBlankPage()
         } else {
-            self.homeVC = KMHomeViewController()
-            self.homeVC?.openBlankPage()
+            self.homeVC = KMNHomeViewController()
+//            self.homeVC?.openBlankPage()
         }
     }
     
     @IBAction func importFromScanner(_ sender: Any) {
         let document = self.browser?.activeTabContents() as? KMMainDocument
         if let data = document?.isHome, data {
-            document?.homeViewController?.importFromScanner()
+//            document?.homeViewController?.importFromScanner()
         } else {
-            self.homeVC = KMHomeViewController()
-            self.homeVC?.importFromScanner()
+            self.homeVC = KMNHomeViewController()
+//            self.homeVC?.importFromScanner()
         }
     }
     
@@ -1133,7 +1133,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemClick_mergePDF(sender)
+//                document.homeViewController?.menuItemClick_mergePDF(sender)
             } else {
                 document.mainViewController?.menuItemClick_mergePDF(sender)
             }
@@ -1146,7 +1146,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemClick_Compress(sender)
+//                document.homeViewController?.menuItemClick_Compress(sender)
             } else {
                 document.mainViewController?.menuItemClick_Compress(sender)
             }
@@ -1159,7 +1159,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToWord(sender)
+//                document.homeViewController?.menuItemAction_ConvertToWord(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToWord(sender)
             }
@@ -1172,7 +1172,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToExcel(sender)
+//                document.homeViewController?.menuItemAction_ConvertToExcel(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToExcel(sender)
             }
@@ -1185,7 +1185,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToPPT(sender)
+//                document.homeViewController?.menuItemAction_ConvertToPPT(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToPPT(sender)
             }
@@ -1198,7 +1198,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToRTF(sender)
+//                document.homeViewController?.menuItemAction_ConvertToRTF(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToRTF(sender)
             }
@@ -1211,7 +1211,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToHTML(sender)
+//                document.homeViewController?.menuItemAction_ConvertToHTML(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToHTML(sender)
             }
@@ -1224,7 +1224,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToText(sender)
+//                document.homeViewController?.menuItemAction_ConvertToText(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToText(sender)
             }
@@ -1237,7 +1237,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToCSV(sender)
+//                document.homeViewController?.menuItemAction_ConvertToCSV(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToCSV(sender)
             }
@@ -1250,7 +1250,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_ConvertToImage(sender)
+//                document.homeViewController?.menuItemAction_ConvertToImage(sender)
             } else {
                 document.mainViewController?.menuItemAction_ConvertToImage(sender)
             }
@@ -1263,7 +1263,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemClick_SettingPassword(sender)
+//                document.homeViewController?.menuItemClick_SettingPassword(sender)
             } else {
                 document.mainViewController?.menuItemClick_SettingPassword(sender)
             }
@@ -1285,7 +1285,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_closeWindow(sender)
+//                document.homeViewController?.menuItemAction_closeWindow(sender)
             } else {
                 document.mainViewController?.menuItemAction_closeWindow(sender)
             }
@@ -1298,7 +1298,7 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_closeAllWindows(sender)
+//                document.homeViewController?.menuItemAction_closeAllWindows(sender)
             } else {
                 document.mainViewController?.menuItemAction_closeAllWindows(sender)
             }
@@ -1497,10 +1497,10 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
     @IBAction func importFromWebPage(_ sender: Any?) {
         let document = self.browser?.activeTabContents() as? KMMainDocument
         if let data = document?.isHome, data {
-            document?.homeViewController?.importFromWebPage()
+//            document?.homeViewController?.importFromWebPage()
         } else {
-            self.homeVC = KMHomeViewController()
-            self.homeVC?.importFromWebPage()
+            self.homeVC = KMNHomeViewController()
+//            self.homeVC?.importFromWebPage()
         }
     }
     
@@ -3168,7 +3168,7 @@ extension KMBrowserWindowController: KMSystemWindowMenuRrotocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_showForwardTagPage(sender)
+//                document.homeViewController?.menuItemAction_showForwardTagPage(sender)
             } else {
                 document.mainViewController?.menuItemAction_showForwardTagPage(sender)
             }
@@ -3181,7 +3181,7 @@ extension KMBrowserWindowController: KMSystemWindowMenuRrotocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_showNextTagPage(sender)
+//                document.homeViewController?.menuItemAction_showNextTagPage(sender)
             } else {
                 document.mainViewController?.menuItemAction_showNextTagPage(sender)
             }
@@ -3194,7 +3194,7 @@ extension KMBrowserWindowController: KMSystemWindowMenuRrotocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_newTagPageToNewWindow(sender)
+//                document.homeViewController?.menuItemAction_newTagPageToNewWindow(sender)
             } else {
                 document.mainViewController?.menuItemAction_newTagPageToNewWindow(sender)
             }
@@ -3207,7 +3207,7 @@ extension KMBrowserWindowController: KMSystemWindowMenuRrotocol {
         }
         if let document = self.browser?.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-                document.homeViewController?.menuItemAction_mergeAllWindow(sender)
+//                document.homeViewController?.menuItemAction_mergeAllWindow(sender)
             } else {
                 document.mainViewController?.menuItemAction_mergeAllWindow(sender)
             }

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -23,19 +23,19 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES"/>
             <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="632" y="533" width="1280" height="800"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
-            <value key="minSize" type="size" width="850" height="650"/>
+            <rect key="contentRect" x="632" y="533" width="700" height="600"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <value key="minSize" type="size" width="680" height="600"/>
             <view key="contentView" id="WVd-Ye-yWx">
-                <rect key="frame" x="0.0" y="0.0" width="1280" height="800"/>
+                <rect key="frame" x="0.0" y="0.0" width="700" height="600"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iUC-1t-ky0" customClass="FastResizeView">
-                        <rect key="frame" x="0.0" y="0.0" width="1280" height="786"/>
+                        <rect key="frame" x="0.0" y="0.0" width="700" height="586"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Kjc-aQ-qNb" customClass="KMToolbarRightView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="208" y="481" width="163" height="96"/>
+                                <rect key="frame" x="208" y="281" width="163" height="96"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             </customView>
                         </subviews>
@@ -316,7 +316,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="1127" y="748" width="369" height="111"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <value key="minSize" type="size" width="234" height="87"/>
             <value key="maxSize" type="size" width="235" height="88"/>
             <view key="contentView" id="tjv-WI-5S2">

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripModel.m

@@ -774,9 +774,8 @@ const int kNoTab = NSNotFound;
             isShow = mainViewCtrl.model.isShowQuickTour;
             if (isShow) break;
         }
-        if ([doc.homeViewController isKindOfClass:[KMHomeViewController class]]) {
-            KMHomeViewController *homeViewCtrl = doc.homeViewController;
-            isShow = homeViewCtrl.isShowQuickTour;
+        if ([doc.homeViewController isKindOfClass:[KMNHomeViewController class]]) {
+            KMNHomeViewController *homeViewCtrl = doc.homeViewController;
             if (isShow) break;
         }
     }
@@ -819,9 +818,8 @@ const int kNoTab = NSNotFound;
             isShow = mainViewCtrl.model.isShowQuickTour;
             if (isShow) break;
         }
-        if ([doc.homeViewController isKindOfClass:[KMHomeViewController class]]) {
-            KMHomeViewController *homeViewCtrl = doc.homeViewController;
-            isShow = homeViewCtrl.isShowQuickTour;
+        if ([doc.homeViewController isKindOfClass:[KMNHomeViewController class]]) {
+            KMNHomeViewController *homeViewCtrl = doc.homeViewController;
             if (isShow) break;
         }
 

PDF Office/PDF Master/Class/Document/KMMainDocument.swift

@@ -36,7 +36,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
     
     var mainViewController: KMMainViewController?
     var homeWindowController: KMHomeWindowController?
-    var homeViewController: KMHomeViewController?
+    var homeViewController: KMNHomeViewController?
     var bookmarkSheetController: KMBookmarkSheetController?
     var bookmarkController: KMBookmarkController?
     var isNewCreated: Bool = false
@@ -547,8 +547,8 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
     override init?(baseTabContents baseContents: CTTabContents?) {
         super.init(baseTabContents: baseContents)
         if isHome {
-            homeViewController = KMHomeViewController.init()
-            homeViewController?.myDocument = self
+            homeViewController = KMNHomeViewController.init()
+//            homeViewController?.myDocument = self
             self.view = homeViewController?.view
         }
     }

PDF Office/PDF Master/Class/Home/WindowController/KMHomeWindowController.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 class KMHomeWindowController: NSWindowController, NSWindowDelegate{
     
-    var homeViewController : KMHomeViewController!
+    var homeViewController : KMNHomeViewController!
 
     override func windowDidLoad() {
         super.windowDidLoad()
@@ -20,7 +20,7 @@ class KMHomeWindowController: NSWindowController, NSWindowDelegate{
         self.window!.standardWindowButton(.miniaturizeButton)!.isHidden = false
         self.window!.standardWindowButton(.zoomButton)!.isHidden = false
         
-        self.homeViewController = KMHomeViewController.init()
+        self.homeViewController = KMNHomeViewController.init()
         
         self.window!.contentView!.addSubview(self.homeViewController.view)
     }

PDF Office/PDF Master/KMClass/KMHomeViewController/KMNHomeViewController.swift

@@ -14,7 +14,8 @@ class KMNHomeViewController: NSViewController {
     @IBOutlet var leftDivider: ComponentDivider!
     @IBOutlet var homeOpenView: KMHomeOpenView!
     @IBOutlet var homeRecommondView: KMHomeRecommondView!
-   
+    
+    @IBOutlet var rightContendBox: NSBox!
     @IBOutlet var rightInfoView: KMHomeRightView!
     
     @IBOutlet var homeDragView: KMHomeDragView!
@@ -58,7 +59,7 @@ class KMNHomeViewController: NSViewController {
     }
     
     func configRightContendView() {
-        
+        rightContendBox.fillColor = ComponentLibrary.shared.getComponentColorFromKey("colorBg/layout-low")
         rightInfoView.delegate = self
         rightInfoView.reloadData()
         

PDF Office/PDF Master/KMClass/KMHomeViewController/KMNHomeViewController.xib

@@ -13,6 +13,7 @@
                 <outlet property="homeRecommondView" destination="SUk-pI-GKI" id="QLA-2x-bdU"/>
                 <outlet property="leftContendBox" destination="YQl-na-PHq" id="1OU-uy-3MI"/>
                 <outlet property="leftDivider" destination="vK7-bd-jKI" id="5sp-R8-tLi"/>
+                <outlet property="rightContendBox" destination="tpg-X1-J6I" id="UOf-VO-2Kh"/>
                 <outlet property="rightInfoView" destination="HJs-kh-Hyh" id="4ha-vR-5Ow"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -100,21 +100,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5B0FD2B8-4FEF-425F-B5E3-C38824733AAC"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KMComponentLibrary/KMComponentLibrary/View/Controller/ComponentCSelector.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "184"
-            endingLineNumber = "184"
-            landmarkName = "mouseUp(with:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>