From cdbd6e44eb891651ca83ca010785fd8248071f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=85=A7=E9=97=AB?= <2236368544@qq.com>
Date: Mon, 19 Jun 2017 18:16:01 +0800
Subject: [PATCH] Revert "Add macro define file for custom model"

This reverts commit 9133471cd4834fd813aa712ce2cf6913aa174f36.
---
 AAChartKit/PrefixHeader.pch                          | 2 +-
 AAChartKitLib/AAChartConfiger/AAChartModel.h         | 1 -
 AAChartKitLib/AAChartConfiger/AAJsonConverter.h      | 1 -
 AAChartKitLib/AAChartConfiger/AAOptionsConstructor.h | 1 -
 AAChartKitLib/AAOptionsModel/AAAnimation.h           | 1 -
 AAChartKitLib/AAOptionsModel/AAArea.h                | 1 -
 AAChartKitLib/AAOptionsModel/AAAreaspline.h          | 1 -
 AAChartKitLib/AAOptionsModel/AABar.h                 | 1 -
 AAChartKitLib/AAOptionsModel/AAChart.h               | 1 -
 AAChartKitLib/AAOptionsModel/AAColumn.h              | 1 -
 AAChartKitLib/AAOptionsModel/AADataLabels.h          | 1 -
 AAChartKitLib/AAOptionsModel/AAItemStyle.h           | 1 -
 AAChartKitLib/AAOptionsModel/AALabels.h              | 1 -
 AAChartKitLib/AAOptionsModel/AALegend.h              | 1 -
 AAChartKitLib/AAOptionsModel/AALine.h                | 1 -
 AAChartKitLib/AAOptionsModel/AAMarker.h              | 1 -
 AAChartKitLib/AAOptionsModel/AAOptions.h             | 1 -
 AAChartKitLib/AAOptionsModel/AAOptions3d.h           | 1 -
 AAChartKitLib/AAOptionsModel/AAPie.h                 | 1 -
 AAChartKitLib/AAOptionsModel/AAPlotLinesElement.h    | 1 -
 AAChartKitLib/AAOptionsModel/AAPlotOptions.h         | 1 -
 AAChartKitLib/AAOptionsModel/AASeries.h              | 1 -
 AAChartKitLib/AAOptionsModel/AASeriesElement.h       | 1 -
 AAChartKitLib/AAOptionsModel/AASpline.h              | 1 -
 AAChartKitLib/AAOptionsModel/AAStyle.h               | 1 -
 AAChartKitLib/AAOptionsModel/AASubtitle.h            | 1 -
 AAChartKitLib/AAOptionsModel/AATitle.h               | 1 -
 AAChartKitLib/AAOptionsModel/AATooltip.h             | 1 -
 AAChartKitLib/AAOptionsModel/AAXAxis.h               | 1 -
 AAChartKitLib/AAOptionsModel/AAYAxis.h               | 1 -
 30 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/AAChartKit/PrefixHeader.pch b/AAChartKit/PrefixHeader.pch
index 73fd880fd..7a940718c 100755
--- a/AAChartKit/PrefixHeader.pch
+++ b/AAChartKit/PrefixHeader.pch
@@ -10,7 +10,7 @@
 #ifndef PrefixHeader_pch
 #define PrefixHeader_pch
 
-//#import "AAGlobalMacro.h"
+#import "AAGlobalMacro.h"
 
 
 
diff --git a/AAChartKitLib/AAChartConfiger/AAChartModel.h b/AAChartKitLib/AAChartConfiger/AAChartModel.h
index 036f519ce..22eea9db2 100755
--- a/AAChartKitLib/AAChartConfiger/AAChartModel.h
+++ b/AAChartKitLib/AAChartConfiger/AAChartModel.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 #import "AASeriesElement.h"
 #import "AAPlotLinesElement.h"
 
diff --git a/AAChartKitLib/AAChartConfiger/AAJsonConverter.h b/AAChartKitLib/AAChartConfiger/AAJsonConverter.h
index ef17fd359..67923ed5b 100644
--- a/AAChartKitLib/AAChartConfiger/AAJsonConverter.h
+++ b/AAChartKitLib/AAChartConfiger/AAJsonConverter.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AAJsonConverter : NSObject
 +(NSString *)getPureOptionsString:(id)optionsObject;
