From ab93145a8b35ba1a1986f34ef7de053a323cbad4 Mon Sep 17 00:00:00 2001
From: bilabila <bilabila@qq.com>
Date: Thu, 23 Jun 2022 20:55:35 +0800
Subject: [PATCH] fix cloud rogue task

---
 cloud.lua     |  24 +++--
 docs/guide.md |  10 +-
 main.lua      |   2 +-
 path.lua      |   6 +-
 point.lua     |   4 +-
 release       |   2 +-
 util.lua      | 289 ++++++++++++++++++++++++--------------------------
 7 files changed, 166 insertions(+), 171 deletions(-)

diff --git a/cloud.lua b/cloud.lua
index 85bf0f8..f026958 100644
--- a/cloud.lua
+++ b/cloud.lua
@@ -29,6 +29,7 @@ m.enabled =
 m.getTaskEnabled = function() return cloud_get_task and m.enabled() end
 
 m.heartBeat = function()
+  -- log("32",32)
   local data = {status = m.status, deviceToken = m.deviceToken}
   local res, code = httpPost(m.server .. "/heartBeat", JsonEncode(data), 30,
                              "Content-Type: application/json")
@@ -37,6 +38,7 @@ m.heartBeat = function()
 end
 
 m.getTask = function()
+  -- log("40",40)
   local res, code = httpGet(m.server .. "/getTask?" .. "deviceToken=" ..
                               m.deviceToken, 30,
                             'Content-Type: application/json')
@@ -44,6 +46,7 @@ m.getTask = function()
 end
 
 m.addLog = function(img, info)
+  -- log("48",48)
   if not m.enabled() then return end
   local x = cloud_task or {}
   local data = {
@@ -69,6 +72,7 @@ m.addLog = function(img, info)
 end
 
 m.failTask = function(imageUrl, lineBusy)
+  -- log("73",73)
   if not m.getTaskEnabled() then return end
   imageUrl = imageUrl or ''
   local res, code = httpPost(m.server .. "/failTask?deviceToken=" ..
@@ -80,6 +84,7 @@ m.failTask = function(imageUrl, lineBusy)
 end
 
 m.completeTask = function(imageUrl)
+  -- log("84",84)
   if not m.getTaskEnabled() then return end
   imageUrl = imageUrl or ''
   local res, code = httpPost(m.server .. "/completeTask?deviceToken=" ..
@@ -99,7 +104,7 @@ m.fetchSolveTask = function()
     -- log("res", res)
     local status, data
     status, data = pcall(JsonDecode, res)
-    -- log("data",data)
+    log("data",data)
     if type(data) == 'table' and type(data.data) == 'table' then
       m.solveTask(data.data)
     end
@@ -129,6 +134,7 @@ restartSimpleMode = function(data)
   local password = data.password
   local server = data.server
   local config = data.config
+  local taskType = data.taskType
   -- local x
   -- set recommend config over default
   -- x = loadOneUIConfig("main")
@@ -216,10 +222,10 @@ server=]] .. server
   -- log("65",64)
 
   x = get(config, 'daily', 'sanity', 'drug')
-  if x then hook = hook .. [[;max_drug_times=]] .. str(x) end
+  if x then hook = hook .. [[;max_drug_times=]] .. str2int(x) end
 
   x = get(config, 'daily', 'sanity', 'stone')
-  if x then hook = hook .. [[;max_stone_times=]] .. str(x) end
+  if x then hook = hook .. [[;max_stone_times=]] .. str2int(x) end
 
   hook = hook .. [[;now_job_ui1=]] .. str(get(config, 'daily', 'mail'))
   hook = hook .. [[;now_job_ui3=]] .. str(get(config, 'daily', 'friend'))
@@ -255,13 +261,13 @@ server=]] .. server
 
   -- 肉鸽
   hook = hook .. [[;zl_best_operator=]] ..
-           str(get(config, 'rogue', 'operator', 'index'))
+           str2int(get(config, 'rogue', 'operator', 'index'))
   hook = hook .. [[;zl_skill_times=]] ..
