Merge branch 'master' of http://192.168.50.108:37829/pcacc/yys_auto

app_dongri.py

@@ -335,14 +335,15 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         
         if g_switch == False:
             task_queue.appendleft(task_checkActivities())
+        else:
+            task_queue.appendleft(task_checkBenifitStatus())
+        
         # first run
-        if g_times % 3 == 1:
-            task_queue.appendleft(check_safe_collect())
+        #if g_times % 3 == 1:
+        #    task_queue.appendleft(check_safe_collect())
             
         if isSimple == False:
             task_queue.appendleft(task_information())
-        else:
-            task_queue.appendleft(task_checkBenifitStatus())