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

杨帅
2 parents ae48744f 6696155a
Showing 8 changed files with 53 additions and 43 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
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/BindingShoeInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.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/ui/fragment/RunLineFragment.java
@@ -31,7 +31,7 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.tooll).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RaceListActivity.newInstance(getApplicationContext(),"10513196",null,null);
+                RaceListActivity.newInstance(MainActivity.this,"10513196",null,null);
                 //跳转界面
 //                CollRunningFinishActivity.startActivity(MainActivity.this);
             }
@@ -122,7 +122,7 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
             public void onSuccess(BaseInfo<BindingShoeInfo> baseInfo) {
                 if (getView() != null) {
                     QMUITipDialogUtil.dismessDialog();
-                    getView().bindingShoeLine(position, baseInfo);
+                    getView().bindingShoeLine(position);
                 }
             }
         }).start();
@@ -98,9 +98,7 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     }
-    public void bindingShoeLine(int position, BaseInfo<BindingShoeInfo> baseInfo) {
-        if (baseInfo.getData().getEntityName() != null) {
-        }
+    public void bindingShoeLine(int position) {
         list.get(position).setIsEnable(0);
         for (int i = 0; i < list.size(); i++) {
             if (i != position && list.get(i).getIsEnable() == 0) {
@@ -15,7 +15,6 @@ public class BindingShoeInfo {
     private String roadMap;
     private String eventId;
     private int code;
-    private String entityName;
     public String getRoadMap() {
         return roadMap;
@@ -40,12 +39,4 @@ public class BindingShoeInfo {
     public void setCode(int code) {
         this.code = code;
     }
-
-    public String getEntityName() {
-        return entityName;
-    }
-
-    public void setEntityName(String entityName) {
-        this.entityName = entityName;
-    }
 }
@@ -3,16 +3,24 @@ package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.EventLog;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.RaceNameListView;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRaceNameListBinding;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 /**
  * Created by hanyayun 019/06/25.
  */
@@ -40,7 +48,7 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-
+        if(!EventBus.getDefault().isRegistered(this))EventBus.getDefault().register(this);
         if (null != getArguments()) {
             eventId = getArguments().getString("eventId");
             runRaceDetailInfo = (RunRaceDetailInfo) getArguments().getSerializable("runRaceDetailInfo");
@@ -67,6 +75,11 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
         return R.layout.fragment_race_name_list;
     }
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if(EventBus.getDefault().isRegistered(this))EventBus.getDefault().unregister(this);
+    }
     public void addShoeLine(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, String fenceId, int position) {
         getPresenter().bindingShoeLine(getActivity(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), fenceId, eventShoeLinesBean.getEventName(), position);
@@ -75,4 +88,13 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
     public void delectShoeLine(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
         getPresenter().delectShoeLine(getActivity(), eventShoeLinesBean.getId(), position);
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void Event(MessageEvent messageEvent) {
+        if (messageEvent.getMessageType() == Constant.UPDATA_COLL_BIND_TRACE_LIST) {
+            if (getMvpView() != null) {
+                 getMvpView().bindingShoeLine((Integer) messageEvent.getMessageContent());
+            }
+        }
+    }
 }
@@ -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;
+    }
+
 }
@@ -23,11 +23,12 @@ import org.greenrobot.eventbus.ThreadMode;
 /**
  * Created by hanyayun 019/06/03.
  */
-public class RunLineFragment extends MvpBindingFragment<RunLineView, RunLinePresenter,Object,FragmentRunLineBinding> {
+public class RunLineFragment extends MvpBindingFragment<RunLineView, RunLinePresenter, Object, FragmentRunLineBinding> {
     public int currentPage = 1;
     public int pageSize = 10;
+
     public RunLineFragment() {
         // Required empty public constructor
     }
@@ -40,17 +41,17 @@ public class RunLineFragment extends MvpBindingFragment&lt;RunLineView, RunLinePres
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if(getMvpView() != null)getMvpView().initView();
+        if (getMvpView() != null) getMvpView().initView();
         EventBus.getDefault().register(this);
-        getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
+        getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()), currentPage, pageSize);
-        binding.refreshLayout.setOnRefreshListener(v ->{
+        binding.refreshLayout.setOnRefreshListener(v -> {
             currentPage = 1;
-            getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()),currentPage,pageSize);
+            getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()), currentPage, pageSize);
         });
-        binding.refreshLayout.setOnLoadMoreListener(v ->{
+        binding.refreshLayout.setOnLoadMoreListener(v -> {
             currentPage++;
-            getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
+            getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()), currentPage, pageSize);
         });
     }
@@ -65,10 +66,8 @@ public class RunLineFragment extends MvpBindingFragment&lt;RunLineView, RunLinePres
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void Event(MessageEvent messageEvent) {
         if (messageEvent.getMessageType() == Constant.REGISTRATION_SUCCESS) {
-            if (getMvpView() != null) {
-                currentPage = 1;
-                getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
-            }
+            currentPage = 1;
+            getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()), currentPage, pageSize);
         }
     }
 }