Rename CustomTouchEndEventCallbackVC

AAChartModel · AAChartModel · commit bdc3bc3534ae · 2022-05-31T17:08:47.000+08:00
diff --git a/AAInfographicsDemo.xcodeproj/project.pbxproj b/AAInfographicsDemo.xcodeproj/project.pbxproj
@@ -39,7 +39,7 @@
 		84B68246266DB09100957FC5 /* AAChartSymbolConstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B68245266DB09100957FC5 /* AAChartSymbolConstant.swift */; };
 		84DEA0D42845ADEB00D0206F /* CustomMouseOutEventCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DEA0D32845ADEB00D0206F /* CustomMouseOutEventCallback.swift */; };
 		84DEA0D62845F5F200D0206F /* CustomSelectionEventCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DEA0D52845F5F200D0206F /* CustomSelectionEventCallback.swift */; };
-		84DEA0D82846013F00D0206F /* CustomTouchEndEventCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DEA0D72846013F00D0206F /* CustomTouchEndEventCallback.swift */; };
+		84DEA0D82846013F00D0206F /* CustomTouchEndEventCallbackVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DEA0D72846013F00D0206F /* CustomTouchEndEventCallbackVC.swift */; };
 		ED0A032527281695000BF778 /* AAInfographics.h in Headers */ = {isa = PBXBuildFile; fileRef = ED0A032327281695000BF778 /* AAInfographics.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		ED0A032827281695000BF778 /* AAInfographics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED0A032127281695000BF778 /* AAInfographics.framework */; };
 		ED0A032927281695000BF778 /* AAInfographics.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ED0A032127281695000BF778 /* AAInfographics.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -186,7 +186,7 @@
 		84B68245266DB09100957FC5 /* AAChartSymbolConstant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AAChartSymbolConstant.swift; sourceTree = "<group>"; };
 		84DEA0D32845ADEB00D0206F /* CustomMouseOutEventCallback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomMouseOutEventCallback.swift; sourceTree = "<group>"; };
 		84DEA0D52845F5F200D0206F /* CustomSelectionEventCallback.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomSelectionEventCallback.swift; sourceTree = "<group>"; };
-		84DEA0D72846013F00D0206F /* CustomTouchEndEventCallback.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTouchEndEventCallback.swift; sourceTree = "<group>"; };
+		84DEA0D72846013F00D0206F /* CustomTouchEndEventCallbackVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTouchEndEventCallbackVC.swift; sourceTree = "<group>"; };
 		D01D701A2587EE730093C01F /* ProjectBundlePathLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectBundlePathLoader.swift; sourceTree = "<group>"; };
 		ED0A032127281695000BF778 /* AAInfographics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AAInfographics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		ED0A032327281695000BF778 /* AAInfographics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AAInfographics.h; sourceTree = "<group>"; };
@@ -238,7 +238,7 @@
 				449A0ED52377149D009F8FE1 /* ScrollingUpdateDataVC.swift */,
 				2763384424A7070F00143B9B /* DataSortingWithAnimationChartVC.swift */,
 				448330B724E270FE00368A30 /* AdvancedUpdatingFeatureVC.swift */,
-				84DEA0D72846013F00D0206F /* CustomTouchEndEventCallback.swift */,
+				84DEA0D72846013F00D0206F /* CustomTouchEndEventCallbackVC.swift */,
 			);
 			path = AdditionalContent1;
 			sourceTree = "<group>";
@@ -607,7 +607,7 @@
 				27FADB8620D6569000FED960 /* HideOrShowChartSeriesVC.swift in Sources */,
 				84AE6B1F26A58380001F0755 /* AADateUTCTool.swift in Sources */,
 				84DEA0D62845F5F200D0206F /* CustomSelectionEventCallback.swift in Sources */,
-				84DEA0D82846013F00D0206F /* CustomTouchEndEventCallback.swift in Sources */,
+				84DEA0D82846013F00D0206F /* CustomTouchEndEventCallbackVC.swift in Sources */,
 				44EB70A722BCB606008FECE4 /* JSFormatterFunctionVC.swift in Sources */,
 				84B68246266DB09100957FC5 /* AAChartSymbolConstant.swift in Sources */,
 				84DEA0D42845ADEB00D0206F /* CustomMouseOutEventCallback.swift in Sources */,
diff --git a/AAInfographicsDemo/Demo/AdditionalContent1/CustomTouchEndEventCallbackVC.swift b/AAInfographicsDemo/Demo/AdditionalContent1/CustomTouchEndEventCallbackVC.swift
@@ -12,7 +12,7 @@ import WebKit
 
 let kUserContentMessageNameChartTouchEnd = "touchEnd"
 
