Эх сурвалжийг харах

Just do the same thing as last commit

An An 5 жил өмнө
parent
commit
60d5293f3a
17 өөрчлөгдсөн 191 нэмэгдсэн , 69 устгасан
  1. 7 4
      app/src/main/assets/AAChartView.js
  2. 15 17
      app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartView.kt
  3. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/AdditionalContent/DrawChartWithAAOptionsActivity.kt
  4. 2 2
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/AdditionalContent/JSFormatterFunctionActivity.kt
  5. 121 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/AdditionalContent/OnlyRefreshChartDataActivity.kt
  6. 1 2
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/CommonChartActivity.kt
  7. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/CustomStyleChartActivity.kt
  8. 29 33
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/MainActivity.kt
  9. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/MixedChartActivity.kt
  10. 1 1
      app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/SpecialChartActivity.kt
  11. 1 1
      app/src/main/res/layout/activity_common_chart.xml
  12. 1 1
      app/src/main/res/layout/activity_custom_style_chart.xml
  13. 1 1
      app/src/main/res/layout/activity_custom_tooltip_with_jsfunction.xml
  14. 1 1
      app/src/main/res/layout/activity_draw_chart_with_aaoptions.xml
  15. 1 1
      app/src/main/res/layout/activity_mixed_chart.xml
  16. 6 0
      app/src/main/res/layout/activity_only_refresh_chart_data.xml
  17. 1 1
      app/src/main/res/layout/activity_special_chart.xml

+ 7 - 4
app/src/main/assets/AAChartView.js

@@ -43,8 +43,8 @@
                             name: this.series.name,
                             y :this.y,
                             x: this.x,
-                            category:this.category,
-                            offset:{plotX:this.plotX,plotY:this.plotY},
+                            category: this.category,
+                            offset: {plotX:this.plotX,plotY:this.plotY},
                             index: this.index,
                         };
 
@@ -79,7 +79,7 @@
             }
         }
 
