CNLive Android Team / ModulePedometer · Commits

Commit 2bd260b10f2534516b3e887978d31cd7f6db4311

Authored by YangShuai
1 parent fa3eff06

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

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