CNLive Android Team / ModulePedometer · Commits

Commit 9f19a6b649f5df73aa89cf9e1b3e0ffc11cdb6de

Authored by 韩亚云
1 parent 17275b3a

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

Inline Side-by-side
Showing 7 changed files with 34 additions and 23 deletions
config.gradle
  View file @9f19a6b
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.2.8",
  24 + version: "0.2.9",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollTraceListDetailFragmentPresenter.java
  View file @9f19a6b
... ... @@ -103,7 +103,7 @@ public class CollTraceListDetailFragmentPresenter extends MvpBasePresenter<CollT
103 103 if (getView() != null) {
104 104 QMUITipDialogUtil.dismessDialog();
105 105 if (null != callBack) {
106   - callBack.onSuccess(baseInfo.getData().getFenceId(), baseInfo.getData().getEntityName());
  106 + callBack.onSuccess(baseInfo.getData().getFenceId(), baseInfo.getData().getEntityName(),baseInfo.getData().getIsDelete());
107 107 }
108 108 }
109 109 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
  View file @9f19a6b
... ... @@ -46,6 +46,7 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.CollTraceListDetailFragment
46 46 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
47 47 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
48 48 import com.cnlive.moudle.pedometer.model.Constant;
  49 +import com.cnlive.moudle.pedometer.model.MessageEvent;
49 50 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
50 51 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
51 52 import com.cnlive.moudle.pedometer.utils.GsonUtil;
... ... @@ -59,6 +60,8 @@ import com.example.moudle_pedometer.R;
59 60 import com.hannesdorfmann.mosby3.mvp.MvpView;
60 61 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
61 62  
  63 +import org.greenrobot.eventbus.EventBus;
  64 +
