修复自动审核中可能出现的问题；测试模式下悬浮窗显示出来

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -48,6 +48,7 @@ import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
@@ -540,6 +541,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if(isNewData) {
             BaseMessage baseMessage = (BaseMessage) object;
             allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
+            AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
             mHanderl.sendEmptyMessage(1);
         }
     }

app/src/main/java/com/sheep/gamegroup/heler/TaskHelper.java

@@ -232,6 +232,7 @@ public class TaskHelper {
                                             .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                                                 @Override
                                                 public void onNext(BaseMessage baseMessage) {
+                                                    CommonUtil.getInstance().setTAskEnty(null);
                                                     DataUtil.getInstance().setTaskListChanged();//主页任务列表发生变化，回到主页后自动刷新
                                                     refreshTask();
                                                 }

app/src/main/java/com/sheep/gamegroup/model/util/AutoTaskListUtil.java

@@ -88,10 +88,11 @@ public class AutoTaskListUtil {
     }
 
     public void loadList(List<TaskAcceptedEty> list) {
+        clear();
         if(list != null) {
             for (TaskAcceptedEty item : list) {
                 if (item != null)
-                    AutoTaskListUtil.getInstance().addTask(item.getRelease_task());
+                   addTask(item.getRelease_task());
             }
         }
     }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1029,7 +1029,8 @@ public class Jump2View {
             return;
         }
         if (userEntity.getIs_new() == 2){ //1新用户 2老用户
-            newbie_task.setVisibility(View.GONE);
+            if(newbie_task != null)
+                newbie_task.setVisibility(View.GONE);
         } else {
             NewbieTaskRecord newbie_task_record = null;
             try {
@@ -1041,7 +1042,8 @@ public class Jump2View {
             if (
 //                !BuildConfig.DEBUG &&
                     !userEntity.isNewRegistUser() || dontShowNewbieTaskDialog) {
-                newbie_task.setVisibility(View.VISIBLE);
+                if(newbie_task != null)
+                    newbie_task.setVisibility(View.VISIBLE);
                 return;
             }
             final NewbieTaskRecord finalNewbie_task_record = newbie_task_record;
@@ -1051,7 +1053,8 @@ public class Jump2View {
                     .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
-                            newbie_task.setVisibility(View.VISIBLE);
+                            if(newbie_task != null)
+                                newbie_task.setVisibility(View.VISIBLE);
                             List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
                             if (newbieTaskList != null && !newbieTaskList.isEmpty() && newbieTaskList.size() > 1 && !newbieTaskList.get(1).getFinished()) {//了解小绵羊任务未完成时
                                 DialogNewbieTaskRegistSuccess.showDialog(activity, finalNewbie_task_record, newbieTaskList.get(0));
@@ -1076,7 +1079,8 @@ public class Jump2View {
 
                         @Override
                         public void onError(BaseMessage baseMessage) {
-                            newbie_task.setVisibility(View.GONE);
+                            if(newbie_task != null)
+                                newbie_task.setVisibility(View.GONE);
                         }
                     });
         }

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -824,7 +824,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-
+                                CommonUtil.getInstance().setTAskEnty(null);
                                 acceptedTask();
                             }
                         });

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -158,8 +158,8 @@ public class SheepApp extends BaseApplication {
                     notStop = true;
                     LogUtil.println("SheepApp onActivityStarted", mActivityCount);
                     UMConfigUtils.Event.SHEEP_STARTED.onEvent();
+                    Jump2View.getInstance().startFloat(activity, false);
                 }
-                Jump2View.getInstance().startFloat(activity, false);
             }
         }
 
@@ -180,8 +180,8 @@ public class SheepApp extends BaseApplication {
                     notStop = false;
                     LogUtil.println("SheepApp onActivityStopped", mActivityCount);
                     UMConfigUtils.Event.SHEEP_STOPPED.onEvent();
+                    Jump2View.getInstance().startFloat(activity, true);
                 }
-                Jump2View.getInstance().startFloat(activity, true);
             }
         }
 

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

@@ -74,11 +74,13 @@ public class FloatService extends Service {
                                     Message message = handler.obtainMessage(1);
                                     message.obj = count;
                                     handler.sendMessage(message);
+                                    LogUtil.println("FloatService", 1);
                                 }
                             } else {
                                 if(isShowFloat) {
                                     removeMessages();
                                     mHandler.sendEmptyMessage(OPERATION_HIDE);
+                                    LogUtil.println("FloatService", 2);
                                 }
                             }
 
@@ -117,25 +119,31 @@ public class FloatService extends Service {
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
+                    LogUtil.println("FloatService", 4);
                 }
             }
         }
 
         private void onHandleMessage1() {
+            LogUtil.println("FloatService", 3);
             AppUsage appUsage = new AppUsage();
             //更新悬浮窗
             long totalTimeInForeground = AppUsageManager.getInstance().getTotalTimeInForeground(appUsage);
             if(!AutoTaskListUtil.getInstance().hasTask(appUsage.getPackageName())){
                 FloatService.this.removeMessages();
                 mHandler.sendEmptyMessage(OPERATION_HIDE);
+                LogUtil.println("FloatService", 5);
                 return;
             }
+            LogUtil.println("FloatService", 6);
             if(!isAdded){
                 wm.addView(floatView, params);
                 isAdded = true;
+                LogUtil.println("FloatService", 7);
             }
             btn_floatView.setText(String.format(Locale.CHINA,"约运行%s",TimeUtil.getHours(totalTimeInForeground)));
             wm.updateViewLayout(floatView, params);
+            LogUtil.println("FloatService", 8);
         }
 
     };