Browse Source

Add (Switch Account)

ChengRanORZ 2 years ago
parent
commit
3155446d0d

+ 88 - 0
tasks/Component/SwitchAccount/assets.py

@@ -0,0 +1,88 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class SwitchAccountAssets: 
+
+
+	# Click Rule Assets
+	# 账号下拉菜单 
+	C_SA_LOGIN_FORM_DROPDOWN_BTN = RuleClick(roi_front=(470,280,350,100), roi_back=(470,280,350,100), name="sa_login_form_dropdown_btn")
+	# 登录按钮 
+	C_SA_LOGIN_FORM_LOGIN_BTN = RuleClick(roi_front=(535,420,240,60), roi_back=(535,420,240,60), name="sa_login_form_login_btn")
+	# 登录界面-用户中心按钮默认位置 
+	C_SA_LOGIN_FORM_USER_CENTER = RuleClick(roi_front=(1210,230,40,40), roi_back=(1210,230,40,40), name="sa_login_form_user_center")
+	# 登录界面-切换服务器按钮 
+	C_SA_LOGIN_FORM_SWITCH_SVR_BTN = RuleClick(roi_front=(550,510,280,35), roi_back=(550,510,280,35), name="sa_login_form_switch_svr_btn")
+	# 登录界面-进入游戏按钮 
+	C_SA_LOGIN_FORM_ENTER_GAME_BTN = RuleClick(roi_front=(570,580,130,35), roi_back=(570,580,130,35), name="sa_login_form_enter_game_btn")
+	# 登录界面-选择服务器-底部账号信息展开后的区域 
+	C_SA_LOGIN_FORM_CHARACTER_AREA = RuleClick(roi_front=(260,450,760,160), roi_back=(260,450,760,160), name="sa_login_form_character_area")
+	# 登录界面-选择服务器-点击关闭选择服务器界面的空白区域 
+	C_SA_LOGIN_FORM_CANCEL_SVR_SELECT = RuleClick(roi_front=(50,70,60,360), roi_back=(50,70,60,360), name="sa_login_form_cancel_svr_select")
+	# 登录界面-用户中心-右上角关闭按钮 
+	C_SA_LOGIN_FORM_USER_CENTER_CLOSE_BTN = RuleClick(roi_front=(1055,120,20,20), roi_back=(1055,120,20,20), name="sa_login_form_user_center_close_btn")
+	# 登录界面-账号选择界面-右上角关闭按钮 
+	C_SA_LOGIN_FORM_ACCOUNT_CLOSE_BTN = RuleClick(roi_front=(895,165,40,40), roi_back=(895,165,40,40), name="sa_login_form_account_close_btn")
+	# 游戏庭院内 左上角 头像 
+	C_SA_EG_PROFILE_PHOTO = RuleClick(roi_front=(35,35,55,55), roi_back=(35,35,55,55), name="sa_eg_profile_photo")
+	# 选择服务器界面 底部角色名 列表---与ocr.json中同名对象区域一致 
+	C_SA_SELECT_SVR_CHARACTER_LIST = RuleClick(roi_front=(205,570,815,40), roi_back=(205,570,815,40), name="sa_select_svr_character_list")
+
+
+	# Ocr Rule Assets
+	# 登录页面服务器名称 
+	O_SA_LOGIN_FORM_SVR_NAME = RuleOcr(roi=(545,510,140,40), area=(545,510,140,40), mode="SINGLE", method="Default", keyword="", name="sa_login_form_svr_name")
+	# 选择服务器界面 底部角色所属服务器名 列表 
+	O_SA_SELECT_SVR_SVR_LIST = RuleOcr(roi=(205,540,815,25), area=(205,540,815,25), mode="FULL", method="Default", keyword="", name="sa_select_svr_svr_list")
+	# 选择服务器界面 底部角色名 列表 
+	O_SA_SELECT_SVR_CHARACTER_LIST = RuleOcr(roi=(205,570,815,40), area=(205,570,815,40), mode="FULL", method="Default", keyword="", name="sa_select_svr_character_list")
+	# 选择账号界面 账号列表 
+	O_SA_ACCOUNT_ACCOUNT_LIST = RuleOcr(roi=(460,280,440,330), area=(460,280,440,330), mode="FULL", method="Default", keyword="", name="sa_account_account_list")
+	# 选择账号界面 已选择的账号 
+	O_SA_ACCOUNT_ACCOUNT_SELECTED = RuleOcr(roi=(460,280,370,50), area=(460,280,370,50), mode="SINGLE", method="Default", keyword="", name="sa_account_account_selected")
+	# 登录界面 用户中心(区别于游戏内用户中心) 账户名 
+	O_SA_LOGIN_FORM_USER_CENTER_ACCOUNT = RuleOcr(roi=(290,185,290,50), area=(290,185,290,50), mode="SINGLE", method="Default", keyword="", name="sa_login_form_user_center_account")
+
+
+	# Swipe Rule Assets
+	# 登录界面 服务器列表的手指向左滑动 
+	S_SA_SVR_SWIPE_LEFT = RuleSwipe(roi_front=(730,460,30,21), roi_back=(470,410,26,21), mode="default", name="sa_svr_swipe_left")
+	# 登录界面 账号列表的手指向上滑动 
+	S_SA_ACCOUNT_LIST_UP = RuleSwipe(roi_front=(600,520,30,20), roi_back=(750,270,30,20), mode="default", name="sa_account_list_up")
+
+
+	# Image Rule Assets
+	# 用于判断是否在登录界面的 
+	I_CHECK_LOGIN_FORM = RuleImage(roi_front=(178,572,53,60), roi_back=(1,547,241,105), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/check_login_form.png")
+	# 游戏内-点击头像弹出的设置界面-左侧-用户中心按钮 
+	I_SA_USER_CENTER = RuleImage(roi_front=(190,390,330,200), roi_back=(190,390,330,200), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_user_center.png")
+	# 游戏内-点击头像弹出的设置界面-顶部设置字样 
+	I_SA_USER_CENTER_PROFILE = RuleImage(roi_front=(590,60,90,55), roi_back=(590,60,90,55), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_user_center_profile.png")
+	# 游戏内点击用户中心后弹出的 切换用户按钮 
+	I_SA_SWITCH_ACCOUNT_BTN = RuleImage(roi_front=(930,170,160,75), roi_back=(930,170,160,75), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_switch_account_btn.png")
+	# 登录界面 已登录状态下 点击用户中心后弹出的对话框中 复制账号按钮 
+	I_SA_USER_CENTER_COPY_BTN = RuleImage(roi_front=(460,280,640,50), roi_back=(460,280,640,50), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_user_center_copy_btn.png")
+	# 登录界面-选取账号界面-顶部网易游戏LOGO 
+	I_SA_NETEASE_GAME_LOGO = RuleImage(roi_front=(500,170,300,90), roi_back=(500,170,300,90), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_netease_game_logo.png")
+	# 登录界面-选取账号界面-账号下拉菜单-关闭标志. 
+	I_SA_ACCOUNT_DROP_DOWN_CLOSED = RuleImage(roi_front=(850,320,30,25), roi_back=(850,320,30,25), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_account_drop_down_closed.png")
+	# 登录界面-选取账号界面-账号下拉菜单-添加新账号. 
+	I_SA_ACCOUNT_DROP_DOWN_ADD_ACCOUNT = RuleImage(roi_front=(400,540,220,60), roi_back=(400,540,220,60), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_account_drop_down_add_account.png")
+	# 登录界面-选取账号界面-账号下拉菜单-已经打开标志. 
+	I_SA_ACCOUNT_LOGIN_BTN = RuleImage(roi_front=(400,400,480,90), roi_back=(400,400,480,90), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_account_login_btn.png")
+	# 登录界面-选择手机类型为苹果. 
+	I_SA_LOGIN_FORM_APPLE = RuleImage(roi_front=(490,350,100,100), roi_back=(490,350,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_login_form_apple.png")
+	# 登录界面-选择手机类型为android 
+	I_SA_LOGIN_FORM_ANDROID = RuleImage(roi_front=(690,350,100,100), roi_back=(690,350,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_login_form_android.png")
+	# 判断是否在 选择服务器 界面的标志物 角色的服务器图标还未显示时 
+	I_SA_CHECK_SELECT_SVR_1 = RuleImage(roi_front=(240,530,120,40), roi_back=(240,530,120,40), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_check_select_svr.png")
+	# 判断是否在 选择服务器 界面的标志物 角色的服务器图标已经显示时 
+	I_SA_CHECK_SELECT_SVR_2 = RuleImage(roi_front=(240,410,120,40), roi_back=(240,410,120,40), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_check_select_svr.png")
+
+

+ 68 - 0
tasks/Component/SwitchAccount/click.json

@@ -0,0 +1,68 @@
+[
+  {
+    "itemName": "sa_login_form_dropdown_btn",
+    "roiFront": "470,280,350,100",
+    "roiBack": "470,280,350,100",
+    "description": "账号下拉菜单"
+  },
+  {
+    "itemName": "sa_login_form_login_btn",
+    "roiFront": "535,420,240,60",
+    "roiBack": "535,420,240,60",
+    "description": "登录按钮"
+  },
+  {
+    "itemName": "sa_login_form_user_center",
+    "roiFront": "1210,230,40,40",
+    "roiBack": "1210,230,40,40",
+    "description": "登录界面-用户中心按钮默认位置"
+  },
+  {
+    "itemName": "sa_login_form_switch_svr_btn",
+    "roiFront": "550,510,280,35",
+    "roiBack": "550,510,280,35",
+    "description": "登录界面-切换服务器按钮"
+  },
+  {
+    "itemName": "sa_login_form_enter_game_btn",
+    "roiFront": "570,580,130,35",
+    "roiBack": "570,580,130,35",
+    "description": "登录界面-进入游戏按钮"
+  },
+  {
+    "itemName": "sa_login_form_character_area",
+    "roiFront": "260,450,760,160",
+    "roiBack": "260,450,760,160",
+    "description": "登录界面-选择服务器-底部账号信息展开后的区域"
+  },
+  {
+    "itemName": "sa_login_form_cancel_svr_select",
+    "roiFront": "50,70,60,360",
+    "roiBack": "50,70,60,360",
+    "description": "登录界面-选择服务器-点击关闭选择服务器界面的空白区域"
+  },
+  {
+    "itemName": "sa_login_form_user_center_close_btn",
+    "roiFront": "1055,120,20,20",
+    "roiBack": "1055,120,20,20",
+    "description": "登录界面-用户中心-右上角关闭按钮"
+  },
+  {
+    "itemName": "sa_login_form_account_close_btn",
+    "roiFront": "895,165,40,40",
+    "roiBack": "895,165,40,40",
+    "description": "登录界面-账号选择界面-右上角关闭按钮"
+  },
+  {
+    "itemName": "sa_eg_profile_photo",
+    "roiFront": "35,35,55,55",
+    "roiBack": "35,35,55,55",
+    "description": "游戏庭院内 左上角 头像"
+  },
+  {
+    "itemName": "sa_select_svr_character_list",
+    "roiFront": "205,570,815,40",
+    "roiBack": "205,570,815,40",
+    "description": "选择服务器界面 底部角色名 列表---与ocr.json中同名对象区域一致"
+  }
+]

+ 13 - 0
tasks/Component/SwitchAccount/exit_game.py

@@ -0,0 +1,13 @@
+from tasks.Component.SwitchAccount.assets import SwitchAccountAssets
+from tasks.base_task import BaseTask
+from module.logger import logger
+
+
+class ExitGame(BaseTask, SwitchAccountAssets):
+
+    def exitGame(self):
+        logger.info("start game exit")
+        # 打开该页面比较慢 如果interval短 将发生异常
+        self.ui_click(self.C_SA_EG_PROFILE_PHOTO, self.I_SA_USER_CENTER_PROFILE, 3)
+        self.ui_click(self.I_SA_USER_CENTER, self.I_SA_SWITCH_ACCOUNT_BTN, 6)
+        self.ui_click_until_disappear(self.I_SA_SWITCH_ACCOUNT_BTN, 3)

+ 323 - 0
tasks/Component/SwitchAccount/login_account.py

@@ -0,0 +1,323 @@
+import math
+import time
+
+import cv2
+from module.atom.click import RuleClick
+from module.atom.image import RuleImage
+from module.atom.ocr import RuleOcr
+from module.logger import logger
+from tasks.Component.SwitchAccount.assets import SwitchAccountAssets
+from tasks.Component.SwitchAccount.switch_account_config import AccountInfo
+from tasks.base_task import BaseTask
+
+
+class LoginAccount(BaseTask, SwitchAccountAssets):
+
+    def get_svr_name(self):
+        self.screenshot()
+        ocrRes = self.O_SA_LOGIN_FORM_SVR_NAME.ocr(self.device.image)
+        return ocrRes
+
+    def switch_svr(self, svrName: str):
+        """
+            需保证账号已登录 且处于登录界面
+        @param svrName:
+        @type svrName:
+        """
+        self.O_SA_LOGIN_FORM_SVR_NAME.keyword = svrName
+        if self.ocr_appear(self.O_SA_LOGIN_FORM_SVR_NAME):
+            return True
+        self.ui_click(self.C_SA_LOGIN_FORM_SWITCH_SVR_BTN, self.I_SA_CHECK_SELECT_SVR_1, 1.5)
+        # 展开底部角色列表,显示角色所属服务器
+        self.screenshot()
+        if self.appear(self.I_SA_CHECK_SELECT_SVR_1) and (not self.appear(self.I_SA_CHECK_SELECT_SVR_2)):
+            self.click(self.O_SA_SELECT_SVR_CHARACTER_LIST)
+
+        self.O_SA_SELECT_SVR_SVR_LIST.keyword = svrName
+        found = False
+        lastSvrList: tuple = ()
+        while 1:
+            self.screenshot()
+            # 灰度图
+            self.device.image = cv2.cvtColor(self.device.image, cv2.COLOR_BGR2GRAY)
+            # ret, self.device.image = cv2.threshold(self.device.image, 200, 255, cv2.THRESH_OTSU)
+            ret, self.device.image = cv2.threshold(self.device.image, 100, 255, cv2.THRESH_BINARY)
+            # self.device.image = cv2.adaptiveThreshold(self.device.image, 255, cv2.ADAPTIVE_THRESH_GAUSSIAN_C, cv2.THRESH_BINARY, 25, 10)
+            self.device.image = abs(255 - self.device.image)
+
+            # RGB图
+            self.device.image = cv2.cvtColor(self.device.image, cv2.COLOR_GRAY2RGB)
+
+            ocrRes = self.O_SA_SELECT_SVR_SVR_LIST.detect_and_ocr(self.device.image)
+            # 受限于图像识别文字准确率,此处对识别结果与实际服务器名字 进行检查 字重合度大于阈值 就认为查找成功
+            thresh = 0.5
+            ocrSvrList = [res.ocr_text for res in ocrRes]
+            for index, ocrSvrName in enumerate(ocrSvrList):
+                if len(ocrSvrName) < 3:
+                    break
+                tmp = set(svrName).intersection(set(ocrSvrName))
+                if len(tmp) > max(len(svrName), len(ocrSvrName)) * thresh:
+                    logger.info("found svr %s which is similar with %s", ocrSvrName, svrName)
+                    found = True
+                    # 确定点击位置
+                    box = ocrRes[index].box
+                    self.O_SA_SELECT_SVR_SVR_LIST.area = [self.O_SA_SELECT_SVR_SVR_LIST.roi[0] + box[0][0],
+                                                          self.O_SA_SELECT_SVR_SVR_LIST.roi[1] + box[0][1],
+                                                          box[1][0] - box[0][0],
+                                                          box[2][1] - box[1][1]]
+                    # 跳出此层for循环
+                    break
+            # 两次OCR结果相等表示滑动到最右侧
+            if found or lastSvrList == ocrSvrList:
+                break
+            lastSvrList = ocrSvrList
+            self.swipe(self.S_SA_SVR_SWIPE_LEFT)
+            time.sleep(3.5)
+        if found:
+            self.click(self.O_SA_SELECT_SVR_SVR_LIST, interval=1.5)
+            return True
+        # 没找到 点击空白区域关闭选择服务器界面
+        self.click(self.C_SA_LOGIN_FORM_CANCEL_SVR_SELECT)
+        return False
+
+    def switch_character(self, characterName: str):
+        """
+              需保证账号已登录 且处于登录界面
+        @param characterName:
+        @type str:
+        @return:
+        @rtype:
+        """
+        logger.info("start switch_character")
+        self.ui_click(self.C_SA_LOGIN_FORM_SWITCH_SVR_BTN, self.I_SA_CHECK_SELECT_SVR_1)
+        # 展开底部角色列表,显示角色所属服务器
+        self.screenshot()
+        while (not self.appear(self.I_SA_CHECK_SELECT_SVR_2)) and self.appear(self.I_SA_CHECK_SELECT_SVR_1):
+            logger.info("open svr icon")
+            self.click(self.C_SA_SELECT_SVR_CHARACTER_LIST, interval=1.5)
+            self.wait_until_appear(self.I_SA_CHECK_SELECT_SVR_2, False, 1)
+            # self.ui_click(self.C_SA_SELECT_SVR_CHARACTER_LIST, self.I_SA_CHECK_SELECT_SVR_2, 1.5)
+            self.screenshot()
+
+        self.O_SA_SELECT_SVR_CHARACTER_LIST.keyword = characterName
+        lastCharacterNameList = []
+        while 1:
+            self.screenshot()
+            ocrRes = self.O_SA_SELECT_SVR_CHARACTER_LIST.detect_and_ocr(self.device.image)
+            # 去除角色等级数字
+            characterNameList = [ocrResItem.ocr_text.lstrip('1234567890 ([<>])【】()《》') for ocrResItem in ocrRes]
+            logger.info(characterNameList)
+            ocrResBoxList = [ocrResItem.box for ocrResItem in ocrRes]
+            for index, item in enumerate(characterNameList):
+                if item != characterName:
+                    continue
+                tmp = self.O_SA_SELECT_SVR_CHARACTER_LIST
+                from copy import deepcopy
+                tmpClick = RuleClick(
+                    roi_back=deepcopy(tmp.roi),
+                    roi_front=[
+                        tmp.roi[0] + ocrResBoxList[index][0][0],
+                        tmp.roi[1] + ocrResBoxList[index][0][1],
+                        ocrResBoxList[index][1][0] - ocrResBoxList[index][0][0],
+                        ocrResBoxList[index][2][1] - ocrResBoxList[index][1][1]],
+                    name="tmpClick"
+                )
+
+                # 此时 tmp 内存储的时角色名位置,而点击角色名没有反应
+                # 所以需要获取到对应的服务器图标位置
+                tmpClick.roi_front[1] -= 30
+                self.ui_click_until_disappear(tmpClick, stop=self.I_SA_CHECK_SELECT_SVR_2,
+                                              interval=3)
+                logger.info("character %s found,and clicked svr icon", characterName)
+                return True
+            if lastCharacterNameList == characterNameList:
+                break
+            logger.info(f'{characterName} not found,start swipe')
+            lastCharacterNameList = characterNameList
+            self.swipe(self.S_SA_SVR_SWIPE_LEFT)
+            # 等待滑动动画完成
+            time.sleep(1.5)
+
+        self.click(self.C_SA_LOGIN_FORM_CANCEL_SVR_SELECT, 1.5)
+        return False
+
+    def jump2SelectAccount(self):
+        """
+            跳转到切换账号页面 该页面有红色登录按钮
+        @return:
+        @rtype:
+        """
+        while 1:
+            if self.appear(self.I_SA_NETEASE_GAME_LOGO) and self.appear(self.I_SA_ACCOUNT_LOGIN_BTN):
+                return
+            if self.appear_then_click(self.I_SA_SWITCH_ACCOUNT_BTN, 1.5):
+                continue
+            if self.appear(self.I_CHECK_LOGIN_FORM):
+                self.click(self.C_SA_LOGIN_FORM_USER_CENTER, 1.5)
+                continue
+        return
+
+    def selectAccount(self, accountInfo: AccountInfo):
+        logger.info("start selectAccount")
+        self.O_SA_ACCOUNT_ACCOUNT_LIST.keyword = accountInfo.account
+        self.O_SA_ACCOUNT_ACCOUNT_SELECTED.keyword = accountInfo.account
+        # 正常情况一次就行,但防不住OCR搞幺蛾子 保险起见 多来几次吧 反正挂机不差这点
+        for i in range(3):
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_SA_ACCOUNT_DROP_DOWN_CLOSED):
+                    if self.ocr_appear(self.O_SA_ACCOUNT_ACCOUNT_SELECTED):
+                        break
+                    self.ui_click_until_disappear(self.I_SA_ACCOUNT_DROP_DOWN_CLOSED,
+                                                  interval=1.5)
+                    continue
+
+                # 账号列表已打开状态
+                ocrRes = self.O_SA_ACCOUNT_ACCOUNT_LIST.detect_and_ocr(self.device.image)
+
+                # 找到该账号
+                for index, ocr_account in enumerate([ocrResItem.ocr_text for ocrResItem in ocrRes]):
+                    if not accountInfo.is_account_alias(ocr_account):
+                        continue
+                    # if accountInfo.account in [ocrResItem.ocr_text for ocrResItem in ocrRes]:
+                    #     index = [ocrResItem.ocr_text for ocrResItem in ocrRes].index(accountInfo.account)
+                    ocrResBoxList = [ocrResItem.box for ocrResItem in ocrRes]
+                    tmpObj = self.O_SA_ACCOUNT_ACCOUNT_LIST
+                    self.O_SA_ACCOUNT_ACCOUNT_LIST.area = [
+                        self.O_SA_ACCOUNT_ACCOUNT_LIST.roi[0] + ocrResBoxList[index][0][
+                            0],
+                        self.O_SA_ACCOUNT_ACCOUNT_LIST.roi[1] + ocrResBoxList[index][0][
+                            1],
+                        ocrResBoxList[index][1][0] - ocrResBoxList[index][0][0],
+                        ocrResBoxList[index][2][1] - ocrResBoxList[index][1][1]]
+                    time.sleep(1)
+                    self.click(self.O_SA_ACCOUNT_ACCOUNT_LIST)
+                    logger.info("account [ %s ] found", accountInfo.account)
+                    return True
+
+                # 未找到该账号
+                if self.appear(self.I_SA_ACCOUNT_DROP_DOWN_ADD_ACCOUNT):
+                    break
+                self.swipe(self.S_SA_ACCOUNT_LIST_UP, 1.5)
+                time.sleep(0.5)
+        logger.info("account [ %s ] not found ", accountInfo.account)
+        return False
+
+    # def loginSubmit(self, appleOrAndroid: bool):
+    #     """
+    #
+    #     @param appleOrAndroid: 安卓平台还是苹果平台
+    #     @type appleOrAndroid:   False           Apple
+    #                             True            Android
+    #     @return:
+    #     @rtype:
+    #     """
+    #     self.screenshot()
+    #     if not (self.appear(self.I_SA_ACCOUNT_LOGIN_BTN) and self.appear(self.I_SA_NETEASE_GAME_LOGO)):
+    #         # 不在登录界面,返回失败
+    #         return False
+    #     self.ui_click(self.C_SA_LOGIN_FORM_LOGIN_BTN, self.I_SA_LOGIN_FORM_APPLE, 1)
+    #     if appleOrAndroid:
+    #         logger.info("APPLE selected")
+    #         self.ui_click_until_disappear(self.I_SA_LOGIN_FORM_APPLE, 1)
+    #     else:
+    #         logger.info("ANDROID selected")
+    #         self.ui_click_until_disappear(self.I_SA_LOGIN_FORM_ANDROID, 1)
+    #     return True
+
+    def login(self, accountInfo: AccountInfo) -> bool:
+        """
+
+        @param accountInfo:
+        @type accountInfo:
+        @return:    True    点击了"进入游戏"按钮
+                    False   未找到相应角色
+        @rtype:bool
+        """
+        self.screenshot()
+        #
+        if not (self.appear(self.I_CHECK_LOGIN_FORM) or self.appear(self.I_SA_NETEASE_GAME_LOGO)):
+            logger.error("Unknown Page,%s %s Login Failed", accountInfo.character, accountInfo.svr)
+            return False
+
+        #
+        isAccountLogon = False
+        isCharacterSelected = False
+        self.O_SA_ACCOUNT_ACCOUNT_SELECTED.keyword = accountInfo.account
+        self.O_SA_LOGIN_FORM_USER_CENTER_ACCOUNT.keyword = accountInfo.account
+        while 1:
+            self.screenshot()
+            # 处于 选择服务器界面 直接点击空白区域退出该界面 进入切换账号流程
+            if self.appear(self.I_SA_CHECK_SELECT_SVR_1) or self.appear(self.I_SA_CHECK_SELECT_SVR_2):
+                self.click(self.C_SA_LOGIN_FORM_CANCEL_SVR_SELECT)
+                continue
+
+            # 处于选择 苹果安卓界面
+            if self.appear(self.I_SA_LOGIN_FORM_APPLE):
+                btn = self.I_SA_LOGIN_FORM_ANDROID if accountInfo.appleOrAndroid else self.I_SA_LOGIN_FORM_APPLE
+                self.ui_click_until_disappear(btn)
+                isAccountLogon = True
+                continue
+            # 处于选择账号界面
+            if self.appear(self.I_SA_NETEASE_GAME_LOGO) and not self.appear(self.I_SA_LOGIN_FORM_APPLE):
+                if not accountInfo.account:
+                    logger.error("param account is None,cannot switch account")
+                    return False
+                # 当前选择账号不是account
+                if not self.ocr_appear(self.O_SA_ACCOUNT_ACCOUNT_SELECTED):
+                    # 没有找到account
+                    if not self.selectAccount(accountInfo):
+                        self.ui_click_until_disappear(self.C_SA_LOGIN_FORM_ACCOUNT_CLOSE_BTN,
+                                                      stop=self.I_SA_NETEASE_GAME_LOGO)
+                        return False
+                    # selectAccount 后更新图片
+                    self.screenshot()
+                self.ui_click(self.I_SA_ACCOUNT_LOGIN_BTN, stop=self.I_SA_LOGIN_FORM_APPLE, interval=1)
+                continue
+            # 在用户中心界面
+            if self.appear(self.I_SA_SWITCH_ACCOUNT_BTN):
+                # 如果当前已登录用户就是account
+                ocrRes = self.O_SA_LOGIN_FORM_USER_CENTER_ACCOUNT.ocr_single(self.device.image)
+                # NOTE 由于邮箱账号@符号极易被误识别为其他,故对账号信息做预处理 便于比对
+                if (accountInfo.account is None) or accountInfo.account == "" or accountInfo.is_account_alias(ocrRes):
+                    logger.info("current is the account we want:ocr result %s", ocrRes)
+                    isAccountLogon = True
+                    self.ui_click_until_disappear(self.C_SA_LOGIN_FORM_USER_CENTER_CLOSE_BTN, interval=1,
+                                                  stop=self.I_SA_SWITCH_ACCOUNT_BTN)
+                    continue
+                #
+                if self.ui_click(self.I_SA_SWITCH_ACCOUNT_BTN, self.I_SA_NETEASE_GAME_LOGO):
+                    isAccountLogon = False
+                    continue
+                continue
+            # 在游戏登录界面 不在用户中心 不在切换账号界面
+            if not (self.appear(self.I_SA_NETEASE_GAME_LOGO) or self.appear(self.I_SA_SWITCH_ACCOUNT_BTN)):
+                # 判断是否已经账号登录
+                if not isAccountLogon:
+                    self.click(self.C_SA_LOGIN_FORM_USER_CENTER)
+                    continue
+
+                # 已登录 查找对应角色
+                if not isCharacterSelected and self.switch_character(accountInfo.character):
+                    isCharacterSelected = True
+                    continue
+                break
+            continue
+
+        # 切换角色失败 /未找到该角色
+        # 尝试使用 选择服务器方式
+        if isAccountLogon and not isCharacterSelected and accountInfo.svr is not None and accountInfo.svr != "":
+            logger.info("try to find character with svrName %s", accountInfo.svr)
+            isCharacterSelected = self.switch_svr(accountInfo.svr)
+        if isAccountLogon and isCharacterSelected:
+            # 成功登录账号 找到角色
+            # self.ui_click_until_disappear(self.C_SA_LOGIN_FORM_ENTER_GAME_BTN, stop=self.I_CHECK_LOGIN_FORM)
+            logger.info("character %s-%s account:%s %s login Success", accountInfo.character, accountInfo.svr,
+                        accountInfo.account,
+                        'Android' if accountInfo.appleOrAndroid else 'Apple')
+            return True
+
+        logger.error("character %s-%s account:%s %s login Failed", accountInfo.character, accountInfo.svr,
+                     accountInfo.account,
+                     'Android' if accountInfo.appleOrAndroid else 'Apple')
+        return False

+ 56 - 0
tasks/Component/SwitchAccount/ocr.json

@@ -0,0 +1,56 @@
+[
+  {
+    "itemName": "sa_login_form_svr_name",
+    "roiFront": "545,510,140,40",
+    "roiBack": "545,510,140,40",
+    "mode": "SINGLE",
+    "method": "Default",
+    "keyword": "",
+    "description": "登录页面服务器名称"
+  },
+  {
+    "itemName": "sa_select_svr_svr_list",
+    "roiFront": "205,540,815,25",
+    "roiBack": "205,540,815,25",
+    "mode": "FULL",
+    "method": "Default",
+    "keyword": "",
+    "description": "选择服务器界面 底部角色所属服务器名 列表"
+  },
+  {
+    "itemName": "sa_select_svr_character_list",
+    "roiFront": "205,570,815,40",
+    "roiBack": "205,570,815,40",
+    "mode": "FULL",
+    "method": "Default",
+    "keyword": "",
+    "description": "选择服务器界面 底部角色名 列表"
+  },
+  {
+    "itemName": "sa_account_account_list",
+    "roiFront": "460,280,440,330",
+    "roiBack": "460,280,440,330",
+    "mode": "FULL",
+    "method": "Default",
+    "keyword": "",
+    "description": "选择账号界面 账号列表"
+  },
+  {
+    "itemName": "sa_account_account_selected",
+    "roiFront": "460,280,370,50",
+    "roiBack": "460,280,370,50",
+    "mode": "SINGLE",
+    "method": "Default",
+    "keyword": "",
+    "description": "选择账号界面 已选择的账号"
+  },
+  {
+    "itemName": "sa_login_form_user_center_account",
+    "roiFront": "290,185,290,50",
+    "roiBack": "290,185,290,50",
+    "mode": "SINGLE",
+    "method": "Default",
+    "keyword": "",
+    "description": "登录界面 用户中心(区别于游戏内用户中心) 账户名"
+  }
+]

BIN
tasks/Component/SwitchAccount/res/check_login_form.png


+ 119 - 0
tasks/Component/SwitchAccount/res/image.json

@@ -0,0 +1,119 @@
+[
+  {
+    "itemName": "check_login_form",
+    "imageName": "check_login_form.png",
+    "roiFront": "178,572,53,60",
+    "roiBack": "1,547,241,105",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用于判断是否在登录界面的"
+  },
+  {
+    "itemName": "sa_user_center",
+    "imageName": "sa_user_center.png",
+    "roiFront": "190,390,330,200",
+    "roiBack": "190,390,330,200",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "游戏内-点击头像弹出的设置界面-左侧-用户中心按钮"
+  },
+  {
+    "itemName": "sa_user_center_profile",
+    "imageName": "sa_user_center_profile.png",
+    "roiFront": "590,60,90,55",
+    "roiBack":  "590,60,90,55",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "游戏内-点击头像弹出的设置界面-顶部设置字样"
+  },
+  {
+    "itemName": "sa_switch_account_btn",
+    "imageName": "sa_switch_account_btn.png",
+    "roiFront": "930,170,160,75",
+    "roiBack": "930,170,160,75",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "游戏内点击用户中心后弹出的 切换用户按钮"
+  },
+  {
+    "itemName": "sa_user_center_copy_btn",
+    "imageName": "sa_user_center_copy_btn.png",
+    "roiFront": "460,280,640,50",
+    "roiBack": "460,280,640,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面 已登录状态下 点击用户中心后弹出的对话框中 复制账号按钮"
+  },
+  {
+    "itemName": "sa_netease_game_logo",
+    "imageName": "sa_netease_game_logo.png",
+    "roiFront": "500,170,300,90",
+    "roiBack": "500,170,300,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面-选取账号界面-顶部网易游戏LOGO"
+  },
+  {
+    "itemName": "sa_account_drop_down_closed",
+    "imageName": "sa_account_drop_down_closed.png",
+    "roiFront": "850,320,30,25",
+    "roiBack": "850,320,30,25",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面-选取账号界面-账号下拉菜单-关闭标志."
+  },
+  {
+    "itemName": "sa_account_drop_down_add_account",
+    "imageName": "sa_account_drop_down_add_account.png",
+    "roiFront": "400,540,220,60",
+    "roiBack": "400,540,220,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面-选取账号界面-账号下拉菜单-添加新账号."
+  },
+  {
+    "itemName": "sa_account_login_btn",
+    "imageName": "sa_account_login_btn.png",
+    "roiFront": "400,400,480,90",
+    "roiBack": "400,400,480,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面-选取账号界面-账号下拉菜单-已经打开标志."
+  },
+  {
+    "itemName": "sa_login_form_apple",
+    "imageName": "sa_login_form_apple.png",
+    "roiFront": "490,350,100,100",
+    "roiBack": "490,350,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面-选择手机类型为苹果."
+  },
+  {
+    "itemName": "sa_login_form_android",
+    "imageName": "sa_login_form_android.png",
+    "roiFront": "690,350,100,100",
+    "roiBack": "690,350,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面-选择手机类型为android"
+  },
+  {
+    "itemName": "sa_check_select_svr_1",
+    "imageName": "sa_check_select_svr.png",
+    "roiFront": "240,530,120,40",
+    "roiBack": "240,530,120,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "判断是否在 选择服务器 界面的标志物 角色的服务器图标还未显示时"
+  },
+  {
+    "itemName": "sa_check_select_svr_2",
+    "imageName": "sa_check_select_svr.png",
+    "roiFront": "240,410,120,40",
+    "roiBack": "240,410,120,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "判断是否在 选择服务器 界面的标志物 角色的服务器图标已经显示时"
+  }
+]

BIN
tasks/Component/SwitchAccount/res/sa_.png


BIN
tasks/Component/SwitchAccount/res/sa_account_drop_down_add_account.png


BIN
tasks/Component/SwitchAccount/res/sa_account_drop_down_closed.png


BIN
tasks/Component/SwitchAccount/res/sa_account_drop_down_opened.png


BIN
tasks/Component/SwitchAccount/res/sa_account_login_btn.png


BIN
tasks/Component/SwitchAccount/res/sa_check_select_svr.png


BIN
tasks/Component/SwitchAccount/res/sa_login_form_android.png


BIN
tasks/Component/SwitchAccount/res/sa_login_form_apple.png


BIN
tasks/Component/SwitchAccount/res/sa_netease_game_logo.png


BIN
tasks/Component/SwitchAccount/res/sa_switch_account_btn.png


BIN
tasks/Component/SwitchAccount/res/sa_user_center.png


BIN
tasks/Component/SwitchAccount/res/sa_user_center_copy_btn.png


BIN
tasks/Component/SwitchAccount/res/sa_user_center_profile.png


+ 16 - 0
tasks/Component/SwitchAccount/swipe.json

@@ -0,0 +1,16 @@
+[
+  {
+    "itemName": "sa_svr_swipe_left",
+    "roiFront": "730,460,30,21",
+    "roiBack": "470,410,26,21",
+    "mode": "default",
+    "description": "登录界面 服务器列表的手指向左滑动"
+  },
+  {
+    "itemName": "sa_account_list_up",
+    "roiFront": "600,520,30,20",
+    "roiBack": "750,270,30,20",
+    "mode": "default",
+    "description": "登录界面 账号列表的手指向上滑动"
+  }
+]

+ 42 - 0
tasks/Component/SwitchAccount/switch_account.py

@@ -0,0 +1,42 @@
+from module.config.config import Config
+from module.device.device import Device
+from tasks.Component.SwitchAccount.assets import SwitchAccountAssets
+from tasks.Component.SwitchAccount.exit_game import ExitGame
+from tasks.Component.SwitchAccount.login_account import LoginAccount
+from tasks.Component.SwitchAccount.switch_account_config import AccountInfo
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_login
+from tasks.base_task import BaseTask
+from tasks.Restart.login import LoginHandler
+
+from module.logger import logger
+
+
+class SwitchAccount(LoginAccount, ExitGame, GameUi, SwitchAccountAssets):
+
+    def __init__(self, config: Config, device: Device, to: AccountInfo, frm: AccountInfo = None):
+        super().__init__(config, device)
+        self.toAccountInfo = to
+        self.fromAccountInfo = frm
+
+    def switchAccount(self):
+        logger.info("start switchAccount %s-%s", self.toAccountInfo.character, self.toAccountInfo.svr)
+        # 判断所处界面
+        curPage = self.ui_get_current_page()
+
+        if curPage != page_login and curPage != page_main:
+            self.ui_goto(page_main)
+            curPage = self.ui_get_current_page()
+        if curPage == page_main:
+            self.exitGame()
+
+        # 处于登录界面
+        if not self.login(self.toAccountInfo):
+            return False
+        logger.info("%s login suc", self.toAccountInfo.character)
+        # 处理位于登录界面各种奇葩弹窗
+        login_handler = LoginHandler(config=self.config, device=self.device)
+        login_handler.set_specific_usr(self.toAccountInfo.svr)
+        login_handler.app_handle_login()
+
+        return True

+ 45 - 0
tasks/Component/SwitchAccount/switch_account_config.py

@@ -0,0 +1,45 @@
+from datetime import datetime
+from pydantic import Field, BaseModel
+
+
+class AccountInfo(BaseModel):
+    """
+        character:   角色名字
+        svr:         角色所在服务器
+        account:     账号
+        appleOrAndroid:  角色所属平台 安卓/苹果(可选)
+                False           Apple
+                True            Android
+    """
+    character: str = Field(default="", description='character_help')
+    svr: str = Field(default="", description="svr_help")
+    account: str = Field(default="", description="account_help")
+    # 为防止ocr出错 暂定格式 字符串以#分割
+    accountAlias: str = Field(default="", description="")
+    appleOrAndroid: bool = Field(default=True, description="apple_or_android_help")
+    # 上一次执行成功的时间 ,防止出错时重复登录浪费时间
+    last_complete_time: datetime = Field(default=datetime(1970, 1, 1, 1, 1, 1), description="last_complete_time_help")
+
+    def is_account_alias(self, ocr_account):
+        tmp_account = AccountInfo.preprocessAccount(self.account)
+        if ocr_account == self.account or ocr_account.startswith(tmp_account):
+            return True
+        if not self.accountAlias:
+            return False
+        _accountAliasList = self.accountAlias.split('#')
+        for alias in _accountAliasList:
+            if ocr_account.startswith(alias):
+                return True
+        return False
+
+    @staticmethod
+    def preprocessAccount(account: str):
+        """
+            预处理账号信息 便于比对
+            邮箱账号        去除@后面的部分 防止@被识别为其他
+        @param account:
+        @type account:
+        @return:
+        @rtype:
+        """
+        return account.split('@')[0]