diff --git a/AAChartKitLib/AAChartConfiger/AAOptionsConstructor.h b/AAChartKitLib/AAChartConfiger/AAOptionsConstructor.h
index f5125ced9..d97baae05 100755
--- a/AAChartKitLib/AAChartConfiger/AAOptionsConstructor.h
+++ b/AAChartKitLib/AAChartConfiger/AAOptionsConstructor.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 #import "AAOptions.h"
 #import "AAChart.h"
 #import "AAAnimation.h"
diff --git a/AAChartKitLib/AAOptionsModel/AAAnimation.h b/AAChartKitLib/AAOptionsModel/AAAnimation.h
index 95f5fd663..a0845caaf 100644
--- a/AAChartKitLib/AAOptionsModel/AAAnimation.h
+++ b/AAChartKitLib/AAOptionsModel/AAAnimation.h
@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AAAnimation : NSObject
 AAPropStatementAndFuncStatement(strong, AAAnimation, NSNumber *, duration);
diff --git a/AAChartKitLib/AAOptionsModel/AAArea.h b/AAChartKitLib/AAOptionsModel/AAArea.h
index 30ae42a07..e1c54d470 100644
--- a/AAChartKitLib/AAOptionsModel/AAArea.h
+++ b/AAChartKitLib/AAOptionsModel/AAArea.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AADataLabels;
 @interface AAArea : NSObject
 AAPropStatementAndFuncStatement(strong, AAArea, AADataLabels *, dataLabels);
diff --git a/AAChartKitLib/AAOptionsModel/AAAreaspline.h b/AAChartKitLib/AAOptionsModel/AAAreaspline.h
index 60d226e19..a97a959d5 100644
--- a/AAChartKitLib/AAOptionsModel/AAAreaspline.h
+++ b/AAChartKitLib/AAOptionsModel/AAAreaspline.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AADataLabels;
 @interface AAAreaspline : NSObject
 AAPropStatementAndFuncStatement(strong, AAAreaspline, AADataLabels *, dataLabels);
diff --git a/AAChartKitLib/AAOptionsModel/AABar.h b/AAChartKitLib/AAOptionsModel/AABar.h
index 0da22edd2..9ad157f35 100755
--- a/AAChartKitLib/AAOptionsModel/AABar.h
+++ b/AAChartKitLib/AAOptionsModel/AABar.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AADataLabels;
 @interface AABar : NSObject
 AAPropStatementAndFuncStatement(strong, AABar, NSNumber *, pointPadding);
diff --git a/AAChartKitLib/AAOptionsModel/AAChart.h b/AAChartKitLib/AAOptionsModel/AAChart.h
index 5f7a9f9b7..1d9c3cc5f 100755
--- a/AAChartKitLib/AAOptionsModel/AAChart.h
+++ b/AAChartKitLib/AAOptionsModel/AAChart.h
@@ -10,7 +10,6 @@
 
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAAnimation;
 @class AAOptions3d;
 @interface AAChart : NSObject
diff --git a/AAChartKitLib/AAOptionsModel/AAColumn.h b/AAChartKitLib/AAOptionsModel/AAColumn.h
index ff708014c..203c8124a 100755
--- a/AAChartKitLib/AAOptionsModel/AAColumn.h
+++ b/AAChartKitLib/AAOptionsModel/AAColumn.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AADataLabels;
 @interface AAColumn : NSObject
 AAPropStatementAndFuncStatement(strong, AAColumn, NSNumber *, pointPadding);
diff --git a/AAChartKitLib/AAOptionsModel/AADataLabels.h b/AAChartKitLib/AAOptionsModel/AADataLabels.h
index 5137df6de..73f908611 100755
--- a/AAChartKitLib/AAOptionsModel/AADataLabels.h
+++ b/AAChartKitLib/AAOptionsModel/AADataLabels.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAStyle;
 @interface AADataLabels : NSObject
 AAPropStatementAndFuncStatement(assign, AADataLabels, BOOL , enabled);
diff --git a/AAChartKitLib/AAOptionsModel/AAItemStyle.h b/AAChartKitLib/AAOptionsModel/AAItemStyle.h
index 5eccb1ff3..5d24c4bc6 100755
--- a/AAChartKitLib/AAOptionsModel/AAItemStyle.h
+++ b/AAChartKitLib/AAOptionsModel/AAItemStyle.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AAItemStyle : NSObject
 AAPropStatementAndFuncStatement(copy, AAItemStyle, NSString *, color);
