1 修改编译版本测试，无法上传图片问题

YangShuai
1 parent d833e259
Showing 5 changed files with 21 additions and 22 deletions
.idea/gradle.xml
config.gradle
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
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.10",
+            version: "1.0.10-beta1",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -37,7 +37,7 @@ public class Constant {
     /*****************************************运营工具其他值,非标志位****************************************************/
     public static final double PASS_RATE = 0.7;//通过率70%
     public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
-    public static final int LOCA_ACCURACY = 100;//定位过滤精度
+    public static final int LOCA_ACCURACY = 1000;//定位过滤精度
     public static final int LOCA_END_POINT_ACCURACY = 20;//终点位置比较精度
     public static final int LOCA_START_POINT_ACCURACY = 20;//起点位置比较精度
     public static final int FENCE_OFFSET = 50;//围栏偏离距离
@@ -21,20 +21,20 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
+        CalorieEntityDao.createTable(db, ifNotExists);
         CollFailedEntityDao.createTable(db, ifNotExists);
         CollUserStepEntityDao.createTable(db, ifNotExists);
         FailedEntityDao.createTable(db, ifNotExists);
         UserStepEntityDao.createTable(db, ifNotExists);
-        CalorieEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
+        CalorieEntityDao.dropTable(db, ifExists);
         CollFailedEntityDao.dropTable(db, ifExists);
         CollUserStepEntityDao.dropTable(db, ifExists);
         FailedEntityDao.dropTable(db, ifExists);
         UserStepEntityDao.dropTable(db, ifExists);
-        CalorieEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -53,11 +53,11 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
+        registerDaoClass(CalorieEntityDao.class);
         registerDaoClass(CollFailedEntityDao.class);
         registerDaoClass(CollUserStepEntityDao.class);
         registerDaoClass(FailedEntityDao.class);
         registerDaoClass(UserStepEntityDao.class);
-        registerDaoClass(CalorieEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,17 +8,17 @@ 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.CalorieEntity;
 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.CalorieEntity;
+import com.cnlive.moudle.pedometer.sql.dao.CalorieEntityDao;
 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.CalorieEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -29,22 +29,25 @@ import com.cnlive.moudle.pedometer.sql.dao.CalorieEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
+    private final DaoConfig calorieEntityDaoConfig;
     private final DaoConfig collFailedEntityDaoConfig;
     private final DaoConfig collUserStepEntityDaoConfig;
     private final DaoConfig failedEntityDaoConfig;
     private final DaoConfig userStepEntityDaoConfig;
-    private final DaoConfig calorieEntityDaoConfig;
+    private final CalorieEntityDao calorieEntityDao;
     private final CollFailedEntityDao collFailedEntityDao;
     private final CollUserStepEntityDao collUserStepEntityDao;
     private final FailedEntityDao failedEntityDao;
     private final UserStepEntityDao userStepEntityDao;
-    private final CalorieEntityDao calorieEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
+        calorieEntityDaoConfig = daoConfigMap.get(CalorieEntityDao.class).clone();
+        calorieEntityDaoConfig.initIdentityScope(type);
+
         collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
         collFailedEntityDaoConfig.initIdentityScope(type);
@@ -57,28 +60,29 @@ public class DaoSession extends AbstractDaoSession {
         userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
         userStepEntityDaoConfig.initIdentityScope(type);
-        calorieEntityDaoConfig = daoConfigMap.get(CalorieEntityDao.class).clone();
-        calorieEntityDaoConfig.initIdentityScope(type);
-
+        calorieEntityDao = new CalorieEntityDao(calorieEntityDaoConfig, this);
         collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
         failedEntityDao = new FailedEntityDao(failedEntityDaoConfig, this);
         userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
-        calorieEntityDao = new CalorieEntityDao(calorieEntityDaoConfig, this);
+        registerDao(CalorieEntity.class, calorieEntityDao);
         registerDao(CollFailedEntity.class, collFailedEntityDao);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
         registerDao(FailedEntity.class, failedEntityDao);
         registerDao(UserStepEntity.class, userStepEntityDao);
-        registerDao(CalorieEntity.class, calorieEntityDao);
     }
     public void clear() {
+        calorieEntityDaoConfig.clearIdentityScope();
         collFailedEntityDaoConfig.clearIdentityScope();
         collUserStepEntityDaoConfig.clearIdentityScope();
         failedEntityDaoConfig.clearIdentityScope();
         userStepEntityDaoConfig.clearIdentityScope();
-        calorieEntityDaoConfig.clearIdentityScope();
+    }
+
+    public CalorieEntityDao getCalorieEntityDao() {
+        return calorieEntityDao;
     }
     public CollFailedEntityDao getCollFailedEntityDao() {
@@ -97,8 +101,4 @@ public class DaoSession extends AbstractDaoSession {
         return userStepEntityDao;
     }
-    public CalorieEntityDao getCalorieEntityDao() {
-        return calorieEntityDao;
-    }
-
 }