From 56099488d01fcf28b727312a9b83787c287027d4 Mon Sep 17 00:00:00 2001
From: ut005790 <lihaobo@uniontech.com>
Date: Thu, 29 Aug 2024 09:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=201271041?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 case/assert_res/new_account.png     | Bin 0 -> 1252 bytes
 case/test_euler_1271041.py          |  14 +++++
 case/test_euler_1271301.py          |  10 ++--
 method/base_method.py               |   8 ++-
 method/dde_control_center_method.py |  52 ++++++++---------
 method/dde_dock_method.py           |  10 +---
 method/dde_launcher_method.py       |  16 +-----
 method/dde_method.py                |  83 +++++++++++++++++++++-------
 8 files changed, 118 insertions(+), 75 deletions(-)
 create mode 100644 case/assert_res/new_account.png
 create mode 100644 case/test_euler_1271041.py

diff --git a/case/assert_res/new_account.png b/case/assert_res/new_account.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb7de00fc3656545dfdcc1af0135f8e004886186
GIT binary patch
literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq001ul001Be0ssI24HLF500009a7bBm000ie
z000ie0hKEb8vp<VmPtfGR9J=WmTgc}WfaGM_X-OxC<w@=1(=v9B22tAzU73?m?*o9
zijJ1`p@taCNozpUfI)J7gLIq;9m$%SY}QBtmC#-$Q%ut+1m6(zWwTY;!~|spcJIA?
zXmw@Tr7@U+5B}$Vx#v0eJimLM=RD^TSgFuwB=$By2R)*3FBdd>li4=;AwsN;rE+f1
z(0Ft<g=?_M4-sNmAVUWA42|GaQ}t<#7=i#mb_rjcqcDj{5m?$NI!I0p&-k!;CSyXl
z(M<7ih6kaGM-%||{)Vo+TQttO$=prRe9o9CI>O1De5@l}L;gO(0$85RF%xf2V2D49
z4U8NNu;~aIKSBaoTFSMSZlSoK*=?p!;+6%&RbtgVH-;5EDZ2nLJqGP4EbR<b6R0Mq
z3X1~Je3v#GhO6C0aY6H-5;O>~CY3e!ECFhkd{2QywvIOvDfpI6=X(I6D;im`?}KwU
z0aligTid~5-giV*QmAG1EVkz(D?N5j^dm9X$&?&IxCXh2h87|NNsL4z5$Z`s0>A!2
z*(}Bf(B4MGU_yf^_=yN#5+kvg3G?Fgot~x<?x2lk`dDt<B(IX#!OV;!DGIBNs>^sO
z=$>Z5IDEa)f6c*0%(s{tPHF-^B8KiQoO6ZuuKIju=tVuEaj!m4qYa`d)3x`~(M%c$
z@Vq}4(|I+Nqx1jItfocG8|uRD;w%<L`l|p+l1Pbj*cW_4N(?E{O#G6x1e))%&&2x2
zSokDcF4=t=78C5}9PmN|Ber(1Txn$XSax)3ZO-S-kEu)?g@=e$;@z*<P~X9OS|EGU
zS+R@vlIib-B%$`A&59(GQOuT0G%V)*az4Dk+1DtqA+w6yXcmmO(^S7gOc;t{|7Tf7
z5c!~j%qllDK=D-Oj3cLnWz$i4I_$MZ;<u9*LuwqOpCG%0Ri}`$&~Blk(UF^g0VoO{
zBC=v{d6)lk&>X)=`e8@R`_T4faZVQK;s7$Hp)EqC$J|6tDgLX8-wsf7onSxAO=Rh4
zS%xUGD~*<Agn0l60&g2o={a|mjr&pQS+&Oz`QK*Tg`8<}qp?X?CBCWUrDzVM0!$dr
z!58fg&kkej0h%nV+JnzJWSQ9?;j<2-4Zz!zR-4<&e7s3ZM9OkJ5s!Cpa9*k3U#Hqg
zN<1n(N9R**L>J3vhj}N77YaGl%=Nd}c8IwNgal%f@%6^ihO7{^0iz8m3$atW@9$#s
z67u(xU*{P5d<sV|v-zT%+!&6r;{-sWKQUnxp9Z+y&e=anjbz0bR32=s1<;o>U_G+T
zoNWwPkI}}AAgmHY^$2;?nJB10$YW)hJ#ws?0ACJV=`h{PKR8h6T;bU@qyz)Zc#5CT
zQ{8O8v7a(AQp1$dRMgNY1LUNTr9~7eO-E7qw30z;YK>fz?xkHo{lG?97{^%?RbAel
z-QGkqeqnqa=H=YJ%ZUaI^%!kT9*9K(Xtk14%Gxsy|KNU{T*Sg1_SaS`YES-Nj;yfr
z7=8k}SeBM_g@VfpR||xysB8O=FFR|biu!i9qfy?RYJGT`UR2-en*RU;YMN|_YB$mV
O0000<MNUMnLSTZG3`;ct

literal 0
HcmV?d00001

diff --git a/case/test_euler_1271041.py b/case/test_euler_1271041.py
new file mode 100644
index 0000000..7d4bb9e
--- /dev/null
+++ b/case/test_euler_1271041.py
@@ -0,0 +1,14 @@
+from case.base_case import BaseCase
+from method.dde_method import DdeMethod
+
+
+class TestDdeCase(BaseCase):
+    def test_euler_1271041(self):
+        """在控制中心中新建账户"""
+        DdeMethod().dde_method_add_account_by_control_center()
+        self.assert_image_exist_in_dde("new_account.png")
+
+    def teardown_method(self):
+        """删除新增账户并且关闭控制中心"""
+        DdeMethod().dde_method_delete_test_account_by_control_center()
+        DdeMethod().dde_method_close_window()
diff --git a/case/test_euler_1271301.py b/case/test_euler_1271301.py
index 41c7bae..ca52d89 100644
--- a/case/test_euler_1271301.py
+++ b/case/test_euler_1271301.py
@@ -4,16 +4,14 @@ from youqu3 import sleep
 from method.dde_method import DdeMethod
 
 
-class TestMyCase(BaseCase):
+class TestDdeCase(BaseCase):
     def test_euler_1271301(self):
         """在控制中心中添加汉语键盘布局"""
         DdeMethod().dde_method_add_hanyu_keyboard_layout_in_control_center()
         self.assert_image_exist_in_dde("keyboard_layout_hanyu.png")
 
-    @pytest.fixture(scope="function", autouse=True)
-    def tear_down(self):
+    def teardown_method(self):
         """环境清理，将新增的汉语键盘布局删除"""
-        yield
         sleep(2)
-        DdeMethod().dde_method_delete_keyboard_layout_by_img()
-        DdeMethod().dde_method_close_window()
\ No newline at end of file
+        DdeMethod().dde_method_delete_keyboard_layout_in_control_center()
+        DdeMethod().dde_method_close_window()
diff --git a/method/base_method.py b/method/base_method.py
index 6b61771..624cc67 100644
--- a/method/base_method.py
+++ b/method/base_method.py
@@ -4,18 +4,24 @@
 :Author:uos
 :Date  :2024/08/22 13:15:47
 """
+
 from funnylog2.config import config as funnylog2_config
+
 funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"]
 from youqu3.gui import pylinuxauto
 from config import config
 
+
 class BaseMethod:
+    dde_control_center_path = "/dde-control-center"
+    account_massage = "uostest12#$"
 
     """应用的方法基类"""
+
     def dde_method_click_by_ocr(self, text):
         """通过ocr识别点击"""
         pylinuxauto.find_element_by_ocr(text).click()
 
     def dde_method_click_by_img(self, img_name):
         """通过图像识别点击"""
-        pylinuxauto.find_element_by_image(f"{config.IMAGE_RES}/{img_name}").click()
\ No newline at end of file
+        pylinuxauto.find_element_by_image(f"{config.IMAGE_RES}/{img_name}").click()
diff --git a/method/dde_control_center_method.py b/method/dde_control_center_method.py
index cfbcf67..eeddd8c 100644
--- a/method/dde_control_center_method.py
+++ b/method/dde_control_center_method.py
@@ -1,6 +1,6 @@
 from time import sleep
 from funnylog2.config import config as funnylog2_config
-from pylinuxauto.attr.dogtail.rawinput import click
+
 funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"]
 from youqu3 import log
 from youqu3.gui import pylinuxauto
@@ -9,51 +9,51 @@ from method.base_method import BaseMethod
 from method.dde_dock_method import DdeDockMethod
 
 
-@log
 class DdeControlCenterMethod(BaseMethod):
-
+    def dde_control_center_method_click_by_attr(self, path):
+        """在控制中心中通过元素点击"""
+        pylinuxauto.find_element_by_attr_path(f"/dde-control-center/{path}").click()
 
     def dde_control_center_method_click_keyboard_and_language_by_attr(self):
         """在控制中心主界面中点击 键盘和语言"""
-        pylinuxauto.find_element_by_attr_path(
-        "/dde-control-center/键盘和语言"
-    ).click()
+        self.dde_control_center_method_click_by_attr("键盘和语言")
 
     def dde_control_center_method_click_keyboard_layout_by_attr(self):
         """在 键盘和语言 模块点击 键盘布局"""
-        pylinuxauto.find_element_by_attr_path(
-            "/dde-control-center/键盘布局"
-        ).click()
+        self.dde_control_center_method_click_by_attr("键盘布局")
 
     def dde_control_center_method_click_add_keyboard_layout_btn_by_attr(self):
         """点击 键盘布局 模块下方的加号按钮添加键盘布局"""
-        pylinuxauto.find_element_by_attr_path(
-            "/dde-control-center/Btn_addlayout"
-        ).click()
+        self.dde_control_center_method_click_by_attr("Btn_addlayout")
 
     def dde_control_center_method_click_hanyu_keyboard_layout_at_list(self):
         """在 添加键盘布局 界面点击 汉语"""
-        pylinuxauto.find_element_by_attr_path(
-            "/dde-control-center/汉语"
-        ).click()
+        self.dde_control_center_method_click_by_attr("汉语")
 
     def dde_control_center_method_click_bottom_add_btn_by_attr(self):
         """点击 添加键盘布局 界面下方的添加按钮，从而确认添加"""
-        pylinuxauto.find_element_by_attr_path(
-            "/dde-control-center/Btn_添加"
-        ).click()
+        self.dde_control_center_method_click_by_attr("Btn_添加")
 
     def dde_control_center_method_click_edit_btn_in_keyboard_layout(self):
         """点击 键盘布局 界面右侧的编辑按钮"""
-        pylinuxauto.find_element_by_attr_path(
-            "/dde-control-center/Btn_dcommandlinkbutton"
-        ).click()
+        self.dde_control_center_method_click_by_attr("Btn_dcommandlinkbutton")
+
+    def dde_control_center_click_delete_btn_by_img(self):
+        """点击控制中心列表项目编辑状态下旁边的红色删除按钮"""
+        self.dde_method_click_by_img("delete_keyboard_layout_icon.png")
 
-    def dde_control_center_click_delete_keyboard_layout_btn_by_img(self):
-        """进入 键盘布局 的编辑界面之后，点击键盘布局列表右侧的红色按钮删除键盘布局"""
-        DdeControlCenterMethod().dde_method_click_by_img("delete_keyboard_layout_icon.png")
+    def dde_control_center_enter_view_by_search_box(self, view_name):
+        """通过控制中心上方的搜索框进入到对应的视图之中"""
+        self.dde_control_center_method_click_by_attr("Editable_searchmodulelineedit")
+        pylinuxauto.input_message(view_name)
+        sleep(3)
+        pylinuxauto.enter()
 
+    def dde_control_center_method_click_edit_btn_in_system_language(self):
+        """点击 系统语言 列表旁边的编辑按钮"""
+        self.dde_control_center_method_click_by_attr("Btn_dcommandlinkbutton")
 
 
-if __name__ == '__main__':
-    DdeDockMethod().dde_dock_method_click_control_center_btn_by_attr()
+if __name__ == "__main__":
+    sleep(3)
+    DdeControlCenterMethod()
diff --git a/method/dde_dock_method.py b/method/dde_dock_method.py
index 95b8fed..01fee04 100644
--- a/method/dde_dock_method.py
+++ b/method/dde_dock_method.py
@@ -1,24 +1,20 @@
 from time import sleep
 from funnylog2.config import config as funnylog2_config
+
 funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"]
-from youqu3 import log
 from youqu3.gui import pylinuxauto
 from config import config
 from method.base_method import BaseMethod
 
-@log
-class DdeDockMethod(BaseMethod):
-
 
+class DdeDockMethod(BaseMethod):
     def dde_dock_method_click_dde_file_manager_by_attr(self):
         """在任务栏点击文件管理器"""
         pylinuxauto.find_element_by_attr_path("/dde-dock/Btn_文件管理器").click()
 
     def dde_dock_method_click_launcher_btn_by_attr(self):
         """在任务栏点击启动器"""
-        pylinuxauto.find_element_by_attr_path(
-            "/dde-dock/Btn_launcheritem"
-        ).click()
+        pylinuxauto.find_element_by_attr_path("/dde-dock/Btn_launcheritem").click()
 
     def dde_dock_method_click_control_center_btn_by_attr(self):
         """在任务栏点击控制中心"""
diff --git a/method/dde_launcher_method.py b/method/dde_launcher_method.py
index 1f98599..3165832 100644
--- a/method/dde_launcher_method.py
+++ b/method/dde_launcher_method.py
@@ -9,9 +9,7 @@ from method.base_method import BaseMethod
 from method.dde_dock_method import DdeDockMethod
 
 
-@log
 class DdeLauncherMethod(BaseMethod):
-
     def dde_launcher_method_click_search_box_by_attr(self):
         """在启动器中点击搜索框"""
         pylinuxauto.find_element_by_attr_path(
@@ -20,18 +18,8 @@ class DdeLauncherMethod(BaseMethod):
 
     def dde_launcher_method_click_all_categories_or_back_by_attr(self):
         """点击启动器下方的 所有分类 或者 返回"""
-        pylinuxauto.find_element_by_attr_path(
-            "/dde-launcher/AllIcon"
-        ).click()
+        pylinuxauto.find_element_by_attr_path("/dde-launcher/AllIcon").click()
 
     def dde_launcher_method_click_system_manager_in_all_categories_view(self):
         """在启动器的 所有分类 界面点击 系统管理"""
-        DdeLauncherMethod().dde_method_click_by_img("system_manager_in_all_categories_view.png")
-
-
-
-
-
-if __name__ == '__main__':
-    DdeDockMethod().dde_dock_method_click_launcher_btn_by_attr()
-    DdeLauncherMethod().dde_launcher_method_click_all_categories_or_back_by_attr()
\ No newline at end of file
+        self.dde_method_click_by_img("system_manager_in_all_categories_view.png")
diff --git a/method/dde_method.py b/method/dde_method.py
index 95b6286..422016a 100644
--- a/method/dde_method.py
+++ b/method/dde_method.py
@@ -7,49 +7,90 @@
 
 from time import sleep
 from funnylog2.config import config as funnylog2_config
+
+from config import config
+
 funnylog2_config.CLASS_NAME_ENDSWITH = ["Method"]
 from youqu3 import log
 from youqu3.gui import pylinuxauto
-from config import config
-from method.base_method import BaseMethod
 from method.dde_dock_method import DdeDockMethod
 from method.dde_control_center_method import DdeControlCenterMethod
 from method.dde_launcher_method import DdeLauncherMethod
 
 
 @log
-class DdeMethod(BaseMethod):
+class DdeMethod(DdeDockMethod, DdeControlCenterMethod, DdeLauncherMethod):
     """应用方法主类"""
 
-
     def dde_method_open_software_by_launcher(self, text):
         """通过启动器打开软件"""
-        DdeDockMethod().dde_dock_method_click_launcher_btn_by_attr()
-        DdeLauncherMethod().dde_launcher_method_click_search_box_by_attr()
+        self.dde_dock_method_click_launcher_btn_by_attr()
+        self.dde_launcher_method_click_search_box_by_attr()
         pylinuxauto.input_message(text)
         pylinuxauto.enter()
 
     def dde_method_close_window(self):
         """关闭窗口"""
-        DdeMethod().dde_method_click_by_img("close_window_btn.png")
+        self.dde_method_click_by_img("close_window_btn.png")
+
+    def dde_method_delete_keyboard_layout_in_control_center(self):
+        """在控制中心的键盘布局视图删除除选中之外的布局"""
+        self.dde_control_center_method_click_edit_btn_in_keyboard_layout()
+        self.dde_control_center_click_delete_btn_by_img()
 
     def dde_method_add_hanyu_keyboard_layout_in_control_center(self):
-        """在 键盘布局 界面添加 汉语"""
-        DdeDockMethod().dde_dock_method_click_control_center_btn_by_attr()
+        """在控制中心中添加 汉语 键盘布局"""
+        self.dde_dock_method_click_control_center_btn_by_attr()
         sleep(6)
-        DdeControlCenterMethod().dde_control_center_method_click_keyboard_and_language_by_attr()
-        DdeControlCenterMethod().dde_control_center_method_click_keyboard_layout_by_attr()
-        DdeControlCenterMethod().dde_control_center_method_click_add_keyboard_layout_btn_by_attr()
-        DdeControlCenterMethod().dde_control_center_method_click_hanyu_keyboard_layout_at_list()
-        DdeControlCenterMethod().dde_control_center_method_click_bottom_add_btn_by_attr()
-
+        self.dde_control_center_method_click_keyboard_and_language_by_attr()
+        self.dde_control_center_method_click_keyboard_layout_by_attr()
+        self.dde_control_center_method_click_add_keyboard_layout_btn_by_attr()
+        self.dde_control_center_method_click_hanyu_keyboard_layout_at_list()
+        self.dde_control_center_method_click_bottom_add_btn_by_attr()
 
-    def dde_method_delete_keyboard_layout_by_img(self):
-        """在键盘布局界面删除列表中的其他布局"""
-        DdeControlCenterMethod().dde_control_center_method_click_edit_btn_in_keyboard_layout()
-        DdeControlCenterMethod().dde_control_center_click_delete_keyboard_layout_btn_by_img()
+    def dde_method_add_english_system_language_in_control_center(self):
+        """在控制中心中添加 英语 系统语言"""
+        self.dde_dock_method_click_control_center_btn_by_attr()
+        sleep(6)
+        self.dde_control_center_enter_view_by_search_box("xitongyuyan")
+        sleep(2)
+        self.dde_control_center_method_click_by_attr("American English - 美国英语")
+        self.dde_control_center_method_click_bottom_add_btn_by_attr()
 
+    def dde_method_delete_system_language_by_img(self):
+        """在 系统语言 视图中删除其他的系统语言"""
+        self.dde_control_center_method_click_edit_btn_in_system_language()
+        self.dde_control_center_click_delete_btn_by_img()
 
+    def dde_method_add_account_by_control_center(self):
+        """在控制中心中添加新的账户 test"""
+        self.dde_dock_method_click_control_center_btn_by_attr()
+        sleep(6)
+        self.dde_control_center_enter_view_by_search_box("zhanghu")
+        sleep(2)
+        self.dde_control_center_method_click_by_attr("Btn_创建帐户")
+        self.dde_control_center_method_click_by_attr("Editable_usernameedit")
+        pylinuxauto.input_message("test")
+        sleep(2)
+        pylinuxauto.tab()
+        pylinuxauto.input_message("test")
+        sleep(2)
+        pylinuxauto.tab()
+        pylinuxauto.input_message(self.account_massage)
+        sleep(3)
+        pylinuxauto.tab()
+        pylinuxauto.tab()
+        pylinuxauto.input_message(self.account_massage)
+        sleep(3)
+        self.dde_control_center_method_click_by_attr("Btn_创建")
+        pylinuxauto.input_message(self.account_massage)
+        sleep(3)
+        pylinuxauto.enter()
+        sleep(5)
 
-if __name__ == "__main__":
-    DdeMethod().dde_method_add_hanyu_keyboard_layout_in_control_center()
\ No newline at end of file
+    def dde_method_delete_test_account_by_control_center(self):
+        """在控制中心中将新添加的账户test删除"""
+        self.dde_control_center_method_click_by_attr("test")
+        self.dde_control_center_method_click_by_attr("Btn_删除帐户")
+        self.dde_control_center_method_click_by_attr("Btn_删除")
+        sleep(5)
-- 
Gitee