CNLive Android Team / newModuleStrike · Commits

Commit 78d1c74d7637f74aa202eface706a09307f09117

Authored by 韩亚云
2 parents ae823665 e1ba8b59

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

Inline Side-by-side
Showing 3 changed files with 14 additions and 5 deletions
app/strike/src/main/java/com/cnlive/strike/MyActivity.java
  View file @78d1c74
... ... @@ -8,6 +8,7 @@ import android.view.View;
8 8 import com.alibaba.android.arouter.facade.annotation.Route;
9 9 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
10 10 import com.cnlive.core.libs.base.util.NetworkUtil;
  11 +import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
11 12 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
12 13 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
13 14 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
... ... @@ -35,7 +36,10 @@ public class MyActivity extends BaseActivity {
35 36 protected void initView() {
36 37 // loadRootFragment(new EmptyFragment());
37 38 initXiaoJiaSoundBoxData();
38   - startActivity(new Intent(MyActivity.this, RaceListActivity.class));
  39 +// startActivity(new Intent(MyActivity.this, RaceListActivity.class));
  40 + RaceListActivity.newInstance(me, UserService.getUid(me),
  41 + UserService.getInstance(me).getAppAccount().getNickName(),
  42 + UserService.getInstance(me).getAppAccount().getFaceUrl());
39 43 // finish();
40 44 // binding.btnChange.setOnClickListener(new View.OnClickListener() {
41 45 // @Override
... ...
core/imageload/src/main/java/com/cnlive/core/imageload/preview/presenter/PreviewImgPresenter.java
  View file @78d1c74
... ... @@ -19,6 +19,7 @@ import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
19 19 import java.io.File;
20 20  
21 21 import androidx.annotation.Nullable;
  22 +
22 23 import io.reactivex.Observable;
23 24 import io.reactivex.ObservableEmitter;
24 25 import io.reactivex.ObservableOnSubscribe;
... ... @@ -44,12 +45,13 @@ public class PreviewImgPresenter extends BasePresenter<PreviewImgView> {
44 45 FutureTarget<File> file = Glide.with(context).asFile().load(previewData.getImgPath()).listener(new RequestListener<File>() {
45 46 @Override
46 47 public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<File> target, boolean isFirstResource) {
47   - ifViewAttached(view -> view.showLoadFail());
  48 +// ifViewAttached(view -> view.showLoadFail());
48 49 return false;
49 50 }
  51 +
50 52 @Override
51 53 public boolean onResourceReady(File resource, Object model, Target<File> target, DataSource dataSource, boolean isFirstResource) {
52   - ifViewAttached(view -> view.showResourceReady());
  54 +// ifViewAttached(view -> view.showResourceReady());
53 55 return false;
54 56 }
55 57 }).submit();
... ... @@ -75,12 +77,15 @@ public class PreviewImgPresenter extends BasePresenter&lt;PreviewImgView&gt; {
75 77  
76 78 @Override
77 79 public void onNext(File filse) {
  80 +
  81 + ifViewAttached(view -> view.showResourceReady());
78 82 ifViewAttached(view -> view.showImg(filse));
79 83 }
80 84  
81 85 @Override
82 86 public void onError(Throwable e) {
83   - if (e!=null){
  87 + ifViewAttached(view -> view.showLoadFail());
  88 + if (e != null) {
84 89 ifViewAttached(view -> view.showMessage(e.getMessage()));
85 90 }
86 91  
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/RaceNameListPresenter.java
  View file @78d1c74
... ... @@ -127,7 +127,7 @@ public class RaceNameListPresenter extends BasePresenter&lt;RaceNameListView&gt; {
127 127 public void onSuccess(BaseResult<BindingShoeInfo> data) {
128 128 QMUITipDialogUtil.dismessDialog();
129 129 ifViewAttached(view -> view.bindingShoeLine(position));
130   - EventBus.getDefault().post(new MessageEvent(Constant.UPDATA_COLL_BIND_TRACE_LIST, ""));
  130 + EventBus.getDefault().post(new MessageEvent(Constant.UPDATA_COLL_BIND_TRACE_LIST, position));
131 131 }
132 132  
133 133 @Override
... ...