Commit 40c50fdf774f127480e11d5f32299162ca1b9f94

Authored by 杨帅
1 parent 71171791

1 修复用户上传完赛事,返回赛事详情页,按钮状态不正确的问题

moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
@@ -357,6 +357,8 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinis @@ -357,6 +357,8 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinis
357 LineUpAgainActivity.newInstance(context); 357 LineUpAgainActivity.newInstance(context);
358 //关闭当前窗口 358 //关闭当前窗口
359 context.finish(); 359 context.finish();
  360 + //用户跑完了,更新一下按钮
  361 + EventBus.getDefault().post(new MessageEvent(Constant.UPDATE_RACE_STATE_BTN, ""));
360 } 362 }
361 }); 363 });
362 failTraceDialog.setCanceledOnTouchOutside(false); 364 failTraceDialog.setCanceledOnTouchOutside(false);
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
@@ -192,6 +192,7 @@ public class RunMainFragmentView implements MvpView { @@ -192,6 +192,7 @@ public class RunMainFragmentView implements MvpView {
192 firstTimeFlag = true; 192 firstTimeFlag = true;
193 handler = new Handler(); 193 handler = new Handler();
194 timeCountDown = 4; 194 timeCountDown = 4;
  195 + fragment.binding.llRunMainRoot.setBackgroundColor(getContext().getResources().getColor(R.color.run_main_bg));
195 //开始时间倒计时 196 //开始时间倒计时
196 runnable = new Runnable() { 197 runnable = new Runnable() {
197 @Override 198 @Override
@@ -209,7 +210,6 @@ public class RunMainFragmentView implements MvpView { @@ -209,7 +210,6 @@ public class RunMainFragmentView implements MvpView {
209 } else { 210 } else {
210 ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, true); 211 ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, true);
211 fragment.binding.llRunMainRoot.setVisibility(View.VISIBLE); 212 fragment.binding.llRunMainRoot.setVisibility(View.VISIBLE);
212 - fragment.binding.llRunMainRoot.setBackgroundColor(getContext().getResources().getColor(R.color.run_main_bg));  
213 new Handler().postDelayed(new Runnable() { 213 new Handler().postDelayed(new Runnable() {
214 @Override 214 @Override
215 public void run() { 215 public void run() {
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
@@ -151,6 +151,15 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity { @@ -151,6 +151,15 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
151 151
152 } 152 }
153 153
  154 + /**
  155 + * 用户已经上传完成绩
  156 + */
  157 + public void onUserUpLoadRace() {
  158 + if (!TextUtils.isEmpty(eventId)) {
  159 + CommonInfo.setStreetId(this, eventId);
  160 + }
  161 + }
  162 +
154 private void addFragment(QMUIFragment fragment) { 163 private void addFragment(QMUIFragment fragment) {
155 getSupportFragmentManager().beginTransaction() 164 getSupportFragmentManager().beginTransaction()
156 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName()) 165 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/LineUpAgainFragment.java
@@ -61,7 +61,6 @@ public class LineUpAgainFragment extends MvpBindingFragment<LineUpAgainView, Lin @@ -61,7 +61,6 @@ public class LineUpAgainFragment extends MvpBindingFragment<LineUpAgainView, Lin
61 @Override 61 @Override
62 public void onResume() { 62 public void onResume() {
63 super.onResume(); 63 super.onResume();
64 - Log.e(TAG, "onResume: ");  
65 List<FailedEntity> failedEntities = StepUtil.getFailListData(getActivity(), CommonInfo.getUserId(getActivity())); 64 List<FailedEntity> failedEntities = StepUtil.getFailListData(getActivity(), CommonInfo.getUserId(getActivity()));
66 if (getMvpView() != null) { 65 if (getMvpView() != null) {
67 if (failedEntities == null || failedEntities.size() < 1) { 66 if (failedEntities == null || failedEntities.size() < 1) {
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
@@ -16,6 +16,7 @@ import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView; @@ -16,6 +16,7 @@ import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
16 import com.cnlive.moudle.pedometer.model.Constant; 16 import com.cnlive.moudle.pedometer.model.Constant;
17 import com.cnlive.moudle.pedometer.model.MessageEvent; 17 import com.cnlive.moudle.pedometer.model.MessageEvent;
18 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity; 18 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
  19 +import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
19 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil; 20 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
20 import com.example.moudle_pedometer.R; 21 import com.example.moudle_pedometer.R;
21 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding; 22 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
@@ -198,6 +199,14 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie @@ -198,6 +199,14 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
198 } 199 }
199 //用户跑完了,更新一下按钮 200 //用户跑完了,更新一下按钮
200 else if (messageEvent.getMessageType() == Constant.UPDATE_RACE_STATE_BTN) { 201 else if (messageEvent.getMessageType() == Constant.UPDATE_RACE_STATE_BTN) {
  202 + if (null != getActivity()) {
  203 + if (getActivity() instanceof RunRaceDetailActivity) {
  204 + RunRaceDetailActivity activity = (RunRaceDetailActivity) getActivity();
  205 + if (null != activity) {
  206 + activity.onUserUpLoadRace();
  207 + }
  208 + }
  209 + }
201 if (getMvpView() != null && null != getPresenter()) { 210 if (getMvpView() != null && null != getPresenter()) {
202 if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) { 211 if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) {
203 getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0"); 212 getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0");