浏览代码

Correct package path

An An 5 年之前
父节点
当前提交
665c9efdad
共有 29 个文件被更改,包括 42 次插入42 次删除
  1. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartModel.kt
  2. 3 5
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartView.kt
  3. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAOptionsConstructor.kt
  4. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AASeriesElement.kt
  5. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAAnimation.kt
  6. 2 2
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAChart.kt
  7. 2 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AACrosshair.kt
  8. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AALabels.kt
  9. 3 3
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AALegend.kt
  10. 0 2
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAMarker.kt
  11. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAOptions.kt
  12. 4 3
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAPlotLinesElement.kt
  13. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AASeries.kt
  14. 2 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAStyle.kt
  15. 3 2
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AASubtitle.kt
  16. 2 2
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AATitle.kt
  17. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAColor.kt
  18. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAGradientColor.kt
  19. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAJSStringPurer.kt
  20. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/CommonChartActivity.kt
  21. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/CustomStyleChartActivity.kt
  22. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/MainActivity.kt
  23. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/MixedChartActivity.kt
  24. 2 2
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/SpecialChartActivity.kt
  25. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/ChartOptionsComposer.kt
  26. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/CustomStyleChartComposer.kt
  27. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/CustomTooltipComposer.kt
  28. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/MixedChartComposer.kt
  29. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/SpecialChartComposer.kt

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartModel.kt

@@ -26,7 +26,7 @@
 
  */
 
