From f26de281fe4377c0f67f4438581fa596526d20d5 Mon Sep 17 00:00:00 2001
From: wangpeng <wangpengb@uniontech.com>
Date: Thu, 19 Sep 2024 11:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD=E7=AA=97?=
 =?UTF-8?q?=E6=88=B7=E6=96=B9=E6=B3=95=E4=B8=BA=E6=A0=B9=E6=8D=AE=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 method/base_method.py                           |  16 +---------------
 method/dde_method.py                            |  12 +++++++++++-
 ...ndow_btn2.png => close_window_btn_23.09.png} | Bin
 3 files changed, 12 insertions(+), 16 deletions(-)
 rename method/image_res/{close_window_btn2.png => close_window_btn_23.09.png} (100%)

diff --git a/method/base_method.py b/method/base_method.py
index 313852c..b899d3b 100644
--- a/method/base_method.py
+++ b/method/base_method.py
@@ -43,21 +43,7 @@ class BaseMethod:
 
     def base_method_click_by_img(self, img_name):
         """通过图像识别点击"""
-        all_pngs = set()
-        img_name_tmp = img_name.split('.')[0]
-
-        for tmp in os.listdir(config.IMAGE_RES):
-            if re.search(f'^{img_name_tmp}\d*.png', tmp):
-                all_pngs.add(tmp)
-        for img_tmp in all_pngs:
-            try:
-                pylinuxauto.find_element_by_image(f"{config.IMAGE_RES}/{img_tmp}").click()
-                break
-            except pylinuxauto.exceptions.TemplateElementNotFound:
-                pass
-        else:
-            raise pylinuxauto.exceptions.TemplateElementNotFound(img_name)
-
+        pylinuxauto.find_element_by_image(f"{config.IMAGE_RES}/{img_name}").click()
 
     def base_method_double_click_by_img(self, img_name):
         """通过图像识别双击"""
diff --git a/method/dde_method.py b/method/dde_method.py
index 5dc8254..2d7495f 100644
--- a/method/dde_method.py
+++ b/method/dde_method.py
@@ -47,7 +47,17 @@ class DdeMethod(
 
     def dde_method_close_window(self):
         """关闭窗口"""
-        self.base_method_click_by_img("close_window_btn.png")
+        def get_euler_version():
+            """获取 openEuler 版本信息,默认图片失败时使用版本图片定位"""
+            with open("/etc/openEuler-release") as f:
+                data = f.readline()
+                return "".join(data.split(" ")[2:]).strip()
+
+        try:
+            self.base_method_click_by_img("close_window_btn.png")
+        except pylinuxauto.exceptions.TemplateElementNotFound:
+            euler_version = get_euler_version()
+            self.base_method_click_by_img(f"close_window_btn_{euler_version}.png")
 
     def dde_method_delete_keyboard_layout_in_control_center(self):
         """在控制中心的键盘布局视图删除除选中之外的布局"""
diff --git a/method/image_res/close_window_btn2.png b/method/image_res/close_window_btn_23.09.png
similarity index 100%
rename from method/image_res/close_window_btn2.png
rename to method/image_res/close_window_btn_23.09.png
-- 
Gitee