CNLive Android Team / ModulePedometer · Commits

Commit 3dc5665b8364458bc8e24e376afa05ac5cf94575

Authored by YangShuai
1 parent d833e259

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

Inline Side-by-side
Showing 5 changed files with 21 additions and 22 deletions
.idea/gradle.xml
  View file @3dc5665
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
  3 + <component name="GradleMigrationSettings" migrationVersion="1" />
3 4 <component name="GradleSettings">
4 5 <option name="linkedExternalProjectsSettings">
5 6 <GradleProjectSettings>
6   - <compositeConfiguration>
7   - <compositeBuild compositeDefinitionSource="SCRIPT" />
8   - </compositeConfiguration>
  7 + <option name="testRunner" value="PLATFORM" />
9 8 <option name="distributionType" value="DEFAULT_WRAPPED" />
10 9 <option name="externalProjectPath" value="$PROJECT_DIR$" />
11 10 <option name="modules">
... ...
config.gradle
  View file @3dc5665
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.0.10",
  24 + version: "1.0.10-beta1",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
  View file @3dc5665
... ... @@ -37,7 +37,7 @@ public class Constant {
37 37 /*****************************************运营工具其他值,非标志位****************************************************/
38 38 public static final double PASS_RATE = 0.7;//通过率70%
39 39 public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
40   - public static final int LOCA_ACCURACY = 100;//定位过滤精度
  40 + public static final int LOCA_ACCURACY = 1000;//定位过滤精度
41 41 public static final int LOCA_END_POINT_ACCURACY = 20;//终点位置比较精度
42 42 public static final int LOCA_START_POINT_ACCURACY = 20;//起点位置比较精度
43 43 public static final int FENCE_OFFSET = 50;//围栏偏离距离
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
  View file @3dc5665
... ... @@ -21,20 +21,20 @@ public class DaoMaster extends AbstractDaoMaster {
21 21  
22 22 /** Creates underlying database table using DAOs. */
23 23 public static void createAllTables(Database db, boolean ifNotExists) {
  24 + CalorieEntityDao.createTable(db, ifNotExists);
24 25 CollFailedEntityDao.createTable(db, ifNotExists);
25 26 CollUserStepEntityDao.createTable(db, ifNotExists);
26 27 FailedEntityDao.createTable(db, ifNotExists);
27 28 UserStepEntityDao.createTable(db, ifNotExists);
28   - CalorieEntityDao.createTable(db, ifNotExists);
29 29 }
30 30  
31 31 /** Drops underlying database table using DAOs. */
32 32 public static void dropAllTables(Database db, boolean ifExists) {
  33 + CalorieEntityDao.dropTable(db, ifExists);
33 34 CollFailedEntityDao.dropTable(db, ifExists);
34 35 CollUserStepEntityDao.dropTable(db, ifExists);
35 36 FailedEntityDao.dropTable(db, ifExists);
36 37 UserStepEntityDao.dropTable(db, ifExists);
37   - CalorieEntityDao.dropTable(db, ifExists);
38 38 }
39 39  
40 40 /**
... ... @@ -53,11 +53,11 @@ public class DaoMaster extends AbstractDaoMaster {
53 53  
54 54 public DaoMaster(Database db) {
55 55 super(db, SCHEMA_VERSION);
  56 + registerDaoClass(CalorieEntityDao.class);
56 57 registerDaoClass(CollFailedEntityDao.class);
57 58 registerDaoClass(CollUserStepEntityDao.class);
58 59 registerDaoClass(FailedEntityDao.class);
59 60 registerDaoClass(UserStepEntityDao.class);
60   - registerDaoClass(CalorieEntityDao.class);
61 61 }
62 62  
63 63 public DaoSession newSession() {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
  View file @3dc5665
... ... @@ -8,17 +8,17 @@ import org.greenrobot.greendao.database.Database;
8 8 import org.greenrobot.greendao.identityscope.IdentityScopeType;
9 9 import org.greenrobot.greendao.internal.DaoConfig;
10 10  
  11 +import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
11 12 import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
12 13 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
13 14 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
14 15 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
15   -import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
16 16  
  17 +import com.cnlive.moudle.pedometer.sql.dao.CalorieEntityDao;
17 18 import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
18 19 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
19 20 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
20 21 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
21   -import com.cnlive.moudle.pedometer.sql.dao.CalorieEntityDao;
22 22  
23 23 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
24 24  
... ... @@ -29,22 +29,25 @@ import com.cnlive.moudle.pedometer.sql.dao.CalorieEntityDao;
29 29 */
30 30 public class DaoSession extends AbstractDaoSession {
31 31  
  32 + private final DaoConfig calorieEntityDaoConfig;
32 33 private final DaoConfig collFailedEntityDaoConfig;
33 34 private final DaoConfig collUserStepEntityDaoConfig;
34 35 private final DaoConfig failedEntityDaoConfig;
35 36 private final DaoConfig userStepEntityDaoConfig;
36   - private final DaoConfig calorieEntityDaoConfig;
37 37  
  38 + private final CalorieEntityDao calorieEntityDao;
38 39 private final CollFailedEntityDao collFailedEntityDao;
39 40 private final CollUserStepEntityDao collUserStepEntityDao;
40 41 private final FailedEntityDao failedEntityDao;
41 42 private final UserStepEntityDao userStepEntityDao;
42   - private final CalorieEntityDao calorieEntityDao;
43 43  
44 44 public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
45 45 daoConfigMap) {
46 46 super(db);
47 47  
  48 + calorieEntityDaoConfig = daoConfigMap.get(CalorieEntityDao.class).clone();
  49 + calorieEntityDaoConfig.initIdentityScope(type);
  50 +
48 51 collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
49 52 collFailedEntityDaoConfig.initIdentityScope(type);
50 53  
... ... @@ -57,28 +60,29 @@ public class DaoSession extends AbstractDaoSession {
57 60 userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
58 61 userStepEntityDaoConfig.initIdentityScope(type);
59 62  
60   - calorieEntityDaoConfig = daoConfigMap.get(CalorieEntityDao.class).clone();
61   - calorieEntityDaoConfig.initIdentityScope(type);
62   -
  63 + calorieEntityDao = new CalorieEntityDao(calorieEntityDaoConfig, this);
63 64 collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
64 65 collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
65 66 failedEntityDao = new FailedEntityDao(failedEntityDaoConfig, this);
66 67 userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
67   - calorieEntityDao = new CalorieEntityDao(calorieEntityDaoConfig, this);
68 68  
  69 + registerDao(CalorieEntity.class, calorieEntityDao);
69 70 registerDao(CollFailedEntity.class, collFailedEntityDao);
70 71 registerDao(CollUserStepEntity.class, collUserStepEntityDao);
71 72 registerDao(FailedEntity.class, failedEntityDao);
72 73 registerDao(UserStepEntity.class, userStepEntityDao);
73   - registerDao(CalorieEntity.class, calorieEntityDao);
74 74 }
75 75  
76 76 public void clear() {
  77 + calorieEntityDaoConfig.clearIdentityScope();
77 78 collFailedEntityDaoConfig.clearIdentityScope();
78 79 collUserStepEntityDaoConfig.clearIdentityScope();
79 80 failedEntityDaoConfig.clearIdentityScope();
80 81 userStepEntityDaoConfig.clearIdentityScope();
81   - calorieEntityDaoConfig.clearIdentityScope();
  82 + }
  83 +
  84 + public CalorieEntityDao getCalorieEntityDao() {
  85 + return calorieEntityDao;
82 86 }
83 87  
84 88 public CollFailedEntityDao getCollFailedEntityDao() {
... ... @@ -97,8 +101,4 @@ public class DaoSession extends AbstractDaoSession {
97 101 return userStepEntityDao;
98 102 }
99 103  
100   - public CalorieEntityDao getCalorieEntityDao() {
101   - return calorieEntityDao;
102   - }
103   -
104 104 }
... ...