Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	paga/DigitalEmployeesPage.py

.idea/QiSelenium.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">

paga/DigitalEmployeesPage.py

@@ -73,6 +73,38 @@ class DEA(BasePage):
         self.find_ele(self.Home_page01).click()
         time.sleep(5)
 
+        # 画师
+        self.Painter_page=(By.XPATH,"(//div[@class='studio-name'][contains(text(),'AI画师')])[1]")
+        #画面描述
+        self.Picture_description=(By.XPATH,"//textarea[@placeholder='请输入画面描述，或者点击右上角画图模版，快速生成同款图片']")
+        #画图模版
+        self.Drawing_template=(By.XPATH,"//div[@class='AiPainterSelectTemplate']//span[1]")
+        # 词库
+        self.Lexicon = (By.XPATH, "//div[@class='SelectCallWord']//span[1]")
+        # 不希望出现的内容
+        self.Unwanted_content=(By.XPATH,"//input[@id='negativePrompt']")
+        # 立即生成
+        self.Immediate_generation=(By.XPATH,"//button[@type='submit']")
+
+        # 书评助理
+        self.Book_review_assistant = (By.XPATH, "(//div[@class='studio-name'][contains(text(),'书评助理')])[1]")
+        # 童书书评
+        self.Children_book_review=(By.XPATH,"(//div[@class='name'][contains(text(),'童书书评')])[1]")
+        # 书名
+        self.Book_name=(By.XPATH,"//*[@id='App']/div/section/div[1]/div[2]/div/div/div/div/div[2]/div/div/div[2]/div[1]/div[2]/div/div[2]/div[1]/div/div[2]/div")
+        # 内容简介
+        self.Content_introduction=(By.XPATH,"//*[@id='App']/div/section/div[1]/div[2]/div/div/div/div/div[2]/div/div/div[2]/div[1]/div[2]/div/div[2]/div[1]/div/div[3]/div")
+        # 作者简介
+        self.Author_introduction=(By.XPATH,"//*[@id='App']/div/section/div[1]/div[2]/div/div/div/div/div[2]/div/div/div[2]/div[1]/div[2]/div/div[2]/div[1]/div/div[4]/div")
+        # 发送
+        self.Send=(By.XPATH,"//button[contains(text(),'发送')]")
+        # 文学书评
+        self.Literary_review=(By.XPATH,"(//div[@class='name'][contains(text(),'文学书评')])[1]")
+        # 社科书评
+        self.Social_science_review=(By.XPATH,"//div[@id='button-2']//div[@class='button-list-item-inner']//div[1]")
+
+
+    #数字编辑助理 - 制作英语听力配音
     # 数字编辑助理 - 制作英语听力配音
     def meld(self):
         self.find_ele(self.Digital_editorial_assistant).click()
@@ -181,6 +213,35 @@ class DEA(BasePage):
         time.sleep(6)
 
 
+    # 画师-画图
+    def painter(self):
+        self.find_ele(self.Painter_page).click()
+        time.sleep(3)
+        self.find_ele(self.Picture_description).send_keys("美丽的花朵")
+        time.sleep(3)
+        # self.find_ele(self.Drawing_template).click()
+        # time.sleep(3)
+        # self.find_ele(self.Lexicon).click()
+        # time.sleep(3)
+        self.find_ele(self.Unwanted_content).send_keys("水滴")
+        time.sleep(3)
+        self.find_ele(self.Immediate_generation).click()
+        time.sleep(120)
+
+    # 书评助理
+    def bookreview(self):
+        self.find_ele(self.Book_review_assistant).click()
+        time.sleep(3)
+        self.find_ele(self.Children_book_review).click()
+        time.sleep(3)
+        self.find_ele(self.Book_name).send_keys("西游记")
+        time.sleep(3)
+        self.find_ele(self.Content_introduction).send_keys("唐僧西天取经")
+        time.sleep(3)
+        self.find_ele(self.Author_introduction).send_keys("罗贯中")
+        time.sleep(3)
+        self.find_ele(self.Send).click()
+        time.sleep(60)
 
 
 if __name__ == '__main__':
@@ -188,7 +249,6 @@ if __name__ == '__main__':
     Login().login(user_name, password)
     RAYSMPB().to_ai_studio()
     AIER().to_ai_room()
-    DEA().mpbokpra_input()
-    # DEA().mmcvo()
+    DEA().mpbokpra()
     Del().delete()
     DriverTools.quit_driver()