Commit 2bd260b10f2534516b3e887978d31cd7f6db4311

Authored by YangShuai
1 parent fa3eff06

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

# Conflicts:
#	config.gradle
config.gradle
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.0.4",
  24 + version: "1.0.5",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/res/values/attrs.xml
... ... @@ -3,7 +3,7 @@
3 3 <declare-styleable name="CirclePercentView">
4 4 <attr name="radius" format="dimension" />
5 5 <attr name="stripeWidth" format="dimension" /><!--色带宽度-->
6   - <attr name="percent" format="integer" /><!--百分比 最大值为100-->
  6 + <attr name="percentCount" format="integer" /><!--百分比 最大值为100-->
7 7 <attr name="smallColor" format="color" /><!--色带宽度-->
8 8 <!--外圈颜色-->
9 9 <attr name="bigColor" format="color" />
... ...