-        function onlyRefreshTheChartDataWithSeries(receivedSeries) {
+        function onlyRefreshTheChartDataWithSeries(receivedSeries, animation) {
             var receivedSeriesArr = JSON.parse(receivedSeries);
             var seriesArrLength = receivedSeriesArr.length;
             for (var i = 0; i < seriesArrLength; i++) {
@@ -87,8 +87,11 @@
                 // 获取series
                 var seriesElement = aaGlobalChart.series[i];
                 // 执行只刷新数据的函数
-                seriesElement.setData(receivedSeriesElementData);
+                seriesElement.setData(receivedSeriesElementData, false);
             }
+
+            var animationBool = (animation == "true") ? true:false;
+            aaGlobalChart.redraw(animationBool);
         }
 
         function updateChart(optionsStr, redraw) {

+ 15 - 17
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartView.kt

@@ -31,27 +31,17 @@
 
 */
 
-package com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
 import android.content.Context
 import android.os.Build
 import android.support.v7.app.AlertDialog
 import android.util.AttributeSet
-import android.webkit.JavascriptInterface
-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 android.webkit.*
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAOptions
-
 import com.google.gson.Gson
 import com.google.gson.internal.LinkedTreeMap
-
-import java.util.HashMap
+import java.util.*
 
 
 class AAMoveOverEventMessageModel {
@@ -182,11 +172,19 @@ class AAChartView : WebView {
         configureChartOptionsAndDrawChart(chartOptions)
     }
 
-    fun aa_onlyRefreshTheChartDataWithChartOptionsSeriesArray(seriesElementsArr: Array<AASeriesElement?>?) {
-        val gson = Gson()
-        val seriesArr = gson.toJson(seriesElementsArr)
+    fun aa_onlyRefreshTheChartDataWithChartOptionsSeriesArray(
+        seriesElementsArr: Array<AASeriesElement>
+    ) {
+        aa_onlyRefreshTheChartDataWithChartOptionsSeriesArray(seriesElementsArr, true)
+    }
+
+    fun aa_onlyRefreshTheChartDataWithChartOptionsSeriesArray(
+        seriesElementsArr: Array<AASeriesElement>,
+        animation: Boolean
+    ) {
+        val seriesArr = Gson().toJson(seriesElementsArr)
         val javaScriptStr = ("onlyRefreshTheChartDataWithSeries('"
-                + seriesArr + "')")
+                + seriesArr + "','" + animation + "')")
         safeEvaluateJavaScriptString(javaScriptStr)
     }
 

+ 1 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/AdditionalContent/DrawChartWithAAOptionsActivity.kt

@@ -29,6 +29,7 @@ package com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent
 
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAOptions
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.ChartOptionsComposer.Companion.customChartLegendStyle
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.ChartOptionsComposer.Companion.configureAAPlotBandsForChart
@@ -47,7 +48,6 @@ import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.ChartOptionsComp
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.ChartOptionsComposer.Companion.customLineChartDataLabelsFormat
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.ChartOptionsComposer.Companion.customXAxisCrosshairStyle
 import com.aachartmodel.aainfographics.R
-import com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
 
 class DrawChartWithAAOptionsActivity : AppCompatActivity() {
 

+ 2 - 2
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/AdditionalContent/JSFormatterFunctionActivity.kt

@@ -29,6 +29,7 @@ package com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent
 
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAOptions
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithFormatterFunction1
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithFormatterFunction2
@@ -41,7 +42,6 @@ import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.CustomTooltipCom
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.CustomTooltipComposer.Companion.customYAxisLabels
 import com.aachartmodel.aainfographics.ChartsDemo.ChartComposer.CustomTooltipComposer.Companion.customYAxisLabels2
 import com.aachartmodel.aainfographics.R
-import com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
 
 class JSFormatterFunctionActivity : AppCompatActivity() {
 
@@ -53,7 +53,7 @@ class JSFormatterFunctionActivity : AppCompatActivity() {
 
         val aaOptions = configureTheChartOptions(chartType)
 
-        val aaChartView:AAChartView = findViewById(R.id.AAChartView)
+        val aaChartView: AAChartView = findViewById(R.id.AAChartView)
         aaChartView.aa_drawChartWithChartOptions(aaOptions)
 
     }

+ 121 - 1
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/AdditionalContent/OnlyRefreshChartDataActivity.kt

@@ -27,14 +27,134 @@
  */
 package com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.os.Handler
+import android.support.v7.app.AppCompatActivity
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.*
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAOptions
 import com.aachartmodel.aainfographics.R
+import kotlin.math.cos
+import kotlin.math.sin
 
 class OnlyRefreshChartDataActivity : AppCompatActivity() {
+    private var aaChartModel = AAChartModel()
+    private var aaChartView: AAChartView? = null
+    private var updateTimes: Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_only_refresh_chart_data)
+
+        setUpAAChartView()
+        repeatUpdateChartData()
+    }
+
+
+    fun setUpAAChartView() {
+        aaChartView = findViewById(R.id.AAChartView)
+        aaChartModel = configureAAChartModel()
+        val aaOptions: AAOptions = AAOptionsConstructor.configureChartOptions(aaChartModel)
+        if (aaChartModel.chartType == AAChartType.Column) {
+            aaOptions.plotOptions?.column!!
+                .groupPadding(0f)
+                .pointPadding(0f)
+                .borderRadius(5f)
+        } else if (aaChartModel.chartType == AAChartType.Bar) {
+            aaOptions.plotOptions?.bar!!
+                .groupPadding(0f)
+                .pointPadding(0f)
+                .borderRadius(5f)
+        }
+        aaChartView?.aa_drawChartWithChartOptions(aaOptions)
+    }
+
+    private fun configureAAChartModel(): AAChartModel {
+        val aaChartModel = configureChartBasicContent()
+        aaChartModel.series(this.configureChartSeriesArray())
+        return aaChartModel
+    }
+
+    private fun configureChartBasicContent(): AAChartModel {
+        val intent = intent
+        val chartType = intent.getStringExtra("chartType")
+        return AAChartModel()
+            .chartType(convertStringToEnum(chartType))
+            .xAxisVisible(true)
+            .yAxisVisible(false)
+            .title("")
+            .yAxisTitle("摄氏度")
+            .colorsTheme(arrayOf(
+                AAGradientColor.sanguineColor(),
+                AAGradientColor.deepSeaColor(),
+                AAGradientColor.neonGlowColor(),
+                AAGradientColor.wroughtIronColor()))
+            .stacking(AAChartStackingType.Normal)
+    }
+
+    private fun convertStringToEnum(chartTypeStr: String): AAChartType {
+        var chartTypeEnum = AAChartType.Column
+        when (chartTypeStr) {
+            AAChartType.Column.value -> chartTypeEnum = AAChartType.Column
+            AAChartType.Bar.value -> chartTypeEnum = AAChartType.Bar
+            AAChartType.Area.value -> chartTypeEnum = AAChartType.Area
+            AAChartType.Areaspline.value -> chartTypeEnum = AAChartType.Areaspline
+            AAChartType.Line.value -> chartTypeEnum = AAChartType.Line
+            AAChartType.Spline.value -> chartTypeEnum = AAChartType.Spline
+            AAChartType.Scatter.value -> chartTypeEnum = AAChartType.Scatter
+        }
+        return chartTypeEnum
     }
+
+    private fun configureChartSeriesArray(): Array<AASeriesElement> {
+        val maxRange = 40
+        val numberArr1 = arrayOfNulls<Any>(maxRange)
+        val numberArr2 = arrayOfNulls<Any>(maxRange)
+        var y1: Double
+        var y2: Double
+        val max = 38
+        val min = 1
+        val random = (Math.random() * (max - min) + min).toInt()
+        for (i in 0 until maxRange) {
+            y1 = sin(random * (i * Math.PI / 180)) + i * 2 * 0.01
+            y2 = cos(random * (i * Math.PI / 180)) + i * 3 * 0.01
+            numberArr1[i] = y1
+            numberArr2[i] = y2
+        }
+        return arrayOf(
+            AASeriesElement()
+                .name("2017")
+                .data(numberArr1 as Array<Any>),
+            AASeriesElement()
+                .name("2018")
+                .data(numberArr2 as Array<Any>),
+            AASeriesElement()
+                .name("2017")
+                .data(numberArr1 as Array<Any>),
+            AASeriesElement()
+                .name("2018")
+                .data(numberArr2 as Array<Any>)
+        )
+    }
+
+    private fun  repeatUpdateChartData() {
+        val mStartVideoHandler = Handler()
+
+        val mStartVideoRunnable: Runnable = object: Runnable {
+
+            override fun run() {
+                val seriesArr = configureChartSeriesArray()
+                aaChartView!!.aa_onlyRefreshTheChartDataWithChartOptionsSeriesArray(seriesArr)
+
+                mStartVideoHandler.postDelayed(this,1000)
+                updateTimes += 1
+
+                print("图表数据正在刷新,刷新次数为:$updateTimes")
+            }
+        }
+
+        mStartVideoHandler.postDelayed(mStartVideoRunnable,2000)
+    }
+
+
+
 }

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

@@ -34,8 +34,7 @@ import android.widget.CompoundButton
 import android.widget.RadioGroup
 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.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAMoveOverEventMessageModel
 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

@@ -31,8 +31,8 @@ import android.support.v7.app.AppCompatActivity
 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.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartModel
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
 
 class CustomStyleChartActivity : AppCompatActivity() {
 

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

@@ -34,15 +34,12 @@ import android.view.View
 import android.widget.AdapterView.OnItemClickListener
 import android.widget.ArrayAdapter
 import android.widget.ListView
-import com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent.DrawChartWithAAOptionsActivity
-import com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent.EvaluateJSStringFunctionActivity
-import com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent.HideOrShowChartSeriesActivity
-import com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent.JSFormatterFunctionActivity
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartType
+import com.aachartmodel.aainfographics.ChartsDemo.AdditionalContent.*
 import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.CommonChartActivity
 import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.CustomStyleChartActivity
 import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.MixedChartActivity
 import com.aachartmodel.aainfographics.ChartsDemo.BasicContent.SpecialChartActivity
-import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartType
 
 class MainActivity : AppCompatActivity() {
 
@@ -116,8 +113,8 @@ class MainActivity : AppCompatActivity() {
         "configureDoubleYAxesAndColumnLineMixedChart",
         "configureDoubleYAxesMarketDepthChart",
         "customAreaChartTooltipStyleLikeHTMLTable",
-        /*隐藏或显示内容*/
-        "/*隐藏或显示内容*/Column Chart---柱形图--------------",
+        /*及时刷新📈📊图表数据*/
+        /*及时刷新📈📊图表数据*/"/*及时刷新📈📊图表数据*/Column Chart---柱形图--------------",
         "Bar Chart---条形图",
         "Area Chart---折线填充图",
         "Areaspline Chart---曲线填充图",
@@ -125,6 +122,7 @@ class MainActivity : AppCompatActivity() {
         "Step Line Chart--- 直方折线图",
         "Line Chart---折线图",
         "Spline Chart---曲线图",
+        "Scatter Chart---散点图",
         /*自定义 formatter 函数*/
         "/*自定义 formatter 函数*/简单字符串拼接-----------------",
         "自定义不同单位后缀",
@@ -209,7 +207,7 @@ class MainActivity : AppCompatActivity() {
         "configureDoubleYAxesAndColumnLineMixedChart",
         "configureDoubleYAxesMarketDepthChart",
         "customAreaChartTooltipStyleLikeHTMLTable",
-        /*隐藏或显示内容*/
+        /*及时刷新📈📊图表数据*/
         AAChartType.Column.value,
         AAChartType.Bar.value,
         AAChartType.Area.value,
@@ -218,6 +216,7 @@ class MainActivity : AppCompatActivity() {
         AAChartType.Line.value,
         AAChartType.Line.value,
         AAChartType.Spline.value,
+        AAChartType.Scatter.value,
         /*自定义 formatter 函数*/
         "formatterFunction1",
         "formatterFunction2",
@@ -249,31 +248,22 @@ class MainActivity : AppCompatActivity() {
         listView.onItemClickListener =
             OnItemClickListener { adapter, view, position, id ->
                 println(position)
-                when {
-                    position <= 7 -> { /*基础类型图表*/
-                        goToCommonChartActivity(position)
-                    }
-                    position <= 20 -> { /*特殊类型图表*/
-                        goToSpecialChartActivity(position)
-                    }
-                    position <= 29 -> { /*Mixed Chart---混合图*/
-                        goToMixedChartActivity(position)
-                    }
-                    position <= 47 -> { /*自定义样式图表*/
-                        goToCustomStyleChartActivity(position)
-                    }
-                    position <= 63 -> { /*使用AAOptions绘制图表*/
-                        goToDrawChartWithAAOptionsActivity(position)
-                    }
-                    position <= 70 -> { /*隐藏或显示内容*/
-                        goToHideOrShowChartSeriesActivity(position)
-                    }
-                    position <= 81 -> { /*formatter js function*/
-                        goToCustomTooltipWithJSFunctionActivity(position)
-                    }
-                    else -> { /*eval JS Function*/
-                        goToEvaluateJSStringFunctionActivity(position)
-                    }
+                if (position <= 7) { /*基础类型图表*/
+                    goToCommonChartActivity(position)
+                } else if (position <= 20) { /*特殊类型图表*/
+                    goToSpecialChartActivity(position)
+                } else if (position <= 29) { /*Mixed Chart---混合图*/
+                    goToMixedChartActivity(position)
+                } else if (position <= 47) { /*自定义样式图表*/
+                    goToCustomStyleChartActivity(position)
+                } else if (position <= 63) { /*使用AAOptions绘制图表*/
+                    goToDrawChartWithAAOptionsActivity(position)
+                } else if (position <= 72) { /*及时刷新📈📊图表数据*/
+                    goToOnlyRefreshChartDataActivity(position)
+                } else if (position <= 83) { /*formatter js function*/
+                    goToCustomTooltipWithJSFunctionActivity(position)
+                } else { /*eval JS Function*/
+                    goToEvaluateJSStringFunctionActivity(position)
                 }
             }
     }
@@ -314,6 +304,12 @@ class MainActivity : AppCompatActivity() {
         startActivity(intent)
     }
 
+    fun goToOnlyRefreshChartDataActivity(position: Int) {
+        val intent = Intent(this, OnlyRefreshChartDataActivity::class.java)
+        intent.putExtra("chartType", chartTypeArr[position])
+        startActivity(intent)
+    }
+
     private fun goToHideOrShowChartSeriesActivity(position: Int) {
         val intent = Intent(this, HideOrShowChartSeriesActivity::class.java)
         intent.putExtra("chartType", chartTypeArr[position])

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

@@ -31,8 +31,8 @@ import android.support.v7.app.AppCompatActivity
 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.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartModel
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
 
 class MixedChartActivity : AppCompatActivity() {
     private var aaChartModel: AAChartModel? = null

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

@@ -31,9 +31,9 @@ import android.support.v7.app.AppCompatActivity
 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.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartModel
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartType
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
 
 class SpecialChartActivity : AppCompatActivity() {
 

+ 1 - 1
app/src/main/res/layout/activity_common_chart.xml

@@ -185,7 +185,7 @@
     </LinearLayout>
 
 
-        <com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
+        <com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
                 android:id="@+id/AAChartView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

+ 1 - 1
app/src/main/res/layout/activity_custom_style_chart.xml

@@ -8,7 +8,7 @@
         tools:context=".ChartsDemo.BasicContent.CustomStyleChartActivity">
 
 
-    <com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
+    <com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
             android:id="@+id/AAChartView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 1 - 1
app/src/main/res/layout/activity_custom_tooltip_with_jsfunction.xml

@@ -8,7 +8,7 @@
         tools:context=".ChartsDemo.AdditionalContent.JSFormatterFunctionActivity">
 
 
-    <com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
+    <com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
             android:id="@+id/AAChartView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 1 - 1
app/src/main/res/layout/activity_draw_chart_with_aaoptions.xml

@@ -7,7 +7,7 @@
         android:layout_height="match_parent"
         tools:context=".ChartsDemo.AdditionalContent.DrawChartWithAAOptionsActivity">
 
-    <com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
+    <com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
             android:id="@+id/AAChartView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 1 - 1
app/src/main/res/layout/activity_mixed_chart.xml

@@ -8,7 +8,7 @@
         tools:context=".ChartsDemo.BasicContent.MixedChartActivity">
 
 
-    <com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
+    <com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
             android:id="@+id/AAChartView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 6 - 0
app/src/main/res/layout/activity_only_refresh_chart_data.xml

@@ -7,4 +7,10 @@
         android:layout_height="match_parent"
         tools:context=".ChartsDemo.AdditionalContent.OnlyRefreshChartDataActivity">
 
+    <com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
+            android:id="@+id/AAChartView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+
 </android.support.constraint.ConstraintLayout>

+ 1 - 1
app/src/main/res/layout/activity_special_chart.xml

@@ -8,7 +8,7 @@
         tools:context=".ChartsDemo.BasicContent.SpecialChartActivity">
 
 
-    <com.aachartmodel.aainfographics.aainfographicsLib.aachartConfiger.AAChartView
+    <com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAChartView
             android:id="@+id/AAChartView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"