轨迹检查接口相关页面通知

韩亚云
1 parent 17275b3a
Showing 7 changed files with 34 additions and 23 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollTraceListDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.8",
+            version: "0.2.9",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -103,7 +103,7 @@ public class CollTraceListDetailFragmentPresenter extends MvpBasePresenter&lt;CollT
                 if (getView() != null) {
                     QMUITipDialogUtil.dismessDialog();
                     if (null != callBack) {
-                        callBack.onSuccess(baseInfo.getData().getFenceId(), baseInfo.getData().getEntityName());
+                        callBack.onSuccess(baseInfo.getData().getFenceId(), baseInfo.getData().getEntityName(),baseInfo.getData().getIsDelete());
                     }
                 }
             }
@@ -46,6 +46,7 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.CollTraceListDetailFragment
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
@@ -59,6 +60,8 @@ import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
@@ -145,10 +148,16 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                             //先校验
                             fragment.getPresenter().checkShoeLine(fragment.getActivity(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), new RaceNameListPresenter.CallBack() {
                                 @Override
-                                public void onSuccess(String fenceId, String entityName) {
+                                public void onSuccess(String fenceId, String entityName,String isDelete) {
                                     if (null == fragment.getActivity()) {
                                         return;
                                     }
+                                    if(isDelete != null && isDelete.equals("1")){
+                                        EventBus.getDefault().post(new MessageEvent(Constant.DELECT_COLL_BIND_TRACE_LIST, position));
+                                        AlertUtil.showDeftToast(fragment.getActivity(),"该轨迹已被删除");
+                                        fragment.getActivity().finish();
+                                        return;
+                                    }
                                     //判断是否为空
                                     if (!TextUtils.isEmpty(fenceId) && !TextUtils.isEmpty(entityName)) {
                                         List<Long> fenceIdList = new ArrayList<>();
@@ -3,14 +3,12 @@ package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.EventLog;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.RaceNameListView;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
@@ -95,6 +93,10 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
             if (getMvpView() != null) {
                  getMvpView().bindingShoeLine(Integer.parseInt(messageEvent.getMessageContent()+""));
             }
+        }else if(messageEvent.getMessageType() == Constant.DELECT_COLL_BIND_TRACE_LIST){
+            if (getMvpView() != null) {
+                getMvpView().delectShoeLine(Integer.parseInt(messageEvent.getMessageContent()+""));
+            }
         }
     }
 }
@@ -26,7 +26,7 @@ public class Constant {
     public static final int START_TRACE_GATHER_FAIL = 10;//启动轨迹服务失败(用户)
     public static final int REGISTRATION_SUCCESS = 11;//用户报名成功
     public static final int UPDATA_COLL_BIND_TRACE_LIST = 12;//更新已绑定列表
-
+    public static final int DELECT_COLL_BIND_TRACE_LIST = 13;//删除已绑定列表
     public static final double PASS_RATE = 0.7;//通过率70%
     public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
     public static final int LOCA_ACCURACY = 20;//定位过滤精度
@@ -21,18 +21,18 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
+        CollFailedEntityDao.createTable(db, ifNotExists);
         CollUserStepEntityDao.createTable(db, ifNotExists);
         FailedEntityDao.createTable(db, ifNotExists);
         UserStepEntityDao.createTable(db, ifNotExists);
-        CollFailedEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
+        CollFailedEntityDao.dropTable(db, ifExists);
         CollUserStepEntityDao.dropTable(db, ifExists);
         FailedEntityDao.dropTable(db, ifExists);
         UserStepEntityDao.dropTable(db, ifExists);
-        CollFailedEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -51,10 +51,10 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
+        registerDaoClass(CollFailedEntityDao.class);
         registerDaoClass(CollUserStepEntityDao.class);
         registerDaoClass(FailedEntityDao.class);
         registerDaoClass(UserStepEntityDao.class);
-        registerDaoClass(CollFailedEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,15 +8,15 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
+import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
+import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
-import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -27,20 +27,23 @@ import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
+    private final DaoConfig collFailedEntityDaoConfig;
     private final DaoConfig collUserStepEntityDaoConfig;
     private final DaoConfig failedEntityDaoConfig;
     private final DaoConfig userStepEntityDaoConfig;
-    private final DaoConfig collFailedEntityDaoConfig;
+    private final CollFailedEntityDao collFailedEntityDao;
     private final CollUserStepEntityDao collUserStepEntityDao;
     private final FailedEntityDao failedEntityDao;
     private final UserStepEntityDao userStepEntityDao;
-    private final CollFailedEntityDao collFailedEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
+        collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
+        collFailedEntityDaoConfig.initIdentityScope(type);
+
         collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
         collUserStepEntityDaoConfig.initIdentityScope(type);
@@ -50,25 +53,26 @@ public class DaoSession extends AbstractDaoSession {
         userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
         userStepEntityDaoConfig.initIdentityScope(type);
-        collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
-        collFailedEntityDaoConfig.initIdentityScope(type);
-
+        collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
         failedEntityDao = new FailedEntityDao(failedEntityDaoConfig, this);
         userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
-        collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
+        registerDao(CollFailedEntity.class, collFailedEntityDao);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
         registerDao(FailedEntity.class, failedEntityDao);
         registerDao(UserStepEntity.class, userStepEntityDao);
-        registerDao(CollFailedEntity.class, collFailedEntityDao);
     }
     public void clear() {
+        collFailedEntityDaoConfig.clearIdentityScope();
         collUserStepEntityDaoConfig.clearIdentityScope();
         failedEntityDaoConfig.clearIdentityScope();
         userStepEntityDaoConfig.clearIdentityScope();
-        collFailedEntityDaoConfig.clearIdentityScope();
+    }
+
+    public CollFailedEntityDao getCollFailedEntityDao() {
+        return collFailedEntityDao;
     }
     public CollUserStepEntityDao getCollUserStepEntityDao() {
@@ -83,8 +87,4 @@ public class DaoSession extends AbstractDaoSession {
         return userStepEntityDao;
     }
-    public CollFailedEntityDao getCollFailedEntityDao() {
-        return collFailedEntityDao;
-    }
-
 }