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

韩亚云
2 parents 2a748ca8 4af31590
Showing 5 changed files with 25 additions and 19 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.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
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/db/DbCore.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/db/MyOpenHelper.java
@@ -391,6 +391,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
             addFence(eventShoeLinesBean.getDarenId(), eventShoeLinesBean.getEventName(), importPoints);
         } else {
             QMUITipDialogUtil.dismessDialog();
+            QMUITipDialogUtil.failedDialog(getContext(), deleteFenceResponse.getMessage(), 1);
         }
     }
@@ -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;
-    }
-
 }
@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import com.cnlive.moudle.pedometer.sql.dao.DaoMaster;
 import com.cnlive.moudle.pedometer.sql.dao.DaoSession;
+import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.query.QueryBuilder;
 /**
@@ -61,7 +62,8 @@ public class DbCore {
             if (daoMaster == null) {
                 daoMaster = getDaoMaster();
             }
-            daoSession = daoMaster.newSession();
+            //不使用缓存
+            daoSession = daoMaster.newSession(IdentityScopeType.None);
         }
         return daoSession;
     }
@@ -45,7 +45,10 @@ package com.cnlive.moudle.pedometer.sql.db;
 import android.content.Context;
+import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.DaoMaster;
+import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.updateDB.UpgradeHelper;
@@ -75,7 +78,7 @@ public class MyOpenHelper extends DaoMaster.OpenHelper {
         try {
             //进行数据库升级
             new UpgradeHelper().migrate(db,
-                    UserStepEntityDao.class
+                    UserStepEntityDao.class, FailedEntityDao.class, CollUserStepEntityDao.class, CollFailedEntityDao.class
             );
         } catch (ClassCastException e) {
         }