CNLive Android Team / ModulePedometer · Commits

Commit 659e1d787a557e9050fe2985ae6589ab1864e7f0

Authored by 韩亚云
1 parent 3ef24c41

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

# 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
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
config.gradle
  View file @659e1d7
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "1.0.7", 24 + version: "1.0.8",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @659e1d7
@@ -122,7 +122,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView @@ -122,7 +122,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView
122 String baseWebUrl, title; 122 String baseWebUrl, title;
123 if (state.equals("0")) { 123 if (state.equals("0")) {
124 title = "排行榜"; 124 title = "排行榜";
125 - baseWebUrl = AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportList.html" : "http://wjjh5.cnlive.com/cnSportList.html"; 125 + baseWebUrl = AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportListNew.html" : "http://wjjh5.cnlive.com/cnSportListNew.html";
126 } else { 126 } else {
127 title = "总排行榜"; 127 title = "总排行榜";
128 baseWebUrl = AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportListOver.html" : "http://wjjh5.cnlive.com/cnSportListOver.html"; 128 baseWebUrl = AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportListOver.html" : "http://wjjh5.cnlive.com/cnSportListOver.html";