-package com.example.chartcorekotlin.AAChartConfiger
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
 enum class AAChartAnimationType(val value :String){
     Linear         ("Linear"),

+ 3 - 5
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartView.kt

@@ -34,8 +34,6 @@
 package com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger
 
 import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.os.Build
 import android.support.v7.app.AlertDialog
 import android.util.AttributeSet
@@ -44,11 +42,11 @@ import android.webkit.JsResult
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartModel
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAJSStringPurer
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAOptionsConstructor
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AASeriesElement
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAOptions
-import com.example.chartcorekotlin.AAChartConfiger.AAChartModel
-import com.example.chartcorekotlin.AAChartConfiger.AAOptionsConstructor
-import com.example.chartcorekotlin.AAChartConfiger.AASeriesElement
 
 import com.google.gson.Gson
 import com.google.gson.internal.LinkedTreeMap

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAOptionsConstructor.kt

@@ -32,7 +32,7 @@
  * -------------------------------------------------------------------------------
 
  */
-package com.example.chartcorekotlin.AAChartConfiger
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.*
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AASeriesElement.kt

@@ -25,7 +25,7 @@
  * -------------------------------------------------------------------------------
 
  */
-package com.example.chartcorekotlin.AAChartConfiger
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
 
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AADataLabels

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAAnimation.kt

@@ -8,7 +8,7 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartAnimationType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartAnimationType
 
 class AAAnimation {
     private var duration: Int? = null

+ 2 - 2
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAChart.kt

@@ -8,8 +8,8 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartType
-import com.example.chartcorekotlin.AAChartConfiger.AAChartZoomType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartZoomType
 
 class AAChart {
     private var type: String? = null

+ 2 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AACrosshair.kt

@@ -35,7 +35,8 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartLineDashStyleType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartLineDashStyleType
+
 
 class AACrosshair {
     private var width: Float? = null

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AALabels.kt

@@ -8,8 +8,8 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartAlignType
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAJSStringPurer
-import com.example.chartcorekotlin.AAChartConfiger.AAChartAlignType
 
 
 class AALabels {

+ 3 - 3
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AALegend.kt

@@ -8,9 +8,9 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartAlignType
-import com.example.chartcorekotlin.AAChartConfiger.AAChartLayoutType
-import com.example.chartcorekotlin.AAChartConfiger.AAChartVerticalAlignType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartAlignType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartLayoutType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartVerticalAlignType
 
 class AALegend {
     private var layout: String? =

+ 0 - 2
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAMarker.kt

@@ -8,8 +8,6 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartSymbolType
-
 class AAMarker {
     private var radius: Float? = null
     private var symbol: String? = null

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAOptions.kt

@@ -8,7 +8,7 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AASeriesElement
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AASeriesElement
 
 class AAOptions {
     var chart: AAChart? = null

+ 4 - 3
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAPlotLinesElement.kt

@@ -35,12 +35,13 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartLineDashStyleType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartLineDashStyleType
+
 
 class AAPlotLinesElement {
 
     private var color: Any? = null
-    private var dashStyle: AAChartLineDashStyleType? = null
+    private var dashStyle: String? = null
     private var width: Float? = null
     private var value: Float? = null
     private var zIndex: Int? = null
@@ -52,7 +53,7 @@ class AAPlotLinesElement {
     }
 
     fun dashStyle(prop: AAChartLineDashStyleType): AAPlotLinesElement {
-        dashStyle = prop
+        dashStyle = prop.value
         return this
     }
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AASeries.kt

@@ -8,7 +8,7 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartStackingType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartStackingType
 
 class AASeries {
     private var borderRadius: Float? = null

+ 2 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAStyle.kt

@@ -8,7 +8,8 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartFontWeightType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartFontWeightType
+
 
 class AAStyle {
 

+ 3 - 2
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AASubtitle.kt

@@ -8,8 +8,9 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartAlignType
-import com.example.chartcorekotlin.AAChartConfiger.AAChartVerticalAlignType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartAlignType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartVerticalAlignType
+
 
 class AASubtitle {
     private var text: String? = null

+ 2 - 2
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AATitle.kt

@@ -8,8 +8,8 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartAlignType
-import com.example.chartcorekotlin.AAChartConfiger.AAChartVerticalAlignType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartAlignType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartVerticalAlignType
 
 class AATitle {
     private var text: String? = null

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAColor.kt

@@ -25,7 +25,7 @@
  * -------------------------------------------------------------------------------
 
  */
-package com.example.chartcorekotlin.AAChartConfiger
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
 
 object AAColor {

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAGradientColor.kt

@@ -25,7 +25,7 @@
  * -------------------------------------------------------------------------------
 
  */
-package com.example.chartcorekotlin.AAChartConfiger
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
 import java.util.HashMap
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAJSStringPurer.kt

@@ -35,7 +35,7 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartType
 
 
 object AAJSStringPurer {

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/CommonChartActivity.kt

@@ -36,7 +36,7 @@ import android.widget.Switch
 import com.aachartmodel.aainfographics.R
 import com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
 import com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAMoveOverEventMessageModel
-import com.example.chartcorekotlin.AAChartConfiger.*
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.*
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_common_chart.*
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/CustomStyleChartActivity.kt

@@ -32,7 +32,7 @@ import android.os.Bundle
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.CustomStyleChartComposer
 import com.aachartmodel.aainfographics.R
 import com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
-import com.example.chartcorekotlin.AAChartConfiger.AAChartModel
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartModel
 
 class CustomStyleChartActivity : AppCompatActivity() {
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/MainActivity.kt

@@ -42,7 +42,7 @@ import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.CommonChartActivi
 import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.CustomStyleChartActivity
 import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.MixedChartActivity
 import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.SpecialChartActivity
-import com.example.chartcorekotlin.AAChartConfiger.AAChartType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartType
 
 class MainActivity : AppCompatActivity() {
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/MixedChartActivity.kt

@@ -32,7 +32,7 @@ import android.os.Bundle
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.MixedChartComposer
 import com.aachartmodel.aainfographics.R
 import com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
-import com.example.chartcorekotlin.AAChartConfiger.AAChartModel
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartModel
 
 class MixedChartActivity : AppCompatActivity() {
     private var aaChartModel: AAChartModel? = null

+ 2 - 2
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/SpecialChartActivity.kt

@@ -32,8 +32,8 @@ import android.os.Bundle
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.SpecialChartComposer
 import com.aachartmodel.aainfographics.R
 import com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
-import com.example.chartcorekotlin.AAChartConfiger.AAChartModel
-import com.example.chartcorekotlin.AAChartConfiger.AAChartType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartModel
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartType
 
 class SpecialChartActivity : AppCompatActivity() {
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/ChartOptionsComposer.kt

@@ -36,7 +36,7 @@
 package com.aachartmodel.aainfographics.ChartsDemo.ChartComposer
 
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.*
-import com.example.chartcorekotlin.AAChartConfiger.*
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.*
 
 class ChartOptionsComposer {
     companion object {

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/CustomStyleChartComposer.kt

@@ -28,7 +28,7 @@
 package com.aachartmodel.aainfographics.ChartsDemo.ChartComposer
 
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAMarker
-import com.example.chartcorekotlin.AAChartConfiger.*
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.*
 
 class CustomStyleChartComposer  {
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/CustomTooltipComposer.kt

@@ -36,7 +36,7 @@
 package com.aachartmodel.aainfographics.ChartsDemo.ChartComposer
 
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.*
-import com.example.chartcorekotlin.AAChartConfiger.*
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.*
 
 class CustomTooltipComposer {
     companion object {

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/MixedChartComposer.kt

@@ -29,7 +29,7 @@ package com.aachartmodel.aainfographics.ChartsDemo.ChartComposer
 
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AADataLabels
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAStyle
-import com.example.chartcorekotlin.AAChartConfiger.*
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.*
 
 class MixedChartComposer {
 companion object {

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/SpecialChartComposer.kt

@@ -29,7 +29,7 @@ package com.aachartmodel.aainfographics.ChartsDemo.ChartComposer
 
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AATooltip
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAWaterfall
-import com.example.chartcorekotlin.AAChartConfiger.*
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.*
 import java.util.*
 
 object SpecialChartComposer{