From d411b16ce8d8f5dd767134103eb502fdfe88256c Mon Sep 17 00:00:00 2001
From: 0O0o0oOoO00 <11174151+0O0o0oOoO00@users.noreply.github.com>
Date: Sun, 18 May 2025 21:32:49 +0800
Subject: [PATCH] add: wait time setting of phone and adb

---
 config/template.json                 | 4 +++-
 module/cloud_phone/run.py            | 4 ++--
 module/config/argument/args.json     | 8 ++++++++
 module/config/argument/argument.yaml | 2 ++
 module/config/config_generated.py    | 2 ++
 module/config/i18n/en-US.json        | 8 ++++++++
 module/config/i18n/ja-JP.json        | 8 ++++++++
 module/config/i18n/zh-CN.json        | 8 ++++++++
 module/config/i18n/zh-TW.json        | 8 ++++++++
 9 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/config/template.json b/config/template.json
index eb2f2bbec..5d984f649 100644
--- a/config/template.json
+++ b/config/template.json
@@ -167,7 +167,9 @@
       "AccessKey": null,
       "AccessKeySecret": null,
       "Region": "cn-suzhou1",
-      "PhoneId": null
+      "PhoneId": null,
+      "PhoneWaitTime": 60,
+      "AdbWaitTime": 60
     },
     "Storage": {
       "Storage": {}
diff --git a/module/cloud_phone/run.py b/module/cloud_phone/run.py
index e3d03d5bd..58a638814 100644
--- a/module/cloud_phone/run.py
+++ b/module/cloud_phone/run.py
@@ -73,10 +73,10 @@ class CloudPhoneRestart(ModuleBase):
 
     def wait_for_adb(self):
         logger.info("Wait for adb of cloud phone")
-        time.sleep(15)
+        time.sleep(deep_get(self.config.data, "CloudPhoneRestart.CloudPhoneSetting.AdbWaitTime", 60))
 
     def wait_for_ready(self):
-        wait_timer = Timer(60)
+        wait_timer = Timer(deep_get(self.config.data, "CloudPhoneRestart.CloudPhoneSetting.PhoneWaitTime", 60))
         wait_timer.start()
         while 1:
             if wait_timer.reached():
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
index 3620d1c87..4ab87a92e 100644
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -737,6 +737,14 @@
       "PhoneId": {
         "type": "input",
         "value": ""
+      },
+      "PhoneWaitTime": {
+        "type": "input",
+        "value": 60
+      },
+      "AdbWaitTime": {
+        "type": "input",
+        "value": 60
       }
     },
     "Storage": {
diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml
index 47a7a66b3..97d7b71da 100644
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -233,6 +233,8 @@ CloudPhoneSetting:
       cn-us-cloudphone
     ]
   PhoneId: ""
+  PhoneWaitTime: 60
+  AdbWaitTime: 60
 # ==================== Farm ====================
 
 Campaign:
diff --git a/module/config/config_generated.py b/module/config/config_generated.py
index 97d81eec9..fea3c8c1f 100644
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -129,6 +129,8 @@ class GeneratedConfig:
     CloudPhoneSetting_AccessKeySecret = None
     CloudPhoneSetting_Region = 'cn-suzhou1'  # cn-suzhou1, cn-huaian, cn-shzj, cn-beijing1, cn-anxi, cn-sz-meisheng, cn-hkcmi, cn-hk3, cn-us, cn-jsha-cloudphone-2, cn-jsha-cloudphone-3, cn-fjqz-cloudphone, cn-szyh-cloudphone, cn-hk-cloudphone, cn-hk-cloudphone-2, cn-hk-cloudphone-3, cn-us-cloudphone
     CloudPhoneSetting_PhoneId = None
+    CloudPhoneSetting_PhoneWaitTime = 60
+    CloudPhoneSetting_AdbWaitTime = 60
 
     # Group `Campaign`
     Campaign_Name = '12-4'
diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json
index 817bc1913..057f2f408 100644
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@@ -962,6 +962,14 @@
     "PhoneId": {
       "name": "CloudPhoneSetting.PhoneId.name",
       "help": "CloudPhoneSetting.PhoneId.help"
+    },
+    "PhoneWaitTime": {
+      "name": "CloudPhoneSetting.PhoneWaitTime.name",
+      "help": "CloudPhoneSetting.PhoneWaitTime.help"
+    },
+    "AdbWaitTime": {
+      "name": "CloudPhoneSetting.AdbWaitTime.name",
+      "help": "CloudPhoneSetting.AdbWaitTime.help"
     }
   },
   "Campaign": {
diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json
index eabce53e8..cc888eaa2 100644
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@@ -962,6 +962,14 @@
     "PhoneId": {
       "name": "CloudPhoneSetting.PhoneId.name",
       "help": "CloudPhoneSetting.PhoneId.help"
+    },
+    "PhoneWaitTime": {
+      "name": "CloudPhoneSetting.PhoneWaitTime.name",
+      "help": "CloudPhoneSetting.PhoneWaitTime.help"
+    },
+    "AdbWaitTime": {
+      "name": "CloudPhoneSetting.AdbWaitTime.name",
+      "help": "CloudPhoneSetting.AdbWaitTime.help"
     }
   },
   "Campaign": {
diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json
index 1c5bb0ce7..4fff550b4 100644
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@@ -962,6 +962,14 @@
     "PhoneId": {
       "name": "云手机ID",
       "help": ""
+    },
+    "PhoneWaitTime": {
+      "name": "云手机重启等待时间",
+      "help": "若超时报错则需要根据情况适当延长"
+    },
+    "AdbWaitTime": {
+      "name": "云手机ADB等待时间",
+      "help": "若超时报错则需要根据情况适当延长"
     }
   },
   "Campaign": {
diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json
index 7d84ba22c..ed6ca03fd 100644
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -962,6 +962,14 @@
     "PhoneId": {
       "name": "CloudPhoneSetting.PhoneId.name",
       "help": "CloudPhoneSetting.PhoneId.help"
+    },
+    "PhoneWaitTime": {
+      "name": "CloudPhoneSetting.PhoneWaitTime.name",
+      "help": "CloudPhoneSetting.PhoneWaitTime.help"
+    },
+    "AdbWaitTime": {
+      "name": "CloudPhoneSetting.AdbWaitTime.name",
+      "help": "CloudPhoneSetting.AdbWaitTime.help"
     }
   },
   "Campaign": {