CNLive Android Team / ModulePedometer · Commits

 Conflicts:
	config.gradle

2 修复首次进入已结束的活动详情页小概率显示异常问题

2 修复赛事结束按钮可点击的问题

2 修复线上赛事与路径工具计步异常

# Conflicts:
#	config.gradle
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java

# Conflicts:
#	config.gradle

# Conflicts:
#	config.gradle