Просмотр исходного кода

pref(Restart): Add a new mail type

ryland 1 год назад
Родитель
Сommit
bea7940792

+ 2 - 0
tasks/Restart/assets.py

@@ -53,6 +53,8 @@ class RestartAssets:
 	I_HARVEST_ZIDU = RuleImage(roi_front=(785,475,135,135), roi_back=(785,475,135,135), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_zidu.png")
 	# description 
 	I_HARVEST_MAIL_COPY = RuleImage(roi_front=(257,509,29,21), roi_back=(192,472,790,100), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_copy.png")
+	# description 
+	I_HARVEST_MAIL_2 = RuleImage(roi_front=(156,125,65,60), roi_back=(120,94,290,536), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_2.png")
 
 
 	# Click Rule Assets

BIN
tasks/Restart/harvest/harvest_harvest_mail_2.png


+ 9 - 0
tasks/Restart/harvest/image.json

@@ -187,5 +187,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "harvest_mail_2",
+    "imageName": "harvest_harvest_mail_2.png",
+    "roiFront": "156,125,65,60",
+    "roiBack": "120,94,290,536",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

BIN
tasks/Restart/harvest/image_name.png


+ 5 - 1
tasks/Restart/login.py

@@ -260,11 +260,15 @@ class LoginHandler(BaseTask, RestartAssets):
                     self.wait_until_appear(self.I_HARVEST_MAIL_CONFIRM, wait_time=1)
                     timer_harvest.reset()
                     continue
-                #threshold如果是0.9,可能会导致有邮件但无法识别永久卡住
+                # threshold如果是0.9,可能会导致有邮件但无法识别永久卡住
                 if self.appear(self.I_HARVEST_MAIL_OPEN, threshold=0.8):
                     self.click(self.I_HARVEST_MAIL_OPEN, interval=0.8)
                     timer_harvest.reset()
                     continue
+                if self.appear(self.I_HARVEST_MAIL_2):
+                    self.click(self.I_HARVEST_MAIL_2, interval=0.8)
+                    timer_harvest.reset()
+                    continue
                 if ((self.appear(self.I_HARVEST_MAIL) or self.appear(self.I_HARVEST_MAIL_COPY))
                         and not self.appear(self.I_LOGIN_RED_CLOSE)):
                     self.click(self.I_HARVEST_MAIL, interval=2)