-class CustomTouchEndEventCallback: UIViewController {
+class CustomTouchEndEventCallbackVC: UIViewController {
     private var aaChartView: AAChartView!
     
     override func viewDidLoad() {
@@ -56,6 +56,14 @@ class CustomTouchEndEventCallback: UIViewController {
                     .borderRadiusTopLeft("50%")
                     .borderRadiusTopRight("50%")
                     .data([2.10, 2.54, 2.78, 3.62, 4.41, 4.09, 3.83, 4.47, 4.20, 3.94, 3.80, 3.58, 3.19, 4.30, 3.69, 3.52, 3.02, 3.30]),
+                
+                AASeriesElement()
+                    .name("Berlin Hot")
+                    .data([1.56, 1.91, 2.45, 3.87, 3.24, 4.90, 4.61, 4.10, 4.17, 3.85, 4.17, 3.46, 3.46, 3.55, 3.50, 4.13, 2.58, 2.28]),
+                
+                AASeriesElement()
+                    .name("Beijing Hot")
+                    .data([1.16, 1.67, 2.64, 2.86, 3.00, 3.21, 4.14, 4.07, 3.68, 3.11, 3.41, 3.25, 3.32, 3.07, 3.92, 3.05, 2.18, 3.24]),
             ])
         
         let aaOptions = aaChartModel.aa_toAAOptions()
@@ -64,7 +72,7 @@ class CustomTouchEndEventCallback: UIViewController {
     }
 }
 
-extension CustomTouchEndEventCallback: WKScriptMessageHandler {
+extension CustomTouchEndEventCallbackVC: WKScriptMessageHandler {
     func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
         if message.name == kUserContentMessageNameChartTouchEnd {
             let messageBody = message.body
@@ -73,7 +81,7 @@ extension CustomTouchEndEventCallback: WKScriptMessageHandler {
     }
 }
 
-extension CustomTouchEndEventCallback: AAChartViewDelegate {
+extension CustomTouchEndEventCallbackVC: AAChartViewDelegate {
     open func aaChartViewDidFinishLoad(_ aaChartView: AAChartView) {
         print("🚀🚀🚀, AAChartView Did Finished Load!!!")
         
@@ -122,7 +130,7 @@ extension CustomTouchEndEventCallback: AAChartViewDelegate {
     }
     
     open func aaChartView(_ aaChartView: AAChartView, moveOverEventMessage: AAMoveOverEventMessageModel) {
-        print("👌🏻moved over point series element name: \(moveOverEventMessage.name ?? "")")
+        print("👌🏻moved over point series element name: \(String(describing: moveOverEventMessage.index))")
     }
     
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import WebKit`
`12`	`12`
`13`	`13`	`let kUserContentMessageNameChartTouchEnd = "touchEnd"`
`14`	`14`
`15`		`-class CustomTouchEndEventCallback: UIViewController {`
	`15`	`+class CustomTouchEndEventCallbackVC: UIViewController {`
`16`	`16`	`private var aaChartView: AAChartView!`
`17`	`17`
`18`	`18`	`override func viewDidLoad() {`
`@@ -56,6 +56,14 @@ class CustomTouchEndEventCallback: UIViewController {`
`56`	`56`	`.borderRadiusTopLeft("50%")`
`57`	`57`	`.borderRadiusTopRight("50%")`
`58`	`58`	`.data([2.10, 2.54, 2.78, 3.62, 4.41, 4.09, 3.83, 4.47, 4.20, 3.94, 3.80, 3.58, 3.19, 4.30, 3.69, 3.52, 3.02, 3.30]),`
	`59`	`+`
	`60`	`+ AASeriesElement()`
	`61`	`+ .name("Berlin Hot")`
	`62`	`+ .data([1.56, 1.91, 2.45, 3.87, 3.24, 4.90, 4.61, 4.10, 4.17, 3.85, 4.17, 3.46, 3.46, 3.55, 3.50, 4.13, 2.58, 2.28]),`
	`63`	`+`
	`64`	`+ AASeriesElement()`
	`65`	`+ .name("Beijing Hot")`
	`66`	`+ .data([1.16, 1.67, 2.64, 2.86, 3.00, 3.21, 4.14, 4.07, 3.68, 3.11, 3.41, 3.25, 3.32, 3.07, 3.92, 3.05, 2.18, 3.24]),`
`59`	`67`	`])`
`60`	`68`
`61`	`69`	`let aaOptions = aaChartModel.aa_toAAOptions()`
`@@ -64,7 +72,7 @@ class CustomTouchEndEventCallback: UIViewController {`
`64`	`72`	`}`
`65`	`73`	`}`
`66`	`74`
`67`		`-extension CustomTouchEndEventCallback: WKScriptMessageHandler {`
	`75`	`+extension CustomTouchEndEventCallbackVC: WKScriptMessageHandler {`
`68`	`76`	`func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {`
`69`	`77`	`if message.name == kUserContentMessageNameChartTouchEnd {`
`70`	`78`	`let messageBody = message.body`
`@@ -73,7 +81,7 @@ extension CustomTouchEndEventCallback: WKScriptMessageHandler {`
`73`	`81`	`}`
`74`	`82`	`}`
`75`	`83`
`76`		`-extension CustomTouchEndEventCallback: AAChartViewDelegate {`
	`84`	`+extension CustomTouchEndEventCallbackVC: AAChartViewDelegate {`
`77`	`85`	`open func aaChartViewDidFinishLoad(_ aaChartView: AAChartView) {`
`78`	`86`	`print("🚀🚀🚀, AAChartView Did Finished Load!!!")`
`79`	`87`
`@@ -122,7 +130,7 @@ extension CustomTouchEndEventCallback: AAChartViewDelegate {`
`122`	`130`	`}`
`123`	`131`
`124`	`132`	`open func aaChartView(_ aaChartView: AAChartView, moveOverEventMessage: AAMoveOverEventMessageModel) {`
`125`		`- print("👌🏻moved over point series element name: \(moveOverEventMessage.name ?? "")")`
	`133`	`+ print("👌🏻moved over point series element name: \(String(describing: moveOverEventMessage.index))")`
`126`	`134`	`}`
`127`	`135`
`128`	`136`	`}`