【综合】toolbar 顶部工具栏中点击注释，其他模块跳转到line，右侧属性面板未出来(已修复)

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift

@@ -476,61 +476,25 @@ extension KMMainViewController {
     @IBAction func menuItemAction_squre(_ sender: Any) {
         UserDefaults.standard.set(6, forKey: KMToolBarToolPDFShapeStyle)
 
-        if (self.listView.annotationType == .square) {
-            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-        } else {
-            if (self.listView.annotationType == .circle || self.listView.annotationType == .line || self.listView.annotationType == .arrow) {
-                self.listView.annotationType = .square
-                self.rightSideViewController.annotationProperties.annotationMode = .square
-            } else {
-                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-            }
-        }
+        self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
     }
 
     @IBAction func menuItemAction_circle(_ sender: Any) {
         UserDefaults.standard.set(7, forKey: KMToolBarToolPDFShapeStyle)
 
-        if (self.listView.annotationType == .circle) { // 取消
-            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-        } else {
-            if (self.listView.annotationType == .square || self.listView.annotationType == .line || self.listView.annotationType == .arrow) { // 切换
-                self.listView.annotationType = .circle
-                self.rightSideViewController.annotationProperties.annotationMode = .circle
-            } else { // 选中
-                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-            }
-        }
+        self.toolbarController.clickItem(KMToolbarCircleAnnotationItemIdentifier)
     }
     
     @IBAction func menuItemAction_arrow(_ sender: Any) {
         UserDefaults.standard.set(5, forKey: KMToolBarToolPDFShapeStyle)
 
-        if (self.listView.annotationType == .arrow) { // 取消
-            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-        } else { // 选中
-            if (self.listView.annotationType == .square || self.listView.annotationType == .circle || self.listView.annotationType == .line) { // 切换
-                self.listView.annotationType = .arrow
-                self.rightSideViewController.annotationProperties.annotationMode = .arrow
-            } else {
-                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-            }
-        }
+        self.toolbarController.clickItem(KMToolbarArrowAnnotationItemIdentifier)
     }
     
     @IBAction func menuItemAction_line(_ sender: Any) {
         UserDefaults.standard.set(4, forKey: KMToolBarToolPDFShapeStyle)
-
-        if (self.listView.annotationType == .line) { // 取消
-            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-        } else { // 选中
-            if (self.listView.annotationType == .square || self.listView.annotationType == .circle || self.listView.annotationType == .arrow) { // 切换
-                self.listView.annotationType = .line
-                self.rightSideViewController.annotationProperties.annotationMode = .line
-            } else {
-                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
-            }
-        }
+        
+        self.toolbarController.clickItem(KMToolbarLineAnnotationItemIdentifier)
     }
 
     // link

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

@@ -660,21 +660,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4FEB3D19-A830-4955-AEAB-8E0C6D4E9020"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "477"
-            endingLineNumber = "477"
-            landmarkName = "menuItemAction_squre(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>