-           str(get(config, 'rogue', 'operator', 'num'))
+           str2int(get(config, 'rogue', 'operator', 'num'))
   hook = hook .. [[;zl_skill_idx=]] ..
-           str(get(config, 'rogue', 'operator', 'skill'))
-  hook = hook .. [[;zl_max_coin=]] .. str(get(config, 'rogue', 'coin'))
-  hook = hook .. [[;zl_max_level=]] .. str(get(config, 'rogue', 'level'))
+           str2int(get(config, 'rogue', 'operator', 'skill'))
+  hook = hook .. [[;zl_max_coin=]] .. str2int(get(config, 'rogue', 'coin'))
+  hook = hook .. [[;zl_max_level=]] .. str2int(get(config, 'rogue', 'level'))
   hook = hook .. [[;zl_more_repertoire=false]]
   hook = hook .. [[;zl_more_experience=true]]
   hook = hook .. [[;zl_skip_coin=]] .. str(get(config, 'rogue', 'skip', 'coin'))
@@ -284,7 +290,7 @@ server=]] .. server
 
   hook = hook .. [[;saveConfig("restart_mode_hook",]] ..
            string.format("%q", hook) .. ')'
-  -- log("hook", hook)
+  log("hook", hook)
   -- ssleep(1000)
   saveConfig("hideUIOnce", "true")
   saveConfig("restart_mode_hook", hook)
diff --git a/docs/guide.md b/docs/guide.md
index c392abb..8c72932 100644
--- a/docs/guide.md
+++ b/docs/guide.md
@@ -7,17 +7,19 @@
 
 问题反馈：[github.com/tkkcc/ArkLights/issues](https://github.com/tkkcc/ArkLights/issues)
 
-源码与其他明日方舟脚本：[github.com/tkkcc/ArkLights](https://github.com/tkkcc/ArkLights)
+源码与其他明日方舟脚本：[github.com/tkkcc/ArkLights](https://github.com/tkkcc/ArkLights)  
+云控前端：[github.com/AegirTech/IberiaEye](https://github.com/AegirTech/IberiaEye)  
+云控后端：[github.com/AegirTech/Inquisition](https://github.com/AegirTech/Inquisition)  
 觉得好用请在github上给个star，这是对开发者最大的帮助。
 
 ## 最近更新
 
+- 建议用611版本。
+- 默认定期重启脚本，保证内存稳定，可在高级设置调整，有问题请反馈。
 - 华云必须执行[外置root指令](#云手机)才能正常使用。
-- 建议勾选“启用完全重启”，彻底保证脚本内存稳定，遇到定时启动失败的请反馈。
 - 可使用pushplus通知，支持微信公众号、邮件等多种渠道，有图，无需自建服务。
 - 标题时间异常、弹“停止运行”，重装最新安装包后清除缓存，设置不丢。
 - 活动关内存泄漏严重，2G内存设备将内存清理间隔设为900才能稳定挂机。
-- 已root设备上会`重启acc进程`来保证脚本内存稳定。如果出现脚本启动失败且只是短时间使用，可禁用。
 - magisk hide设备需**手动关闭root授权提示**。
 <!-- - 默认不自动重启acc进程，但这样刷肉鸽每小时内存泄漏44M，一天1G。启用后会定期释放脚本内存，但在部分设备上会造成启动失败与闪退。 -->
 <!-- - 单号最大剿灭次数默认为1。 -->
@@ -70,8 +72,6 @@ adb -s 123.456.789.101:234 shell "nohup sh -c 'nc -klp49876 -e sh' > /dev/null 2
 
 注意 游戏内异形屏适配设为0，系统关游戏模式，关游戏工具箱，关全局侧边栏，关深色夜间护眼模式，关隐藏刘海，虚拟键要位于右侧，边缘全面屏手势可能影响脚本点击。
 
-部分已root真机可能需要勾选`禁用重启acc进程`。
-
 如需小窗模式/后台运行/熄屏运行，请用手机虚拟机或云手机。
 
 #### 手机虚拟机
diff --git a/main.lua b/main.lua
index 6f6241f..54738dd 100644
--- a/main.lua
+++ b/main.lua
@@ -50,7 +50,7 @@ default_findcolor_confidence = 95 / 100
 -- 设成1000//30时，真机同时开着B服与官服时会出现点着点着脚本就停（从基建开始做邮件）
 frame_milesecond = 1000 // 30
 milesecond_after_click = frame_milesecond
-release_date = "2022.06.22 20:31"
+release_date = "2022.06.23 21:13"
 ui_submit_color = "#ff0d47a1"
 ui_cancel_color = "#ff1976d2"
 ui_warn_color = "#ff33ccff"
diff --git a/path.lua b/path.lua
index a843852..27d0c9d 100644
--- a/path.lua
+++ b/path.lua
@@ -739,7 +739,7 @@ path.基建收获 = function()
   log(findAny({"小蓝圈", "进驻总览"}))
   log(134)
 
-  if findOne("小蓝圈") and findOne("训练室") then
+  if false and findOne("小蓝圈") and findOne("训练室") then
     tap("点击全部收取2")
     zoom()
     if not wait(function()
@@ -2672,9 +2672,9 @@ path.开始游戏 = function(x, disable_ptrs_check)
   -- log(findOne("开始行动"))
   -- safeexit()
 
-  if not appear("代理指挥开", 1) then
+  if not appear("代理指挥开", .5) then
     tap("代理指挥开1")
-    if not appear("代理指挥开", 1) then
+    if not appear("代理指挥开", .5) then
       -- clean_fight(x)
       -- fight_failed_times[cur_fight] = (fight_failed_times[cur_fight] or 0) + 1
       if not appear("主页") then back() end
diff --git a/point.lua b/point.lua
index 89a80bd..2a42178 100644
--- a/point.lua
+++ b/point.lua
@@ -26,7 +26,8 @@ point = {
   阿米娅2 = "777|300|FAEAD1,714|369|3DD1E2",
   阿米娅右列表 = {{1771, 841}, {1300, 832}},
   阿米娅左列表 = {{364, 913}},
-  注册协议 = {text = "鹰角网络用户注册协议"},
+  -- 注册协议 = {text = "鹰角网络用户注册协议"},
+  注册协议 = "949|328|CCCCCC,963|328|313131,958|351|FFFFFF,1372|756|FCFCFC",
   注册协议1 = "972|753|FCFCFC",
   注册协议2 = "972|843|616161",
   同意并继续 = {text = "同意并继续"},
@@ -1248,6 +1249,7 @@ autojs提供OCR、图像匹配、速度没测过。OCR看现有明日方舟辅
 --]]
 
 center = {
+  注册协议 = "center_center",
   注册协议1 = "center_center",
   注册协议2 = "center_center",
   剿灭接管作战 = "center_center",
diff --git a/release b/release
index e3741d9..1f595c5 160000
--- a/release
+++ b/release
@@ -1 +1 @@
-Subproject commit e3741d99986ad4a4b44b8ac02cde5f2fd8667186
+Subproject commit 1f595c5241c9a1126aede6c4e4e949516d47dc2b
diff --git a/util.lua b/util.lua
index cf815fc..639250a 100644
--- a/util.lua
+++ b/util.lua
@@ -4,6 +4,7 @@ if use_zhuzhu_game then oppid = "com.hypergryph.arknightss" end
 bppid = "com.hypergryph.arknights.bilibili"
 -- apk502 = getApkVerInt() >= 502 or getApkVerInt() == 1
 apk502 = getApkVerInt() >= 502
+is_apk_old = function() return getApkVerInt() < 611 end
 
 disable_game_up_check_wrapper = function(func)
   return function(...)
@@ -773,7 +774,7 @@ stop = function(msg, try_next_account, nohome, complete)
   cloud.fetchSolveTask()
   if not nohome then home() end
   ssleep(2)
-  if try_next_account then restart_next_account() end
+  if try_next_account then restart_account(true) end
   exit()
 end
 
@@ -798,22 +799,18 @@ findOne_game_up_check_last_time = 0
 findOne_keepalive_check_last_time = time()
 findOne_last_time = time()
 findOne_locked = false
-findOne = function(x, confidence, disable_game_up_check)
+findOne = function(x, confidence)
   if type(x) == "function" then return x() end
 
+  -- 每5秒确认游戏在前台
   if (time() - findOne_game_up_check_last_time > 5000) then
     findOne_game_up_check_last_time = time()
     wait_game_up()
   end
 
-  -- if (time() - findOne_keepalive_check_last_time > keepalive_interval * 1000) then
-  --   findOne_keepalive_check_last_time = time()
-  --   keepalive()
-  -- end
-
   local x0 = x
   confidence = confidence or default_findcolor_confidence
-  -- print(confidence)
+
   if type(x) == 'string' and not x:find(coord_delimeter) then x = point[x] end
   if type(x) == "function" then return x() end
   if type(x) == "table" and #x == 0 then return findNode(x) end
@@ -1225,14 +1222,7 @@ parse_time = function(x)
   })
 end
 
--- run function / job / table of function and job
-run = function(...)
-  local arg = {...}
-
-  if #arg == 1 then
-    if type(arg[1]) == "function" then return arg[1]() end
-    if type(arg[1]) == "table" then arg = arg[1] end
-  end
+qqnotify_before_run = function()
   qqmessage = {}
   if qqnotify_quiet then
     table.extend(qqmessage, {devicenote, usernote})
@@ -1247,43 +1237,50 @@ run = function(...)
       server == 0 and "官服" or "B服",
     })
   end
+end
 
-  local run_start_time = time()
+qqnotify_after_run = function(run_start_time)
+  if not qqnotify_noruntime and run_start_time then
+    table.insert(qqmessage,
+                 math.floor((time() - run_start_time) / 1000 / 60) .. "分钟")
+  end
+  if not qqnotify_nofight then
+    table.insert(qqmessage, shrink_fight_config(fight_history))
+  end
+  path.跳转("首页")
+  captureqqimagedeliver(table.join(qqmessage, ' '))
+  if not qqnotify_nofight then table.remove(qqmessage, #qqmessage) end
+  if not qqnotify_noruntime then table.remove(qqmessage, #qqmessage) end
+end
 
-  -- 目前每个账号不同任务的状态共享，因此只在外层执行一次
+qqnotify_before_restart_package = function()
+  table.insert(qqmessage, "即将重启脚本")
+  if not qqnotify_nofight then
+    table.insert(qqmessage, shrink_fight_config(fight_history))
+  end
+  captureqqimagedeliver(table.join(qqmessage, ' '))
+end
+
+-- run function / job / table of function and job
+run = function(...)
+  local arg = {...}
+  if #arg == 1 then
+    if type(arg[1]) == "function" then return arg[1]() end
+    if type(arg[1]) == "table" then arg = arg[1] end
+  end
+  local run_start_time = time()
+  qqnotify_before_run()
   update_state()
-  request_memory_clean()
   wait_game_up()
-  setTimer(setControlBar, 500)
-  setTimer(setControlBar, 1000)
-  setTimer(setControlBar, 5000)
-
   for _, v in ipairs(arg) do
-    setControlBar()
     running = v
     if type(v) == 'function' then
-      log(773)
       v()
-      log(774)
     else
       auto(path[v], path.fallback)
     end
-    request_memory_clean()
   end
-
-  if not qqnotify_noruntime then
-    table.insert(qqmessage,
-                 math.floor((time() - run_start_time) / 1000 / 60) .. "分钟")
-  end
-  if not qqnotify_nofight then
-    table.insert(qqmessage, shrink_fight_config(fight_history))
-  end
-
-  path.跳转("首页")
-  captureqqimagedeliver(table.join(qqmessage, ' '))
-
-  if not qqnotify_nofight then table.remove(qqmessage, #qqmessage) end
-  if not qqnotify_noruntime then table.remove(qqmessage, #qqmessage) end
+  qqnotify_after_run(run_start_time)
 end
 
 half_hour_cron = function(x, h)
@@ -1533,24 +1530,25 @@ trySolveCapture = function()
 end
 
 wait_game_up = function(retry)
+  retry = retry or 0
   if disable_game_up_check then return end
   local prev = disable_game_up_check
   disable_game_up_check = true
-  -- oom_score_adj()
+
   if findOne("game") then
     disable_game_up_check = prev
+    -- 前台切到游戏后，需要延时再设悬浮按钮与oom_score_adj
+    if retry > 0 then
+      setTimer(setControlBar, 2000)
+      setTimer(setControlBar, 5000)
+      setTimer(oom_score_adj, 2000)
+      setTimer(oom_score_adj, 5000)
+    end
     return
   end
 
-  -- test
-  -- keepalive()
-  -- 确保无障碍在运行
-  -- enable_accessibility_service()
-
-  retry = retry or 0
-  if retry == 2 then home() end
-  if retry == 4 then closeapp(appid) end
-  if retry >= 6 then stop("无法启动游戏", false) end
+  if retry == 2 then closeapp() end
+  if retry >= 4 then stop("无法启动游戏", false) end
 
   open(appid)
   screenon()
@@ -1559,15 +1557,10 @@ wait_game_up = function(retry)
     "game", "keyguard_indication", "keyguard_input", "captcha",
     "同意并继续",
   }, 5)
-  log(1552, p)
   if p == "同意并继续" then path.bilibili_login[p]() end
-  log(1211)
   trySolveCapture()
-  log(1212)
   checkScreenLock()
-  log(1213)
   log("wait_game_up next", retry)
-
   disable_game_up_check = prev
   return wait_game_up(retry + 1)
 end
@@ -2609,8 +2602,8 @@ make_ui_title = function(layout, name)
   local resolution = screen.width .. 'x' .. screen.height
   name = name or ''
   ui.setTitleText(layout,
-                  name .. " " .. getApkVerInt() .. "-" ..
-                    release_date:gsub(' ', '-') .. ' ' .. resolution)
+                  name .. " " .. (is_apk_old() and '*' or '') .. getApkVerInt() ..
+                    "-" .. release_date:gsub(' ', '-') .. ' ' .. resolution)
 
 end
 
@@ -2938,17 +2931,21 @@ show_debug_ui = function()
   -- ui.addEditText(layout, "zl_restart_interval1", "3600")
 
   newRow(layout)
-  addTextView(layout, "内存清理间隔(s)")
-  ui.addEditText(layout, "keepalive_interval", "900")
+  addTextView(layout, "游戏重启间隔(s)")
+  ui.addEditText(layout, "restart_game_interval", "900")
+
+  newRow(layout)
+  addTextView(layout, "脚本重启间隔(s)")
+  ui.addEditText(layout, "restart_package_interval", "7200")
 
   -- newRow(layout)
   -- ui.addCheckBox(layout, "enable_disable_lmk",
   --                "禁用LMK(测试中,专用挂机设备建议勾)", false)
-  newRow(layout)
-  ui.addCheckBox(layout, "enable_restart_package", "启用完全重启", false)
+  -- newRow(layout)
+  -- ui.addCheckBox(layout, "enable_restart_package", "启用完全重启", true)
 
-  newRow(layout)
-  ui.addCheckBox(layout, "disable_killacc1", "禁用重启acc进程", false)
+  -- newRow(layout)
+  -- ui.addCheckBox(layout, "disable_killacc1", "禁用重启acc进程", false)
 
   -- addTextView(layout, "禁用重启acc")
   -- ui.addEditText(layout, "disable_killacc", "")
@@ -3269,8 +3266,6 @@ show_gesture_capture_ui = function()
 end
 
 gesture_capture = function()
-
-  keepalive_interval = 3600
   tap_interval = -1
   findOne_interval = -1
   -- update_state_from_debugui()
@@ -3523,8 +3518,8 @@ test_fight_hook = function()
   if not test_fight then return end
   -- log(2392)
   fight = {
-    -- "HD-10", "HD-1", "HD-2", "HD-3", "HD-4", "HD-5", 
-    -- "HD-6", 
+    -- "HD-10", "HD-1", "HD-2", "HD-3", "HD-4", "HD-5",
+    -- "HD-6",
     -- "HD-7",
     "HD-8",
     -- "HD-9",
@@ -3595,7 +3590,6 @@ predebug_hook = function()
   if not predebug then return end
   tap_interval = -1
   findOne_interval = -1
-  keepalive_interval = 3500
   zl_skill_times = 100
   -- log(shift_prefer_speed)
   -- exit()
@@ -3606,7 +3600,8 @@ predebug_hook = function()
   swipu_flipy = 0
   swipu_flipx = 0
   ssleep(1)
-  log(findOne("game"))
+  save_extra_mode("战略前瞻投资")
+  -- log(findOne("game"))
   -- cloud_task = {}
   -- log(uploadImg(getWorkPath() .. '/tmp.jpg'))
   -- m.addLog()
@@ -3680,7 +3675,7 @@ predebug_hook = function()
   -- disable_log = 1
   -- home()
   while true do
-    keepalive()
+    -- keepalive()
     -- open(appid)
     -- screenon()
     -- request_game_permission()
@@ -4157,7 +4152,7 @@ predebug_hook = function()
   exit()
 
   -- log(time())
-  keepalive()
+  -- keepalive()
   -- log(time())
   -- log(findOne("凋零残响"))
   exit()
@@ -4646,33 +4641,24 @@ check_crontab = function()
 end
 
 setEventCallback = function()
+
   setStopCallBack(function()
     disable_log = false
     log("结束")
     saveConfig("hideUIOnce", "false")
     saveConfig("restart_mode_hook", '')
     disableRootToast(true)
-    collectgarbage("collect")
-    -- stopThread(keepalive_thread[1])
-    -- stopThread(keepalive_thread[2])
-    -- stopThread(keepalive_thread[3])
-    -- log(exec("free -h"))
-    -- log(exec("top -n 1"))
-    -- if need_show_console then
     console.show()
-    -- else
-    --   console.dismiss()
-    -- end
-
-    -- log("\nps|grep bila\n", exec("su root sh -c 'ps|grep bila' "))
-    -- log("\nps -a |grep bila\n", exec("su root sh -c 'ps -a|grep bila' "))
-    -- log("\nps -e |grep bila\n", exec("su root sh -c 'ps -e|grep bila' "))
   end)
 
   setUserEventCallBack(function(type)
-    collectgarbage("collect")
+    log("重启", type)
+    saveConfig("hideUIOnce", "false")
+    saveConfig("restart_mode_hook", '')
+    disableRootToast(true)
     _restartScript()
   end)
+
 end
 
 consoleInit = function()
@@ -4914,9 +4900,26 @@ forever = function(f, ...) while true do f(...) end end
 
 save_extra_mode = function(mode, multi)
   if not mode then return end
+  local hook = loadConfig('restart_mode_hook', '') .. [[;
+extra_mode=]] .. string.format('%q', mode) .. [[;
+extra_mode_multi=]] .. str(multi and true or false) .. [[;
+zl_no_waste_last_time=]] .. str(zl_no_waste_last_time)
+  saveConfig("restart_mode_hook", hook)
+end
+
+save_multi_account_choice = function(skip_current)
+  -- 跳过当前账号
+  if skip_current then
+    while multi_account_choice[multi_account_choice_idx] == account_idx do
+      multi_account_choice_idx = multi_account_choice_idx + 1
+    end
+  end
+  -- 截取后续账号
+  multi_account_choice = table.slice(multi_account_choice,
+                                     multi_account_choice_idx)
   saveConfig("restart_mode_hook",
-             loadConfig('restart_mode_hook', '') .. ";extra_mode=[[" .. mode ..
-               "]];extra_mode_multi=" .. (multi and 'true' or 'false'))
+             loadConfig("restart_mode_hook", '') .. ";multi_account_choice=[[" ..
+               table.join(multi_account_choice, ' ') .. "]]")
 end
 
 -- restart_mode = function(mode, multi)
@@ -4933,42 +4936,21 @@ end
 --   restartScript()
 -- end
 
-restart_next_account = function()
-  -- 肉鸽中直接重启脚本
-  -- if extra_mode then restart_mode(extra_mode, extra_mode_multi) end
-
+restart_account = function(skip_current)
   -- 只在多账号模式启用跳过账号
   if not account_idx then
-    -- if not extra_mode then
-    toast("等待1小时")
-    wait(function() ssleep(1) end, 3600)
-    -- end
+    if skip_current then
+      toast("等待1小时")
+      wait(function() ssleep(1) end, 3600)
+    end
     saveConfig("hideUIOnce", "true")
     save_extra_mode(extra_mode, extra_mode_multi)
     restartScript()
   end
 
-  -- closeapp(appid)
-  -- 插入当前号
-  -- table.insert(multi_account_choice, account_idx)
-  log(3322, multi_account_choice, multi_account_choice_idx, account_idx)
-  -- 跳过一样的号
-  while multi_account_choice[multi_account_choice_idx] == account_idx do
-    multi_account_choice_idx = multi_account_choice_idx + 1
-  end
-  -- 截取之后的号，可能为空
-  multi_account_choice = table.slice(multi_account_choice,
-                                     multi_account_choice_idx)
-
-  log(3323, multi_account_choice, multi_account_choice_idx, account_idx)
-
-  saveConfig("restart_mode_hook",
-             loadConfig("restart_mode_hook", '') .. ";multi_account_choice=[[" ..
-               table.join(multi_account_choice, ' ') .. "]]")
-  log(3324, loadConfig("restart_mode_hook", ''))
   saveConfig("hideUIOnce", "true")
   save_extra_mode(extra_mode, extra_mode_multi)
-  log(3325, loadConfig("restart_mode_hook", ''))
+  save_multi_account_choice(skip_current)
   restartScript()
 end
 
@@ -5009,14 +4991,14 @@ end
 keepalive = function()
   -- enable_log_wrapper(function() log("keepalive") end)()
   -- trim_game_memory()
-  killacc()
+  -- killacc()
   oom_score_adj()
-  collectgarbage('collect')
+  -- collectgarbage('collect')
   -- disable_lmk()
 end
 
 killacc = function()
-  collectgarbage("collect")
+  -- collectgarbage("collect")
   if not root_mode then return end
   if disable_killacc1 then return end
   if apk502 then return end
@@ -5120,7 +5102,6 @@ restartScript = function()
   if not root_mode or not enable_restart_package then return _restartScript() end
   local cmd = [[nohup su root sh -c ' \
 while :; do
-sleep 1
 am force-stop ]] .. oppid .. [[;
 am force-stop ]] .. bppid .. [[;
 am force-stop ]] .. package .. [=[;
@@ -5140,24 +5121,38 @@ done
 secs=300
 endTime=$(( $(date +%s) + secs ))
 while [[ $(date +%s) -lt $endTime ]]; do
+  sleep 5
   uiautomator dump /sdcard/window_dump.xml
-  ok=$(sed -rn '\''s|.*text=.确定.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
-  cancel=$(sed -rn '\''s|.*text=.取消.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
-  start=$(sed -rn '\''s|.*text=.立即开始.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
-  snap=$(sed -rn '\''s|.*com.bilabila.arknightsspeedrun2:id/switch_snap.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
   foreground=$(dumpsys activity recents|sed -rn '\''s/.*Recent #0.*(com[^ ]+).*/\1/p'\'')
   if [[ $foreground == *com.hypergryph* ]];then
      exit
-  elif [[ -n $snap ]]; then
-    eval $snap
-  elif [[ -n $start ]]; then
-    eval $start
-  elif [[ -n $cancel ]]; then
+  elif [[ $foreground == *com.bilabila* ]];then
+     :
+  else
+    continue
+  fi
+
+  cancel=$(sed -rn '\''s|.*text=.取消.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
+  ok=$(sed -rn '\''s|.*text=.确定.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
+  if [[ -n $cancel ]]; then
     eval $cancel
+    continue
   elif [[ -n $ok ]]; then
     eval $ok
+    continue
+  fi
+
+  start=$(sed -rn '\''s|.*text=.立即开始.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
+  if [[ -n $start ]]; then
+    eval $start
+    continue
+  fi
+
+  snap=$(sed -rn '\''s|.*com.bilabila.arknightsspeedrun2:id/switch_snap.[^>]*bilabila[^>]*bounds=.\[([0-9]*),([0-9]*)\]\[([0-9]*),([0-9]*)\]..*|input tap $(((\1+\3)/2)) $(((\2+\4)/2))|p'\'' /sdcard/window_dump.xml)
+  if [[ -n $snap ]]; then
+    eval $snap
+    continue
   fi
-  sleep 5
 done
 done
 ' > /dev/null & ]=]
@@ -5414,7 +5409,7 @@ disableRootToast = function(reenable)
 root_manager=$(pm list packages|grep -e .superuser -e .supersu -e .magisk | head -n1|cut -d: -f2)
 root_manager=${root_manager:-com.android.settings}
 appops set $root_manager TOAST_WINDOW ]] .. (reenable and "allow" or "deny") ..
-                [[; 
+                [[;
 settings put global heads_up_notifications_enabled ]] .. (reenable and 1 or 0) ..
                 [[;
 ' > /dev/null & ]]
@@ -5466,7 +5461,6 @@ update_state_from_debugui = function()
   max_fight_times = str2int(max_fight_times, math.huge)
   tap_interval = str2int(tap_interval, -1)
   zl_restart_interval = str2int(zl_restart_interval1, 3600)
-  keepalive_interval = str2int(keepalive_interval, 900)
   zl_skill_times = str2int(zl_skill_times, 0)
   zl_skill_idx = str2int(zl_skill_idx, 1)
   tapall_duration = str2int(tapall_duration, -1)
@@ -5501,6 +5495,10 @@ update_state_from_debugui = function()
   cloud.setServer(cloud_server)
   cloud.setStatus(extra_mode == "战略前瞻投资" and 1002 or 1001)
   if apk502 then enable_restart_package = true end
+  enable_restart_package = true
+
+  restart_game_interval = str2int(restart_game_interval, 900)
+  restart_package_interval = str2int(restart_package_interval, 7200)
 end
 
 -- 基建心情阈值与QQ号
@@ -5572,31 +5570,20 @@ is_network_unstable = function()
   s = os.time(update(os.date("*t"), {hour = 16, min = 0}))
   e = os.time(update(os.date("*t"), {hour = 16, min = 15}))
   if s < cur_time and cur_time < e then return true end
-
-  -- local cur_time = tonumber(os.date("%w", os.time()))
-  -- if cur_time == 0 then cur_time = 7 end
-  -- if cur_time < 6 then return true end
 end
 
-memory_clean_last_time = time()
--- memory_clean_last_time = 0
+restart_package_last_time = time()
 request_memory_clean = function()
-  oom_score_adj()
-
-  local did = false
-  if not did and (time() - memory_clean_last_time > keepalive_interval * 1000) then
-    memory_clean_last_time = time()
-    keepalive()
-    did = true
+  if (time() - restart_package_last_time > restart_package_interval * 1000) then
+    qqnotify_before_restart_package()
+    restart_account(false)
+    return true
   end
-  if not did and
-    (time() - kill_game_last_time[appid] > keepalive_interval * 1000) then
+
+  if (time() - kill_game_last_time[appid] > restart_game_interval * 1000) then
     restartapp(appid)
-    did = true
+    return true
   end
-  -- log("kill_game_last_time",kill_game_last_time)
-  -- exit()
-  return did
 end
 
 remove_old_log = function()