Merge pull request #12 from AAChartModel/dev

Dev

Author: AAChartModel

AAInfographics-Pro.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'AAInfographics-Pro'
-    s.version      = '0.0.4'
+    s.version      = '9.0.0'
     s.summary      = '📈📊👑👑👑AAChartKit-Swift-Pro is a professional version of AAChartKit-Swift, it is an elegant and friendly chart framework for iOS, iPadOS, macOS. AAChartKit-Swift-Pro is a more powerful data visualization framework that supports more types beautiful chart like bellcurve, bullet, columnpyramid, cylinder, dependencywheel, heatmap, histogram, networkgraph, organization, packedbubble, pareto, sankey, series, solidgauge, streamgraph, sunburst, tilemap, timeline, treemap, variablepie, variwide, vector, venn, windbarb, wordcloud, xrange charts and so on.'
     s.homepage      = 'https://github.com/AAChartModel/AAChartKit-Swift-Pro'
     s.license       = 'Just For Test Demo'

AAInfographics-Pro/AAOptionsModel/AASeries.swift

@@ -275,7 +275,7 @@ public class AAPoint: AAObject {
     }
 }
 
-
+//https://api.highcharts.com/class-reference/Highcharts.Point
 public class AAPointEvents: AAObject {
     public var click: String?
     public var mouseOver: String?

AAInfographics-ProDemo/Demo/DataSource/AAOptionsData.swift

@@ -162,6 +162,42 @@ class AAOptionsData {
         return dataArr
     }
 
+    public class var xrange2Data: [Any] {
+        func getSingleGroupCategoryDataElementArrayWithY(_ y: Int) -> [Any] {
+            var dataArr = [Any]()
+            
+            var x = 0
+            var x2 = x + Int(arc4random()) % 10
+            for _ in 0 ..< 50 {
+                var dataElementDic = [String:Any]()
+                dataElementDic["x"] = x
+                dataElementDic["x2"] = x2
+                dataElementDic["y"] = y
+                
+                //添加随机生成的颜色, 用于测试
+                let R = arc4random_uniform(256)
+                let G = arc4random_uniform(256)
+                let B = arc4random_uniform(256)
+                let rgbaColorStr = AARgba(Int(R), Int(G), Int(B), 0.9)
+                dataElementDic["color"] = rgbaColorStr
+                
+                dataArr.append(dataElementDic)
+                x = x2 + Int(arc4random()) % 1000
+                x2 = x + Int(arc4random()) % 2000
+            }
+            return dataArr
+        }
+        
+        var dataArr = [Any]()
+        for y in 0 ..< 20 {
+            let data = getSingleGroupCategoryDataElementArrayWithY(y)
+            for dataElement in data {
+                dataArr.append(dataElement)
+            }
+        }
+        return dataArr
+    }
+    
     public class var vectorData : [Any] {
         getJsonDataWithJsonFileName("vectorData")
     }

AAInfographics-ProDemo/Demo/MainVC.swift

@@ -100,7 +100,8 @@ class MainVC: UIViewController {
             "xrangeChart---X轴范围图||甘特图||条码图",
             "histogramChart---直方混合散点图📊",
             "bellcurveChart---钟形曲线混合散点图🔔",
-            "bulletChart---子弹图"
+            "bulletChart---子弹图",
+            "inverted xrangeChart---倒转的X轴范围图||甘特图||条码图",
         ],
         // "MoreProType | 更多高级类型图表",
         [

AAInfographics-ProDemo/Demo/ViewController/AAColumnVariantChartVC.swift

@@ -24,6 +24,7 @@ class AAColumnVariantChartVC: AABaseChartVC {
         case 5: return AAColumnVariantChartComposer.histogramChart()
         case 6: return AAColumnVariantChartComposer.bellcurveChart()
         case 7: return AAColumnVariantChartComposer.bulletChart()
+        case 8: return AAColumnVariantChartComposer.invertedXrangeChart()
         default: return nil
         }
     }