CNLive Android Team / ModulePedometer · Commits

Commit 7a4f49e47ffcbfe0c3eacb335f5613671f0a6265

Authored by 韩亚云
2 parents a8010554 cf4f60ad

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

# Conflicts:
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
Inline Side-by-side
Showing 3 changed files with 4 additions and 2 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
  View file @7a4f49e
@@ -150,7 +150,7 @@ public class RunMainFragmentView implements MvpView { @@ -150,7 +150,7 @@ public class RunMainFragmentView implements MvpView {
150 if (firstTimeFlag) { 150 if (firstTimeFlag) {
151 firstTimeFlag = false; 151 firstTimeFlag = false;
152 fragment.binding.chronometer.setFormat("00:00:01"); 152 fragment.binding.chronometer.setFormat("00:00:01");
153 - fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime()); 153 + fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime()-50000000);
154 fragment.binding.chronometer.start(); 154 fragment.binding.chronometer.start();
155 } 155 }
156 } 156 }
@@ -174,7 +174,7 @@ public class RunMainFragmentView implements MvpView { @@ -174,7 +174,7 @@ public class RunMainFragmentView implements MvpView {
174 } else if (hour < 10) { 174 } else if (hour < 10) {
175 chronometer.setFormat("0" + "%s"); 175 chronometer.setFormat("0" + "%s");
176 } else { 176 } else {
177 - chronometer.setFormat("%s"); 177 + chronometer.setFormat("");
178 } 178 }
179 179
180 } 180 }
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @7a4f49e
@@ -308,6 +308,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { @@ -308,6 +308,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
308 308
309 } 309 }
310 //判断用户是否报名 310 //判断用户是否报名
  311 + Log.e(TAG, "initView: 是否报名"+runRaceDetailInfo.isSignResult() );
311 if (runRaceDetailInfo.isSignResult()) { 312 if (runRaceDetailInfo.isSignResult()) {
312 fragment.binding.rlScrollViewStartBtn.setTag("1"); 313 fragment.binding.rlScrollViewStartBtn.setTag("1");
313 fragment.binding.tvRunNow.setText("现在开始"); 314 fragment.binding.tvRunNow.setText("现在开始");
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
  View file @7a4f49e
@@ -73,6 +73,7 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie @@ -73,6 +73,7 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
73 StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0); 73 StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
74 EventBus.getDefault().register(this); 74 EventBus.getDefault().register(this);
75 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务 75 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
  76 +
76 if (getMvpView() != null) { 77 if (getMvpView() != null) {
77 getMvpView().initMap(); 78 getMvpView().initMap();
78 } 79 }