1、修复添加多组数据时，各组数据内容长度不同时的显示错误问题

2、修复初始顶点角度偏斜的问题 3、修复数据区即使达到最大值也无法充满整个雷达图的问题 4、顶点描述现在支持多种方式的图片+文字混排 5、添加给各顶点设置自己独立的最大值功能 6、添加设置中心描述文字功能
qstumn · Oct 11, 2017 · 5ad8135 · 5ad8135
1 parent d77f547
commit 5ad8135
Show file tree

Hide file tree

Showing 16 changed files with 331 additions and 169 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/RadarViewDemo/src/main/java/rorbin/q/radarviewdemo/MainActivity.java b/RadarViewDemo/src/main/java/rorbin/q/radarviewdemo/MainActivity.java
@@ -1,5 +1,6 @@
 package rorbin.q.radarviewdemo;
 
+import android.graphics.Color;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Menu;
@@ -29,9 +30,16 @@ protected void onCreate(Bundle savedInstanceState) {
         List<String> vertexText = new ArrayList<>();
         Collections.addAll(vertexText, "力量", "敏捷", "速度", "智力", "精神", "耐力", "体力", "魔力", "意志", "幸运");
         mRadarView.setVertexText(vertexText);
+        List<Integer> res = new ArrayList<>();
+        Collections.addAll(res, R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher,
+                R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher,
+                R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher);
+        mRadarView.setVertexIconResid(res);
         List<Float> values = new ArrayList<>();
         Collections.addAll(values, 3f, 6f, 2f, 7f, 5f, 1f, 4f, 3f, 8f, 5f);
         RadarData data = new RadarData(values);
+        data.setValueTextEnable(true);
+        data.setVauleTextColor(Color.WHITE);
         List<Float> values2 = new ArrayList<>();
         Collections.addAll(values2, 7f, 1f, 4f, 2f, 8f, 3f, 9f, 6f, 5f, 3f);
         RadarData data2 = new RadarData(values2);

diff --git a/RadarViewDemo/src/main/res/layout/activity_main.xml b/RadarViewDemo/src/main/res/layout/activity_main.xml
@@ -14,5 +14,8 @@
     <rorbin.q.radarview.RadarView
         android:id="@+id/radarView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        app:vertex_icon_size="30dp"
+        app:vertex_text_offset="30dp"
+        app:vertex_icon_position="top"
+        android:layout_height="match_parent"/>
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.novoda:bintray-release:0.4.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/radarviewlib/build.gradle b/radarviewlib/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 14