辅助功能基本完成

app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -25,6 +25,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LocationUtils;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -124,7 +125,8 @@ public class FloatService extends Service implements View.OnClickListener {
 
                     AppRecord lastAppRecord = SheepApp.getInstance().getLastAppRecord();
                     if(lastAppRecord != null && TextUtils.equals(taskEty.getPackage_names(), lastAppRecord.getPackageName())){
-                        runTime +=  SheepApp.getInstance().getLastTime() - System.currentTimeMillis();
+                        runTime +=  System.currentTimeMillis() - SheepApp.getInstance().getLastTime();
+                        SheepApp.getInstance().setLastTime(System.currentTimeMillis());
                     }
 
                     MyDbManager.getInstance().removeAppRecord();
@@ -139,7 +141,7 @@ public class FloatService extends Service implements View.OnClickListener {
                                 public void onNext(BaseMessage baseMessage) {
                                     if(BuildConfig.DEBUG)
                                         System.out.println("MonitorAppService baseMessage onNext "+ JSON.toJSONString(baseMessage));
-                                    SheepApp.getInstance().setTaskEty(null);
+                                    CommonUtil.getInstance().setTAskEnty(null);
                                 }
 
                                 @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/service/MonitorAppService.java

@@ -9,6 +9,7 @@ import android.view.accessibility.AccessibilityEvent;
 
 import com.sheep.gamegroup.model.entity.AppRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -24,7 +25,7 @@ import java.util.List;
 public class MonitorAppService extends AccessibilityService {
     @Override
     public void onAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
-        TaskEty taskEty = SheepApp.getInstance().getTaskEty();
+        TaskListen taskEty = SheepApp.getInstance().getTaskEty();
         if(taskEty == null) {//当前没有时长任务时不操作数据库
             return;
         }