1 修复bug

YangShuai
1 parent d0f5c5da
Showing 6 changed files with 56 additions and 38 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/calorie/service/CalorieService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/calorie/utils/CalorieUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/GsonUtil.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.8.9",
+            version: "0.9.0",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -54,6 +54,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 /**
@@ -129,7 +130,7 @@ public class CalorieService extends Service implements SensorEventListener {
     public void onCreate() {
         super.onCreate();
         init();
-//        initBroadcastReceiver();
+        initBroadcastReceiver();
 //        if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.pedometer.service.CollKeepLiveService")) {
 //            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 //                startForegroundService(new Intent(getApplicationContext(), CollKeepLiveService.class));
@@ -137,7 +138,6 @@ public class CalorieService extends Service implements SensorEventListener {
 //                startService(new Intent(getApplicationContext(), CollKeepLiveService.class));
 //            }
 //        }
-        showStartForegroundNotification();
     }
     private static int retryIndex = 0;
@@ -181,7 +181,7 @@ public class CalorieService extends Service implements SensorEventListener {
     private void showStartForegroundNotification() {
         if (null == remoteViews) {
             remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
-            remoteViews.setImageViewResource(R.id.iv_icon,R.drawable.ic_icon);
+            remoteViews.setImageViewResource(R.id.iv_icon, R.drawable.ic_icon);
         }
         NotificationChannel channel = null;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -312,13 +312,21 @@ public class CalorieService extends Service implements SensorEventListener {
      */
     private void initTodayData(String userId) {
         CURRENT_DATE = getTodayDate();
+        Log.e(TAG, "initTodayData: " + getTodayDate());
         if (userId == null || CURRENT_DATE == null) {
             return;
         }
         //获取当天的数据，用于展示 CURRENT_DATE
-        CalorieEntity calorieEntity = CalorieUtil.getUserCalorieData(getApplicationContext(), userId, getTodayDate());
+        CalorieEntity calorieEntity = CalorieUtil.getUserCalorieData(getApplicationContext(), userId, CURRENT_DATE);
+        Log.e(TAG, "calorieEntity: " + calorieEntity);
         if (null == calorieEntity) {
             CURRENT_STEP = 0;
+            calorieEntity=new CalorieEntity();
+            calorieEntity.setUuid(CalorieUtil.getUUID());
+            calorieEntity.setCurrentDate(CURRENT_DATE);
+            calorieEntity.setUserId(userId);
+            calorieEntity.setStep(CURRENT_STEP+"");
+            CalorieUtil.insertData(getApplicationContext(),calorieEntity);
         } else {
             if (calorieEntity.getStep() != null && !TextUtils.isEmpty(calorieEntity.getStep())) {
                 CURRENT_STEP = Integer.parseInt(calorieEntity.getStep());
@@ -442,14 +450,19 @@ public class CalorieService extends Service implements SensorEventListener {
                     save();
                 } else if (Intent.ACTION_DATE_CHANGED.equals(action)) {//日期变化步数重置为0
 //                    Logger.d("重置步数" + StepDcretor.CURRENT_STEP);
+                    Log.e(TAG, "onReceive:ACTION_DATE_CHANGED ");
                     save();
                     isNewDay();
                 } else if (Intent.ACTION_TIME_CHANGED.equals(action)) {
+                    Log.e(TAG, "onReceive:ACTION_TIME_CHANGED ");
+
                     //时间变化步数重置为0
 //                    isCall();
                     save();
                     isNewDay();
                 } else if (Intent.ACTION_TIME_TICK.equals(action)) {//日期变化步数重置为0
+                    Log.e(TAG, "onReceive:ACTION_TIME_TICK ");
+
 //                    isCall();
 //                    Logger.d("重置步数" + StepDcretor.CURRENT_STEP);
                     save();
@@ -478,12 +491,8 @@ public class CalorieService extends Service implements SensorEventListener {
      */
     private void isNewDay() {
         String time = "00:00";
-        CalorieEntity calorieEntity = new CalorieEntity();
-        calorieEntity.setUuid(CalorieUtil.getUUID());
-        calorieEntity.setUserId(userId);
-        calorieEntity.setCurrentDate(getTodayDate());
-        CalorieUtil.insertData(getApplicationContext(), calorieEntity);
         if (time.equals(new SimpleDateFormat("HH:mm").format(new Date())) || !CURRENT_DATE.equals(getTodayDate())) {
+            Log.e(TAG, "isNewDay: ");
             initTodayData(userId);
         }
     }
@@ -678,15 +687,8 @@ public class CalorieService extends Service implements SensorEventListener {
      */
     private void save() {
         int tempStep = CURRENT_STEP;
-        CalorieEntity calorieEntity = CalorieUtil.getUserCalorieData(getApplicationContext(), userId, getTodayDate());
-        if (null == calorieEntity) {
-            calorieEntity = new CalorieEntity();
-            calorieEntity.setUserId(userId);
-            calorieEntity.setUuid(CalorieUtil.getUUID());
-            calorieEntity.setStep(tempStep + "");
-            calorieEntity.setCurrentDate(getTodayDate());
-            CalorieUtil.insertData(getApplicationContext(), calorieEntity);
-        } else {
+        CalorieEntity calorieEntity = CalorieUtil.getUserCalorieData(getApplicationContext(), userId, CURRENT_DATE);
+        if (null != calorieEntity) {
             calorieEntity.setStep(tempStep + "");
             CalorieUtil.updateData(getApplicationContext(), calorieEntity);
         }
@@ -28,6 +28,17 @@ public class CalorieUtil {
         return UUID.randomUUID().toString().replace("-", "");
     }
+    public synchronized static void deleteDate(Context context, CalorieEntity calorieEntity) {
+        try {
+            if (null != calorieEntity) {
+                DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCalorieEntityDao().deleteByKey(calorieEntity.getUuid());
+                DbCore.getDaoSession().getCalorieEntityDao().detachAll();
+            }
+        } catch (Exception e) {
+        }
+    }
+
     public synchronized static void updateData(Context context, CalorieEntity calorieEntity) {
         try {
             if (null != calorieEntity) {
@@ -82,6 +93,7 @@ public class CalorieUtil {
         try {
             if (!TextUtils.isEmpty(uid)) {
                 DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCalorieEntityDao().detachAll();
                 List<CalorieEntity> list = DbCore.getDaoSession().getCalorieEntityDao().queryBuilder().where(CalorieEntityDao.Properties.UserId.eq(uid), CalorieEntityDao.Properties.CurrentDate.eq(currentDate)).list();
                 if (list != null && list.size() > 0) {
                     return list.get(0);
@@ -72,7 +72,9 @@ public class MyRecordView implements MvpView {
         }
         if (fragment.currentPage > 1) {
             list.addAll(myRecordInfoBaseInfo.getData().getList());
-            adapter.notifyDataSetChanged();
+            if (null != adapter) {
+                adapter.notifyDataSetChanged();
+            }
         }
         fragment.binding.refreshLayout.finishRefresh();
         fragment.binding.refreshLayout.finishLoadMore();
@@ -33,54 +33,56 @@ public class RunLineView implements MvpView {
         this.fragment = fragment;
     }
-    public void initView(){
+    public void initView() {
         fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
         fragment.binding.backBtn.setOnClickListener(v -> fragment.getActivity().finish());
-        fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(),null,null,null,null));
+        fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(), null, null, null, null));
         fragment.binding.runLineRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
     }
-    public void onSuccess(BaseInfo<RunLineInfo> runLineInfoBaseInfo){
-        if(fragment.currentPage == 1){
+    public void onSuccess(BaseInfo<RunLineInfo> runLineInfoBaseInfo) {
+        if (fragment.currentPage == 1) {
             list.clear();
             list.addAll(runLineInfoBaseInfo.getData().getList());
-            if(adapter == null){
-                adapter = new RunLineAdapter(list,fragment.getActivity());
+            if (adapter == null) {
+                adapter = new RunLineAdapter(list, fragment.getActivity());
                 fragment.binding.runLineRecy.setAdapter(adapter);
                 adapter.setClickListener(new RunLineAdapter.OnClickListener() {
                     @Override
                     public void onClickListener(RunLineInfo.ListBean bean, int position) {
-                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null,null);
+                        RunRaceDetailActivity.startActivity(fragment.getActivity(), bean.getId() + "", null, null, null, null);
                     }
                 });
-            }else {
+            } else {
                 adapter.notifyDataSetChanged();
             }
         }
-        if(list.size() != 0){
+        if (list.size() != 0) {
             fragment.binding.empty.setVisibility(View.GONE);
             fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             showEmpty();
         }
-        if(runLineInfoBaseInfo.getData().getList().size() < fragment.pageSize){
+        if (runLineInfoBaseInfo.getData().getList().size() < fragment.pageSize) {
             fragment.binding.refreshLayout.setEnableLoadMore(false);
-        }else {
+        } else {
             fragment.binding.refreshLayout.setEnableLoadMore(true);
         }
-        if(fragment.currentPage > 1){
+        if (fragment.currentPage > 1) {
             list.addAll(runLineInfoBaseInfo.getData().getList());
-            adapter.notifyDataSetChanged();
+            if (null != adapter) {
+                adapter.notifyDataSetChanged();
+            }
         }
         fragment.binding.refreshLayout.finishRefresh();
         fragment.binding.refreshLayout.finishLoadMore();
     }
-    public void showErr(String msg){
+    public void showErr(String msg) {
         fragment.binding.refreshLayout.finishRefresh();
         fragment.binding.refreshLayout.finishLoadMore();
         if (list.size() == 0) {
@@ -92,7 +94,7 @@ public class RunLineView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()),fragment.currentPage,fragment.pageSize);
+                    fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.currentPage, fragment.pageSize);
                 }
             });
             fragment.binding.empty.setLoadingShowing(false);
@@ -109,7 +111,7 @@ public class RunLineView implements MvpView {
         AlertUtil.showDeftToast(fragment.getActivity(), message);
     }
-    public void showEmpty(){
+    public void showEmpty() {
         fragment.binding.empty.setVisibility(View.VISIBLE);
         fragment.binding.refreshLayout.setVisibility(View.GONE);
         fragment.binding.empty.show("没有相关数据", "", R.drawable.zhuangtai_kong);
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 /**
- * Created by sijia
+ * Created by ShinnyYang
  * on 2016/12/19.
  */
 public class GsonUtil {