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

杨帅
2 parents 4009eb8a c48e5ab4
Showing 5 changed files with 34 additions and 20 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/collectionTrace/model/CheckShoeLineBean.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
@@ -177,7 +177,7 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
                 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());
                     }
                 }
             }
@@ -185,7 +185,7 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
     }
     public interface CallBack {
-        void onSuccess(String fenceId, String entityName);
+        void onSuccess(String fenceId, String entityName,String isDelete);
         void onFailed();
     }
@@ -169,10 +169,15 @@ public class RaceNameListView 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")){
+                                            delectShoeLine(position);
+                                            AlertUtil.showDeftToast(fragment.getActivity(),"该轨迹已被删除");
+                                            return;
+                                        }
                                         //判断是否为空
                                         if (!TextUtils.isEmpty(fenceId) && !TextUtils.isEmpty(entityName)) {
                                             List<Long> fenceIdList = new ArrayList<>();
@@ -14,6 +14,7 @@ public class CheckShoeLineBean {
     private String fenceId;
     private String entityName;
+    private String isDelete;
     public String getFenceId() {
         return fenceId;
@@ -30,4 +31,12 @@ public class CheckShoeLineBean {
     public void setEntityName(String entityName) {
         this.entityName = entityName;
     }
+
+    public String getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(String isDelete) {
+        this.isDelete = isDelete;
+    }
 }
@@ -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,23 +27,20 @@ import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
  */
 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);
@@ -53,26 +50,25 @@ public class DaoSession extends AbstractDaoSession {
         userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
         userStepEntityDaoConfig.initIdentityScope(type);
-        collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
+        collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
+        collFailedEntityDaoConfig.initIdentityScope(type);
+
         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();
-    }
-
-    public CollFailedEntityDao getCollFailedEntityDao() {
-        return collFailedEntityDao;
+        collFailedEntityDaoConfig.clearIdentityScope();
     }
     public CollUserStepEntityDao getCollUserStepEntityDao() {
@@ -87,4 +83,8 @@ public class DaoSession extends AbstractDaoSession {
         return userStepEntityDao;
     }
+    public CollFailedEntityDao getCollFailedEntityDao() {
+        return collFailedEntityDao;
+    }
+
 }