V1.0.1

支持oc调用
MichaelLynx · Dec 26, 2019 · cf0ca75 · cf0ca75
1 parent 8c83acd
commit cf0ca75
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Code/MCircleBoard.swift b/Code/MCircleBoard.swift
@@ -23,10 +23,10 @@ public enum MCircleItemType: String {
 }
 
 public class MCircleBoard: UIView {
-    public private(set) var allcount:Int = 0
-    public private(set) var isclockwise:Bool = true
-    public private(set) var itemwidth:Double = 24
-    public var basicAngle:Double {
+    @objc public private(set) var allcount:Int = 0
+    @objc public var isclockwise:Bool = true
+    @objc public var itemwidth:Double = 24
+    @objc public var basicAngle:Double {
         get {
             return 360.0 / Double(allcount)
         }
@@ -64,7 +64,7 @@ public class MCircleBoard: UIView {
     }
 
     ///[Array]Init.
-    public init(array:[String], itemWidth:Double = 24, isClockWise:Bool = true) {
+    @objc public init(array:[String], itemWidth:Double = 24, isClockWise:Bool = true) {
         super.init(frame: CGRect.zero)
 
         itemwidth = itemWidth
@@ -73,6 +73,14 @@ public class MCircleBoard: UIView {
         setImage(array: array)
     }
 
+    ///[Array]Init.Item width: 24,direction: clockwise.
+    @objc public init(array:[String]) {
+        super.init(frame: CGRect.zero)
+
+        allcount = 0
+        setImage(array: array)
+    }
+
     ///[Array]Init with default image.
     public init(array:[MCircleItemType], itemWidth:Double = 24, isClockWise:Bool = true) {
         super.init(frame: CGRect.zero)
@@ -134,6 +142,12 @@ public class MCircleBoard: UIView {
         layoutSubviews()
     }
 
+    ///[Array]Reset the item array.
+    @objc public func setInterface(array: [String]) {
+        setImage(array: array)
+        layoutSubviews()
+    }
+
     //[Array]Reset the item array with default image.
     public func setInterface(array: [MCircleItemType], isClockWise:Bool? = nil) {
         if let isClockWise = isClockWise {

diff --git a/MCircleBoard.podspec b/MCircleBoard.podspec
@@ -1,4 +1,4 @@
-@version = "1.0.0"
+@version = "1.0.1"
 Pod::Spec.new do |s|
 s.name = "MCircleBoard"
 s.version = @version

diff --git a/...codeproj/project.xcworkspace/xcuserdata/zayata.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/zayata.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MCircleBoard/MCircleBoard.swift b/MCircleBoard/MCircleBoard.swift
@@ -23,10 +23,10 @@ public enum MCircleItemType: String {
 }
 
 public class MCircleBoard: UIView {
-    public private(set) var allcount:Int = 0
-    public private(set) var isclockwise:Bool = true
-    public private(set) var itemwidth:Double = 24
-    public var basicAngle:Double {
+    @objc public private(set) var allcount:Int = 0
+    @objc public var isclockwise:Bool = true
+    @objc public var itemwidth:Double = 24
+    @objc public var basicAngle:Double {
         get {
             return 360.0 / Double(allcount)
         }
@@ -64,7 +64,7 @@ public class MCircleBoard: UIView {
     }
 
     ///[Array]Init.
-    public init(array:[String], itemWidth:Double = 24, isClockWise:Bool = true) {
+    @objc public init(array:[String], itemWidth:Double = 24, isClockWise:Bool = true) {
         super.init(frame: CGRect.zero)
 
         itemwidth = itemWidth
@@ -73,6 +73,14 @@ public class MCircleBoard: UIView {
         setImage(array: array)
     }
 
+    ///[Array]Init.Item width: 24,direction: clockwise.
+    @objc public init(array:[String]) {
+        super.init(frame: CGRect.zero)
+
+        allcount = 0
+        setImage(array: array)
+    }
+
     ///[Array]Init with default image.
     public init(array:[MCircleItemType], itemWidth:Double = 24, isClockWise:Bool = true) {
         super.init(frame: CGRect.zero)
@@ -134,6 +142,12 @@ public class MCircleBoard: UIView {
         layoutSubviews()
     }
 
+    ///[Array]Reset the item array.
+    @objc public func setInterface(array: [String]) {
+        setImage(array: array)
+        layoutSubviews()
+    }
+
     //[Array]Reset the item array with default image.
     public func setInterface(array: [MCircleItemType], isClockWise:Bool? = nil) {
         if let isClockWise = isClockWise {

diff --git a/MCircleBoard/ViewController.swift b/MCircleBoard/ViewController.swift
@@ -56,7 +56,7 @@ class ViewController: UIViewController {
 
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 2) {
             circleBoard.setInterface(array: array2)
-            //circleBoard.setInterface(array: array3)
+            circleBoard.setInterface(array: array3)
             //circleBoard.setInterface(array: array4)
         }