Commit 2bd260b10f2534516b3e887978d31cd7f6db4311
1 parent
fa3eff06
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer
# Conflicts: # config.gradle
Showing
2 changed files
with
2 additions
and
2 deletions
config.gradle
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" /> | ... | ... |