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

韩亚云
2 parents ae823665 e1ba8b59
Showing 3 changed files with 14 additions and 5 deletions
app/strike/src/main/java/com/cnlive/strike/MyActivity.java
core/imageload/src/main/java/com/cnlive/core/imageload/preview/presenter/PreviewImgPresenter.java
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/RaceNameListPresenter.java
@@ -8,6 +8,7 @@ import android.view.View;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.util.NetworkUtil;
+import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
@@ -35,7 +36,10 @@ public class MyActivity extends BaseActivity {
     protected void initView() {
 //        loadRootFragment(new EmptyFragment());
         initXiaoJiaSoundBoxData();
-        startActivity(new Intent(MyActivity.this, RaceListActivity.class));
+//        startActivity(new Intent(MyActivity.this, RaceListActivity.class));
+        RaceListActivity.newInstance(me, UserService.getUid(me),
+                UserService.getInstance(me).getAppAccount().getNickName(),
+                UserService.getInstance(me).getAppAccount().getFaceUrl());
 //        finish();
 //        binding.btnChange.setOnClickListener(new View.OnClickListener() {
 //            @Override
@@ -19,6 +19,7 @@ import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import java.io.File;
 import androidx.annotation.Nullable;
+
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
 import io.reactivex.ObservableOnSubscribe;
@@ -44,12 +45,13 @@ public class PreviewImgPresenter extends BasePresenter&lt;PreviewImgView&gt; {
                 FutureTarget<File> file = Glide.with(context).asFile().load(previewData.getImgPath()).listener(new RequestListener<File>() {
                     @Override
                     public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<File> target, boolean isFirstResource) {
-                        ifViewAttached(view -> view.showLoadFail());
+//                        ifViewAttached(view -> view.showLoadFail());
                         return false;
                     }
+
                     @Override
                     public boolean onResourceReady(File resource, Object model, Target<File> target, DataSource dataSource, boolean isFirstResource) {
-                        ifViewAttached(view -> view.showResourceReady());
+//                        ifViewAttached(view -> view.showResourceReady());
                         return false;
                     }
                 }).submit();
@@ -75,12 +77,15 @@ public class PreviewImgPresenter extends BasePresenter&lt;PreviewImgView&gt; {
             @Override
             public void onNext(File filse) {
+
+                ifViewAttached(view -> view.showResourceReady());
                 ifViewAttached(view -> view.showImg(filse));
             }
             @Override
             public void onError(Throwable e) {
-                if (e!=null){
+                ifViewAttached(view -> view.showLoadFail());
+                if (e != null) {
                     ifViewAttached(view -> view.showMessage(e.getMessage()));
                 }
@@ -127,7 +127,7 @@ public class RaceNameListPresenter extends BasePresenter&lt;RaceNameListView&gt; {
                     public void onSuccess(BaseResult<BindingShoeInfo> data) {
                         QMUITipDialogUtil.dismessDialog();
                         ifViewAttached(view -> view.bindingShoeLine(position));
-                        EventBus.getDefault().post(new MessageEvent(Constant.UPDATA_COLL_BIND_TRACE_LIST, ""));
+                        EventBus.getDefault().post(new MessageEvent(Constant.UPDATA_COLL_BIND_TRACE_LIST, position));
                     }
                     @Override