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

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
韩亚云
2 parents a8010554 cf4f60ad
Showing 3 changed files with 4 additions and 2 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
@@ -150,7 +150,7 @@ public class RunMainFragmentView implements MvpView {
                             if (firstTimeFlag) {
                                 firstTimeFlag = false;
                                 fragment.binding.chronometer.setFormat("00:00:01");
-                                fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime());
+                                fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime()-50000000);
                                 fragment.binding.chronometer.start();
                             }
                         }
@@ -174,7 +174,7 @@ public class RunMainFragmentView implements MvpView {
                 } else if (hour < 10) {
                     chronometer.setFormat("0" + "%s");
                 } else {
-                    chronometer.setFormat("%s");
+                    chronometer.setFormat("");
                 }
  
             }
@@ -308,6 +308,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
  
         }
         //判断用户是否报名
+        Log.e(TAG, "initView: 是否报名"+runRaceDetailInfo.isSignResult() );
         if (runRaceDetailInfo.isSignResult()) {
             fragment.binding.rlScrollViewStartBtn.setTag("1");
             fragment.binding.tvRunNow.setText("现在开始");
@@ -73,6 +73,7 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
         EventBus.getDefault().register(this);
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
+
         if (getMvpView() != null) {
             getMvpView().initMap();
         }