62 65 import java.util.ArrayList;
63 66 import java.util.List;
64 67  
... ... @@ -145,10 +148,16 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
145 148 //先校验
146 149 fragment.getPresenter().checkShoeLine(fragment.getActivity(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), new RaceNameListPresenter.CallBack() {
147 150 @Override
148   - public void onSuccess(String fenceId, String entityName) {
  151 + public void onSuccess(String fenceId, String entityName,String isDelete) {
149 152 if (null == fragment.getActivity()) {
150 153 return;
151 154 }
  155 + if(isDelete != null && isDelete.equals("1")){
  156 + EventBus.getDefault().post(new MessageEvent(Constant.DELECT_COLL_BIND_TRACE_LIST, position));
  157 + AlertUtil.showDeftToast(fragment.getActivity(),"该轨迹已被删除");
  158 + fragment.getActivity().finish();
  159 + return;
  160 + }
152 161 //判断是否为空
153 162 if (!TextUtils.isEmpty(fenceId) && !TextUtils.isEmpty(entityName)) {
154 163 List<Long> fenceIdList = new ArrayList<>();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
  View file @9f19a6b
... ... @@ -3,14 +3,12 @@ package com.cnlive.moudle.collectionTrace.ui.fragment;
3 3  
4 4 import android.os.Bundle;
5 5 import android.support.annotation.Nullable;
6   -import android.util.EventLog;
7 6 import android.view.View;
8 7  
9 8 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
10 9 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
11 10 import com.cnlive.moudle.collectionTrace.frame.view.RaceNameListView;
12 11 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
13   -import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
14 12 import com.cnlive.moudle.pedometer.model.Constant;
15 13 import com.cnlive.moudle.pedometer.model.MessageEvent;
16 14 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
... ... @@ -95,6 +93,10 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
95 93 if (getMvpView() != null) {
96 94 getMvpView().bindingShoeLine(Integer.parseInt(messageEvent.getMessageContent()+""));
97 95 }
  96 + }else if(messageEvent.getMessageType() == Constant.DELECT_COLL_BIND_TRACE_LIST){
  97 + if (getMvpView() != null) {
  98 + getMvpView().delectShoeLine(Integer.parseInt(messageEvent.getMessageContent()+""));
  99 + }
98 100 }
99 101 }
100 102 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
  View file @9f19a6b
... ... @@ -26,7 +26,7 @@ public class Constant {
26 26 public static final int START_TRACE_GATHER_FAIL = 10;//启动轨迹服务失败(用户)
27 27 public static final int REGISTRATION_SUCCESS = 11;//用户报名成功
28 28 public static final int UPDATA_COLL_BIND_TRACE_LIST = 12;//更新已绑定列表
29   -
  29 + public static final int DELECT_COLL_BIND_TRACE_LIST = 13;//删除已绑定列表
30 30 public static final double PASS_RATE = 0.7;//通过率70%
31 31 public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
32 32 public static final int LOCA_ACCURACY = 20;//定位过滤精度
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
  View file @9f19a6b
... ... @@ -21,18 +21,18 @@ 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 + CollFailedEntityDao.createTable(db, ifNotExists);
24 25 CollUserStepEntityDao.createTable(db, ifNotExists);
25 26 FailedEntityDao.createTable(db, ifNotExists);
26 27 UserStepEntityDao.createTable(db, ifNotExists);
27   - CollFailedEntityDao.createTable(db, ifNotExists);
28 28 }
29 29  
30 30 /** Drops underlying database table using DAOs. */
31 31 public static void dropAllTables(Database db, boolean ifExists) {
  32 + CollFailedEntityDao.dropTable(db, ifExists);
32 33 CollUserStepEntityDao.dropTable(db, ifExists);
33 34 FailedEntityDao.dropTable(db, ifExists);
34 35 UserStepEntityDao.dropTable(db, ifExists);
35   - CollFailedEntityDao.dropTable(db, ifExists);
36 36 }
37 37  
38 38 /**
... ... @@ -51,10 +51,10 @@ public class DaoMaster extends AbstractDaoMaster {
51 51  
52 52 public DaoMaster(Database db) {
53 53 super(db, SCHEMA_VERSION);
  54 + registerDaoClass(CollFailedEntityDao.class);
54 55 registerDaoClass(CollUserStepEntityDao.class);
55 56 registerDaoClass(FailedEntityDao.class);
56 57 registerDaoClass(UserStepEntityDao.class);
57   - registerDaoClass(CollFailedEntityDao.class);
58 58 }
59 59  
60 60 public DaoSession newSession() {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
  View file @9f19a6b
... ... @@ -8,15 +8,15 @@ 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.CollFailedEntity;
11 12 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
12 13 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
13 14 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
14   -import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
15 15  
  16 +import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
16 17 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
17 18 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
18 19 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
19   -import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
20 20  
21 21 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
22 22  
... ... @@ -27,20 +27,23 @@ import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
27 27 */
28 28 public class DaoSession extends AbstractDaoSession {
29 29  
  30 + private final DaoConfig collFailedEntityDaoConfig;
30 31 private final DaoConfig collUserStepEntityDaoConfig;
31 32 private final DaoConfig failedEntityDaoConfig;
32 33 private final DaoConfig userStepEntityDaoConfig;
33   - private final DaoConfig collFailedEntityDaoConfig;
34 34  
  35 + private final CollFailedEntityDao collFailedEntityDao;
35 36 private final CollUserStepEntityDao collUserStepEntityDao;
36 37 private final FailedEntityDao failedEntityDao;
37 38 private final UserStepEntityDao userStepEntityDao;
38   - private final CollFailedEntityDao collFailedEntityDao;
39 39  
40 40 public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
41 41 daoConfigMap) {
42 42 super(db);
43 43  
  44 + collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
  45 + collFailedEntityDaoConfig.initIdentityScope(type);
  46 +
44 47 collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
45 48 collUserStepEntityDaoConfig.initIdentityScope(type);
46 49  
... ... @@ -50,25 +53,26 @@ public class DaoSession extends AbstractDaoSession {
50 53 userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
51 54 userStepEntityDaoConfig.initIdentityScope(type);
52 55  
53   - collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
54   - collFailedEntityDaoConfig.initIdentityScope(type);
55   -
  56 + collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
56 57 collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
57 58 failedEntityDao = new FailedEntityDao(failedEntityDaoConfig, this);
58 59 userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
59   - collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
60 60  
  61 + registerDao(CollFailedEntity.class, collFailedEntityDao);
61 62 registerDao(CollUserStepEntity.class, collUserStepEntityDao);
62 63 registerDao(FailedEntity.class, failedEntityDao);
63 64 registerDao(UserStepEntity.class, userStepEntityDao);
64   - registerDao(CollFailedEntity.class, collFailedEntityDao);
65 65 }
66 66  
67 67 public void clear() {
  68 + collFailedEntityDaoConfig.clearIdentityScope();
68 69 collUserStepEntityDaoConfig.clearIdentityScope();
69 70 failedEntityDaoConfig.clearIdentityScope();
70 71 userStepEntityDaoConfig.clearIdentityScope();
71   - collFailedEntityDaoConfig.clearIdentityScope();
  72 + }
  73 +
  74 + public CollFailedEntityDao getCollFailedEntityDao() {
  75 + return collFailedEntityDao;
72 76 }
73 77  
74 78 public CollUserStepEntityDao getCollUserStepEntityDao() {
... ... @@ -83,8 +87,4 @@ public class DaoSession extends AbstractDaoSession {
83 87 return userStepEntityDao;
84 88 }
85 89  
86   - public CollFailedEntityDao getCollFailedEntityDao() {
87   - return collFailedEntityDao;
88   - }
89   -
90 90 }
... ...