diff --git a/AAChartKitLib/AAOptionsModel/AALabels.h b/AAChartKitLib/AAOptionsModel/AALabels.h
index 325659296..270b6f881 100644
--- a/AAChartKitLib/AAOptionsModel/AALabels.h
+++ b/AAChartKitLib/AAOptionsModel/AALabels.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AALabels : NSObject
 AAPropStatementAndFuncStatement(assign, AALabels, BOOL, enabled);
diff --git a/AAChartKitLib/AAOptionsModel/AALegend.h b/AAChartKitLib/AAOptionsModel/AALegend.h
index 979532eee..18cc3c334 100755
--- a/AAChartKitLib/AAOptionsModel/AALegend.h
+++ b/AAChartKitLib/AAOptionsModel/AALegend.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAItemStyle;
 @interface AALegend : NSObject
 AAPropStatementAndFuncStatement(assign, AALegend, BOOL, enabled);
diff --git a/AAChartKitLib/AAOptionsModel/AALine.h b/AAChartKitLib/AAOptionsModel/AALine.h
index cac580b29..8efefa414 100755
--- a/AAChartKitLib/AAOptionsModel/AALine.h
+++ b/AAChartKitLib/AAOptionsModel/AALine.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AADataLabels;
 @interface AALine : NSObject
 AAPropStatementAndFuncStatement(strong, AALine, NSNumber *, lineWidth);//设置折线的宽度
diff --git a/AAChartKitLib/AAOptionsModel/AAMarker.h b/AAChartKitLib/AAOptionsModel/AAMarker.h
index 58aa274cf..78cc39f5a 100755
--- a/AAChartKitLib/AAOptionsModel/AAMarker.h
+++ b/AAChartKitLib/AAOptionsModel/AAMarker.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AAMarker : NSObject
 AAPropStatementAndFuncStatement(strong, AAMarker, NSNumber *, radius);
diff --git a/AAChartKitLib/AAOptionsModel/AAOptions.h b/AAChartKitLib/AAOptionsModel/AAOptions.h
index e1f39c858..992b8af4a 100755
--- a/AAChartKitLib/AAOptionsModel/AAOptions.h
+++ b/AAChartKitLib/AAOptionsModel/AAOptions.h
@@ -9,7 +9,6 @@
 
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAChart,AATitle,AASubtitle,AAXAxis,AAYAxis,AATooltip,AAPlotOptions,AAColumn,AALegend;
 
 
diff --git a/AAChartKitLib/AAOptionsModel/AAOptions3d.h b/AAChartKitLib/AAOptionsModel/AAOptions3d.h
index 8f5feec0e..94dd09b24 100755
--- a/AAChartKitLib/AAOptionsModel/AAOptions3d.h
+++ b/AAChartKitLib/AAOptionsModel/AAOptions3d.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AAOptions3d : NSObject
 AAPropStatementAndFuncStatement(assign, AAOptions3d, BOOL, enabled);
diff --git a/AAChartKitLib/AAOptionsModel/AAPie.h b/AAChartKitLib/AAOptionsModel/AAPie.h
index 32b571169..ae766c302 100755
--- a/AAChartKitLib/AAOptionsModel/AAPie.h
+++ b/AAChartKitLib/AAOptionsModel/AAPie.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AADataLabels;
 @interface AAPie : NSObject
 AAPropStatementAndFuncStatement(assign, AAPie, BOOL, allowPointSelect);
diff --git a/AAChartKitLib/AAOptionsModel/AAPlotLinesElement.h b/AAChartKitLib/AAOptionsModel/AAPlotLinesElement.h
index 585204ba1..da6a50a0d 100755
--- a/AAChartKitLib/AAOptionsModel/AAPlotLinesElement.h
+++ b/AAChartKitLib/AAOptionsModel/AAPlotLinesElement.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AAPlotLinesElement : NSObject
 AAPropStatementAndFuncStatement(copy, AAPlotLinesElement, NSString *, color);//基线颜色
diff --git a/AAChartKitLib/AAOptionsModel/AAPlotOptions.h b/AAChartKitLib/AAOptionsModel/AAPlotOptions.h
index d66df6283..c9d791705 100755
--- a/AAChartKitLib/AAOptionsModel/AAPlotOptions.h
+++ b/AAChartKitLib/AAOptionsModel/AAPlotOptions.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAColumn,AABar,AALine,AASpline,AAArea,AAAreaspline,AAPie,AASeries;
 
 @interface AAPlotOptions : NSObject
