From ccc983abbc46892b87b6366691e009d49a8ddd8a Mon Sep 17 00:00:00 2001 From: lixiancheng Date: Thu, 5 Jul 2018 21:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DIssue=207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Project_Default.xml | 8 ++++++++ .idea/misc.xml | 15 +-------------- .idea/modules.xml | 3 +++ README.md | 8 +++++++- app/build.gradle | 4 ++-- .../com/orzangleli/radarview/MainActivity.java | 2 -- app/src/main/res/layout/activity_demo.xml | 2 +- gradlew | 0 xradar/build.gradle | 2 +- .../java/com/orzangleli/radar/XRadarView.java | 14 +++++++------- xradar/src/main/res/values/attrs.xml | 2 +- 11 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml mode change 100644 => 100755 gradlew diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..71040af --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981..ba7052b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 2c31ba8..0b6e59e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,10 @@ + + + diff --git a/README.md b/README.md index 1bba84d..9284e11 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ Lastest Version: ## 更新日志 +### 1.0.5 版本 更新内容 + +修复Issues 与material design冲突问题。 + +请注意此版本之后，边界线宽度使用`boundaryWidth`指定。 + ### 1.0.4版本 更新内容 1. 支持圆形轮廓 2. 支持区域颜色渐变 @@ -37,7 +43,7 @@ XRadarView 支持高度自定义，其可调整属性及含义如下表所示。 |pointColor|圆点颜色| |pointRadius|圆点半径大小| |borderColor|边界线颜色| -|borderWidth|边界线的宽度| +|boundaryWidth|边界线的宽度| |radiusColor|半径线的颜色| |enabledBorder|是否画边界线| |enabledAnimation|是否开启动画| diff --git a/app/build.gradle b/app/build.gradle index 48bbb87..8b8b135 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,8 +26,8 @@ dependencies { }) compile 'com.android.support:appcompat-v7:25.3.1' testCompile 'junit:junit:4.12' -// compile project(':xradar') - compile 'com.orzangleli:xradar:1.0.4' + compile project(':xradar') +// compile 'com.orzangleli:xradar:1.0.5' } diff --git a/app/src/main/java/com/orzangleli/radarview/MainActivity.java b/app/src/main/java/com/orzangleli/radarview/MainActivity.java index 37edd98..d58d8b5 100644 --- a/app/src/main/java/com/orzangleli/radarview/MainActivity.java +++ b/app/src/main/java/com/orzangleli/radarview/MainActivity.java @@ -269,10 +269,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { break; case R.id.drawIcon: if (isChecked) { - radarView.setEnabledRegionShader(false); radarView.setDrawables(drawables); } else { - radarView.setEnabledRegionShader(true); radarView.setDrawables(null); } break; diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml index d3a7ab5..a998af3 100644 --- a/app/src/main/res/layout/activity_demo.xml +++ b/app/src/main/res/layout/activity_demo.xml @@ -18,7 +18,7 @@ app:count="7" app:enabledBorder="true" app:borderColor="#ff0000" - app:borderWidth="2dp" + app:boundaryWidth="2dp" app:radiusColor="#88D3D8" app:enabledShowPoint="false" app:layerCount="4" diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/xradar/build.gradle b/xradar/build.gradle index 9f565be..ffc149c 100644 --- a/xradar/build.gradle +++ b/xradar/build.gradle @@ -37,7 +37,7 @@ publish { userOrg = 'orzangleli'//bintray.com用户名 groupId = 'com.orzangleli'//jcenter上的路径 artifactId = 'xradar'//项目名称 - publishVersion = '1.0.4'//版本号 + publishVersion = '1.0.5'//版本号 desc = 'A highly customizable radar view for Android'//描述，不重要 website = 'https://github.com/hust201010701/XRadarView'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了 } diff --git a/xradar/src/main/java/com/orzangleli/radar/XRadarView.java b/xradar/src/main/java/com/orzangleli/radar/XRadarView.java index 85a1168..174498f 100644 --- a/xradar/src/main/java/com/orzangleli/radar/XRadarView.java +++ b/xradar/src/main/java/com/orzangleli/radar/XRadarView.java @@ -73,7 +73,7 @@ public class XRadarView extends View { // 边界线颜色 private int borderColor; // 边界线的宽度 - private int borderWidth; + private int boundaryWidth; // 半径线的颜色 private int radiusColor; // 雷达图渐变颜色数组 @@ -176,7 +176,7 @@ public XRadarView(Context context, @Nullable AttributeSet attrs, int defStyleAtt pointColor = typedArray.getColor(R.styleable.XRadarView_pointColor, Color.parseColor("#80333366")); borderColor = typedArray.getColor(R.styleable.XRadarView_borderColor, Color.parseColor("#80333366")); radiusColor = typedArray.getColor(R.styleable.XRadarView_radiusColor, Color.parseColor("#80CCCCCC")); - borderWidth = typedArray.getDimensionPixelSize(R.styleable.XRadarView_borderWidth, 5); + boundaryWidth = typedArray.getDimensionPixelSize(R.styleable.XRadarView_boundaryWidth, 5); pointRadius = typedArray.getDimensionPixelSize(R.styleable.XRadarView_pointRadius, 10); enabledBorder = typedArray.getBoolean(R.styleable.XRadarView_enabledBorder, false); @@ -240,7 +240,7 @@ public XRadarView(Context context, @Nullable AttributeSet attrs, int defStyleAtt borderPaint.setStyle(Paint.Style.FILL_AND_STROKE); borderPaint.setAntiAlias(true); borderPaint.setColor(borderColor); - borderPaint.setStrokeWidth(borderWidth); + borderPaint.setStrokeWidth(boundaryWidth); loadAnimation(enabledAnimation); @@ -881,12 +881,12 @@ public void setBorderColor(int borderColor) { invalidate(); } - public int getBorderWidth() { - return borderWidth; + public int getBoundaryWidth() { + return boundaryWidth; } - public void setBorderWidth(int borderWidth) { - this.borderWidth = borderWidth; + public void setBoundaryWidth(int boundaryWidth) { + this.boundaryWidth = boundaryWidth; } public boolean isEnabledPolygon() { diff --git a/xradar/src/main/res/values/attrs.xml b/xradar/src/main/res/values/attrs.xml index 31550b8..eb268c6 100644 --- a/xradar/src/main/res/values/attrs.xml +++ b/xradar/src/main/res/values/attrs.xml @@ -19,7 +19,7 @@ - +