1.修复倒计时显示异常

杨帅
1 parent c754427c
Showing 7 changed files with 45 additions and 34 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.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/activity/RunLineActivity.java
@@ -232,29 +232,26 @@ public class CommonInfo {
      */
     public static String getUserIcon(Context context) {
         return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickIcon", "");
-    public static String getUserNickName(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
     }
     /**
-     * 设置用户头像
+     * 是否第一次显示倒计时动画
      *
      * @param context
+     * @param isAllow
      */
-    public static void setUserFaceUrl(Context context, String faceUrl) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserFaceUrl", faceUrl);
-
+    public static void setIsFirstShowTimeTip(Context context, boolean isAllow) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("IsFirstShowTimeTip", isAllow);
     }
     /**
-     * 获取用户头像
+     * 是否第一次显示倒计时动画
      *
      * @param context
      */
-    public static String getUserFaceUrl(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserFaceUrl", "");
-
+    public static boolean getIsFirstShowTimeTip(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("IsFirstShowTimeTip", true);
     }
@@ -269,9 +266,18 @@ public class CommonInfo {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("streetId");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FirstStepSendTraceTip");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FenceId");
-
-
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
     }
-
+    /*重置赛事
+     * @param context
+     */
+    public static void resetRace(Context context) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("writeUserStep");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStepService");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("KeepAliveService");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("RunBaiduTraceService");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FirstStepSendTraceTip");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
+    }
 }
@@ -117,7 +117,6 @@ public class RunMainFragmentView implements MvpView {
      */
     public void initView() {
         uid = CommonInfo.getUserId(getContext());
-        UserStepEntity userStepEntity = StepUtil.getUserStepData(getContext(), uid);
         initLocationClient();
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
         ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, false);
@@ -177,12 +176,14 @@ public class RunMainFragmentView implements MvpView {
             }
         });
-
+        boolean isFirstShowTime = CommonInfo.getIsFirstShowTimeTip(getContext());
         //当前用户已经在运动
-        if (userStepEntity == null) {
+        if (isFirstShowTime) {
             //依次倒计时
             handler.postDelayed(runnable, 1000);
+            CommonInfo.setIsFirstShowTimeTip(getContext(), false);
         } else {
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(getContext(), uid);
             //隐藏计时界面
             fragment.binding.llStartTimeTip.setVisibility(View.GONE);
             fragment.binding.llRunMainRoot.setVisibility(View.VISIBLE);
@@ -403,6 +403,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                                 StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
                                 //停止服务
                                 stopStepService();
+                                //清除数据
+                                CommonInfo.resetRace(getContext());
                                 //更改当前按钮
                                 fragment.binding.tvRunNow.setText("立即开始");
                                 fragment.binding.rlScrollViewStartBtn.setTag("1");
@@ -27,7 +27,7 @@ public class RunningFinishFragmentView implements MvpView {
     public void initView(RunningFinishBean runningFinishBean) {
         //设置用户头像
-        String faceUrl = CommonInfo.getUserFaceUrl(getContext());
+        String faceUrl = CommonInfo.getUserIcon(getContext());
         if (!TextUtils.isEmpty(faceUrl)) {
             Glide.with(getContext()).load(faceUrl).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
         }
@@ -21,14 +21,14 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        UserStepEntityDao.createTable(db, ifNotExists);
         CollUserStepEntityDao.createTable(db, ifNotExists);
+        UserStepEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        UserStepEntityDao.dropTable(db, ifExists);
         CollUserStepEntityDao.dropTable(db, ifExists);
+        UserStepEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -47,8 +47,8 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(UserStepEntityDao.class);
         registerDaoClass(CollUserStepEntityDao.class);
+        registerDaoClass(UserStepEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,11 +8,11 @@ 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.UserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -23,40 +23,40 @@ import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
-    private final DaoConfig userStepEntityDaoConfig;
     private final DaoConfig collUserStepEntityDaoConfig;
+    private final DaoConfig userStepEntityDaoConfig;
-    private final UserStepEntityDao userStepEntityDao;
     private final CollUserStepEntityDao collUserStepEntityDao;
+    private final UserStepEntityDao userStepEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
-        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
-        userStepEntityDaoConfig.initIdentityScope(type);
-
         collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
         collUserStepEntityDaoConfig.initIdentityScope(type);
-        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
+        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
+        userStepEntityDaoConfig.initIdentityScope(type);
+
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
+        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
-        registerDao(UserStepEntity.class, userStepEntityDao);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
+        registerDao(UserStepEntity.class, userStepEntityDao);
     }
     public void clear() {
-        userStepEntityDaoConfig.clearIdentityScope();
         collUserStepEntityDaoConfig.clearIdentityScope();
-    }
-
-    public UserStepEntityDao getUserStepEntityDao() {
-        return userStepEntityDao;
+        userStepEntityDaoConfig.clearIdentityScope();
     }
     public CollUserStepEntityDao getCollUserStepEntityDao() {
         return collUserStepEntityDao;
     }
+    public UserStepEntityDao getUserStepEntityDao() {
+        return userStepEntityDao;
+    }
+
 }
 package com.cnlive.moudle.pedometer.ui.activity;
+import android.app.Activity;
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;