diff --git a/AAChartKitLib/AAOptionsModel/AASeries.h b/AAChartKitLib/AAOptionsModel/AASeries.h
index 6eecbab62..689d65644 100755
--- a/AAChartKitLib/AAOptionsModel/AASeries.h
+++ b/AAChartKitLib/AAOptionsModel/AASeries.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAMarker,AAAnimation;
 @interface AASeries : NSObject
 AAPropStatementAndFuncStatement(strong, AASeries, NSNumber *, borderRadius);
diff --git a/AAChartKitLib/AAOptionsModel/AASeriesElement.h b/AAChartKitLib/AAOptionsModel/AASeriesElement.h
index 06e61fef5..9467dcbb0 100755
--- a/AAChartKitLib/AAOptionsModel/AASeriesElement.h
+++ b/AAChartKitLib/AAOptionsModel/AASeriesElement.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAMarker;
 @interface AASeriesElement : NSObject
 AAPropStatementAndFuncStatement(strong, AASeriesElement, NSNumber *, borderRadius);
diff --git a/AAChartKitLib/AAOptionsModel/AASpline.h b/AAChartKitLib/AAOptionsModel/AASpline.h
index 4e31fedad..a298e7ec0 100755
--- a/AAChartKitLib/AAOptionsModel/AASpline.h
+++ b/AAChartKitLib/AAOptionsModel/AASpline.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AADataLabels;
 @interface AASpline : NSObject
 AAPropStatementAndFuncStatement(strong, AASpline, AADataLabels *, dataLabels);
diff --git a/AAChartKitLib/AAOptionsModel/AAStyle.h b/AAChartKitLib/AAOptionsModel/AAStyle.h
index f941eb995..89fbda5c6 100755
--- a/AAChartKitLib/AAOptionsModel/AAStyle.h
+++ b/AAChartKitLib/AAOptionsModel/AAStyle.h
@@ -9,7 +9,6 @@
 
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AAStyle : NSObject
 AAPropStatementAndFuncStatement(copy, AAStyle, NSString *, color);
diff --git a/AAChartKitLib/AAOptionsModel/AASubtitle.h b/AAChartKitLib/AAOptionsModel/AASubtitle.h
index 2c4575d37..a37bebce9 100755
--- a/AAChartKitLib/AAOptionsModel/AASubtitle.h
+++ b/AAChartKitLib/AAOptionsModel/AASubtitle.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAStyle;
 @interface AASubtitle : NSObject
 AAPropStatementAndFuncStatement(copy, AASubtitle, NSString *, text);
diff --git a/AAChartKitLib/AAOptionsModel/AATitle.h b/AAChartKitLib/AAOptionsModel/AATitle.h
index 319985b45..e48daf8e2 100755
--- a/AAChartKitLib/AAOptionsModel/AATitle.h
+++ b/AAChartKitLib/AAOptionsModel/AATitle.h
@@ -11,7 +11,6 @@
 
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AAStyle;
 @interface AATitle : NSObject
 AAPropStatementAndFuncStatement(copy, AATitle, NSString *, text);
diff --git a/AAChartKitLib/AAOptionsModel/AATooltip.h b/AAChartKitLib/AAOptionsModel/AATooltip.h
index 8c76a1c11..648e9491a 100755
--- a/AAChartKitLib/AAOptionsModel/AATooltip.h
+++ b/AAChartKitLib/AAOptionsModel/AATooltip.h
@@ -8,7 +8,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 
 @interface AATooltip : NSObject
 AAPropStatementAndFuncStatement(copy, AATooltip, NSString *, headerFormat);
diff --git a/AAChartKitLib/AAOptionsModel/AAXAxis.h b/AAChartKitLib/AAOptionsModel/AAXAxis.h
index 4b5d6ee51..0f31a18be 100755
--- a/AAChartKitLib/AAOptionsModel/AAXAxis.h
+++ b/AAChartKitLib/AAOptionsModel/AAXAxis.h
@@ -10,7 +10,6 @@
 
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AALabels;
 @interface AAXAxis : NSObject
 AAPropStatementAndFuncStatement(strong, AAXAxis, id, categories);
diff --git a/AAChartKitLib/AAOptionsModel/AAYAxis.h b/AAChartKitLib/AAOptionsModel/AAYAxis.h
index d9870c1ef..7d14061eb 100755
--- a/AAChartKitLib/AAOptionsModel/AAYAxis.h
+++ b/AAChartKitLib/AAOptionsModel/AAYAxis.h
@@ -8,7 +8,6 @@
 //gridLineColor
 
 #import <Foundation/Foundation.h>
-#import "AAGlobalMacro.h"
 @class AATitle,AALabels;
 
 @interface AAYAxis : NSObject