CNLive Android Team / ModulePedometer · Commits

Commit c55c3ca98df4764771850490c8e2836061bb8e6c

Authored by 杨帅
2 parents ab8a1cd1 ee74c27b

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
  View file @c55c3ca
@@ -173,7 +173,7 @@ public class SelfRecordView implements MvpView { @@ -173,7 +173,7 @@ public class SelfRecordView implements MvpView {
173 @Override 173 @Override
174 public void onClick(View v) { 174 public void onClick(View v) {
175 fragment.currentPage = 1; 175 fragment.currentPage = 1;
176 - fragment.completeStatus = 0; 176 + fragment.completeStatus = 1;
177 fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.completeStatus, fragment.currentPage, fragment.pageSize); 177 fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.completeStatus, fragment.currentPage, fragment.pageSize);
178 } 178 }
179 }); 179 });
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
  View file @c55c3ca
@@ -31,7 +31,7 @@ public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfR @@ -31,7 +31,7 @@ public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfR
31 31
32 public int currentPage = 1; 32 public int currentPage = 1;
33 public int pageSize = 10; 33 public int pageSize = 10;
34 - public int completeStatus = 0; 34 + public int completeStatus = 1;
35 private QBadgeView qBadgeView; 35 private QBadgeView qBadgeView;
36 36
37 public SelfRecordFragment() { 37 public SelfRecordFragment() {
@@ -46,9 +46,9 @@ public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfR @@ -46,9 +46,9 @@ public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfR
46 getData(completeStatus); 46 getData(completeStatus);
47 47
48 binding.hasFinish.setOnClickListener(v -> 48 binding.hasFinish.setOnClickListener(v ->
49 - getData(0));  
50 - binding.noFinish.setOnClickListener(v ->  
51 getData(1)); 49 getData(1));
  50 + binding.noFinish.setOnClickListener(v ->
  51 + getData(0));
52 binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { 52 binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
53 @Override 53 @Override
54 public void onRefresh(@NonNull RefreshLayout refreshLayout) { 54 public void onRefresh(@NonNull RefreshLayout refreshLayout) {
@@ -72,7 +72,7 @@ public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfR @@ -72,7 +72,7 @@ public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfR
72 if(completeStatu != completeStatus) currentPage = 1; 72 if(completeStatu != completeStatus) currentPage = 1;
73 this.completeStatus = completeStatu; 73 this.completeStatus = completeStatu;
74 getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize); 74 getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize);
75 - if (completeStatus == 0) { 75 + if (completeStatus == 1) {
76 binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx)); 76 binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
77 binding.hasFinish.setTextSize(18); 77 binding.hasFinish.setTextSize(18);
78 binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black)); 78 binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));