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

杨帅
2 parents 74b24356 e76b6a53
Showing 4 changed files with 38 additions and 7 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/RaceNameListPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/ApiServiceRunLin.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/ShoeDelectInfo.java
@@ -6,6 +6,7 @@ import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.frame.view.RaceNameListView;
 import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
 import com.cnlive.moudle.collectionTrace.model.CheckShoeLineBean;
@@ -13,6 +14,7 @@ import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.ShoeDelectInfo;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
@@ -65,12 +67,12 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
     public void delectShoeLine(Context context, int id, int position) {
         Map<String, String> map = new HashMap<>();
         map.put("id", id + "");
-        Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo>() {
+        Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo<ShoeDelectInfo>>() {
             @Override
-            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<ShoeDelectInfo>> dataCallback) {
                 return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.deleteShoeLineInfo(stringStringMap)).subscribe(context, dataCallback);
             }
-        }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
+        }).<BaseInfo<ShoeDelectInfo>>event().setFailureCallback(new FailureCallback() {
             @Override
             public void onFailure(int code, String message) {
                 if (getView() != null) {
@@ -78,11 +80,19 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
                     getView().hideLoading();
                 }
             }
-        }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+        }).setSuccessCallback(new SuccessCallback<BaseInfo<ShoeDelectInfo>>() {
             @Override
-            public void onSuccess(BaseInfo baseInfo) {
+            public void onSuccess(BaseInfo<ShoeDelectInfo> baseInfo) {
                 if (getView() != null) {
-                    getView().delectShoeLine(position);
+                    getView().hideLoading();
+                    if(baseInfo.getData().getIsBind() != null && baseInfo.getData().getIsBind().equals("1")){
+                        getView().delectShoeLine(position);
+                    }else if(baseInfo.getData().getIsBind() != null && baseInfo.getData().getIsBind().equals("-1")){
+                        getView().bindingShoeLine(position);
+                        AlertUtil.showDeftToast(context, "该轨迹已绑定，禁止删除");
+                    }else {
+                        AlertUtil.showDeftToast(context, "删除出错");
+                    }
                 }
             }
         }).start();
@@ -111,6 +111,9 @@ public class RaceNameListView implements MvpView, OnFenceListener {
  
     public void delectShoeLine(int position) {
         list.remove(position);
+        if(list.size() == 0){
+            showEmpty();
+        }
         adapter.notifyDataSetChanged();
     }
  
@@ -10,6 +10,7 @@ import com.cnlive.moudle.pedometer.net.bean.RaceRecordInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.net.bean.SelfRecordInfo;
+import com.cnlive.moudle.pedometer.net.bean.ShoeDelectInfo;
 import com.cnlive.moudle.pedometer.net.bean.TakePartPeopleInfo;
  
 import java.util.Map;
@@ -87,7 +88,7 @@ public interface ApiServiceRunLin {
      * 踩点轨迹删除
      */
     @POST("Daren/event/deleteShoeLine.action")
-    Observable<Result<BaseInfo>> deleteShoeLineInfo(@QueryMap() Map<String, String> maps);
+    Observable<Result<BaseInfo<ShoeDelectInfo>>> deleteShoeLineInfo(@QueryMap() Map<String, String> maps);
  
     /**
      * 踩点轨迹绑定
+package com.cnlive.moudle.pedometer.net.bean;
+
+/**
+ * Created by hanyayun 019/07/09.
+ */
+public class ShoeDelectInfo {
+
+    private String isBind;
+
+    public String getIsBind() {
+        return isBind;
+    }
+
+    public void setIsBind(String isBind) {
+        this.isBind = isBind;
+    }
+}