代码提交

预定系统/Base/app_base.py

@@ -927,18 +927,18 @@ def app_quit(device_ip, port=5555, adb_path=r"C:\Program Files\androidsdk\androi
         INFO(f"ADB断开命令返回码: {disconnect_result.returncode}")
         INFO(f"ADB断开命令输出: {disconnect_result.stdout.strip()}")
         if disconnect_result.stderr.strip():
-            WARN(f"ADB断开错误输出: {disconnect_result.stderr.strip()}")
+            logging.warning(f"ADB断开错误输出: {disconnect_result.stderr.strip()}")
 
         # 验证是否断开成功
         if "disconnected" in disconnect_result.stdout:
             INFO(f"ADB 连接已成功断开: {device_address}")
             return True
         else:
-            WARN(f"ADB 连接断开失败: {device_address}")
+            logging.warning(f"ADB 连接断开失败: {device_address}")
             return False
 
     except Exception as e:
-        ERROR(f"断开ADB连接时发生错误: {str(e)}", exc_info=True)
+        logging.error(f"断开ADB连接时发生错误: {str(e)}", exc_info=True)
         return False
 
 

预定系统/ngrok/ngrok-自动化运行虚拟机/ngrok.cfg

@@ -9,7 +9,3 @@ tunnels:
     remote_port: 31135
     proto:
       tcp: "127.0.0.1:81"
-  nat3:
-    remote_port: 31136
-    proto:
-      tcp: "127.0.0.1:82"
\ No newline at end of file

预定系统/定时执行功能测试.py

@@ -74,14 +74,14 @@ schedule.every().day.at("12:00").do(run_task, run_automation_test, report_title=
 schedule.every().day.at("10:00").do(run_task, run_automation_test, report_title="兰州中石化项目测试报告", report_url_prefix="http://nat.ubainsyun.com:31135", test_case="兰州中石化项目", ding_type="标准版巡检")
 
 # 定时执行展厅巡检任务
-# schedule.every().day.at("07:45").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
-schedule.every().monday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
-schedule.every().thursday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
-schedule.every().wednesday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
-schedule.every().tuesday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
-schedule.every().friday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
-# schedule.every().saturday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
-# schedule.every().sunday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
+# schedule.every().day.at("07:45").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
+schedule.every().monday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
+schedule.every().thursday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
+schedule.every().wednesday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
+schedule.every().tuesday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
+schedule.every().friday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
+# schedule.every().saturday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
+# schedule.every().sunday.at("07:42").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31136", test_case="展厅巡检", ding_type="展厅巡检")
 
 
 # 调试使用