telegram_ios脚本提交

7 files changed, 50 insertions, 38 deletions

diff --git a/App_automation/air_test_auto/app/telegram/telegram.py b/App_automation/air_test_auto/app/telegram/telegram.py
index d74e8e3..b284538 100644
--- a/App_automation/air_test_auto/app/telegram/telegram.py
+++ b/App_automation/air_test_auto/app/telegram/telegram.py
@@ -67,9 +67,9 @@ def telegram_app():
 
 def send_message():
     try:
-        set_current(deviceid2)  # 切换手机2
-        stop_app("org.telegram.messenger")  # 关闭app
-        start_app("org.telegram.messenger")  # 打开app
+        # set_current(deviceid2)  # 切换手机2
+        # stop_app("org.telegram.messenger")  # 关闭app
+        # start_app("org.telegram.messenger")  # 打开app
         set_current(deviceid1)#切换手机1
         close_proxy()
         stop_app("org.telegram.messenger")#关闭app
@@ -90,12 +90,6 @@ def send_message():
             poco(name="android.widget.EditText").wait(timeout=20).set_text(message)
             sleep(2)
         poco(desc="Send").click()
-        try:
-            snapshot(msg="telegram_send message")
-            assert_equal(poco(text="online").exists(), True, "telegram_send message succeeded")
-            print("telegram_send message succeeded")
-        except AssertionError:
-            print('telegram_send message failed')
         #发送表情
         sleep(5)
         print("执行发送表情操作")
@@ -109,12 +103,6 @@ def send_message():
         sleep(5)
         poco(desc="Send").click()
         sleep(5)
-        try:
-            snapshot(msg="telegram_send emoji")
-            assert_equal(poco(text="online").exists(), True, "telegram_send emoji succeeded")
-            print("telegram_send emoji succeeded")
-        except AssertionError:
-            print('telegram_send emoji faileded')
         #发送图片
         sleep(2)
         print("执行发送图片操作")
@@ -126,12 +114,6 @@ def send_message():
         if poco(text="Send 1 photo").exists():
             poco(text="Send 1 photo").click()
         sleep(5)
-        try:
-            snapshot(msg="telegram_send pictures")
-            assert_equal(poco(text="online").exists(), True, "telegram_send pictures succeeded")
-            print('telegram_send pictures succeeded')
-        except AssertionError:
-            print("telegram_send pictures failed")
         #发送语音
         print("执行发送语音操作")
         sleep(2)
@@ -139,7 +121,7 @@ def send_message():
         sleep(20)
         try:
             snapshot(msg="telegram_send voice")
-            assert_equal(poco(text="online").exists(), True, "telegram_send voice succeeded")
+            assert_not_equal(poco(text="Connecting...").exists(), True, "telegram_send voice succeeded")
             print('telegram_send voice succeeded')
             print('The test case succeeded', flush=True)
             stop_app("org.telegram.messenger")  # 关闭app
@@ -265,17 +247,20 @@ def voice_calls():
         sleep(2)
         touch(Template(r"tpl1658208885274.png", record_pos=(-0.428, -0.599), resolution=(720, 1280)))
         sleep(5)
-        poco(desc="Call").click()
+        if poco(desc="Call").exists():
+            poco(desc="Call").click()
+        if exists(Template(r"tpl1665734834876.png", record_pos=(0.313, -0.921), resolution=(1236, 2676))):
+            touch(Template(r"tpl1665734834876.png", record_pos=(0.313, -0.921), resolution=(1236, 2676)))
         sleep(10)
-        set_current(deviceid2)
-        start_app("org.telegram.messenger")  # 打开app
-        sleep(5)
-        if exists(Template(r"tpl1656466195927.png", record_pos=(0.247, -0.662), resolution=(720, 1280))):
-            touch(Template(r"tpl1656466195927.png", record_pos=(0.247, -0.662), resolution=(720, 1280)))
-            sleep(30)
-        if exists(Template(r"tpl1661321268810.png", record_pos=(0.306, 0.776), resolution=(1080, 2400))):
-            touch(Template(r"tpl1661321268810.png", record_pos=(0.306, 0.776), resolution=(1080, 2400)))
-            sleep(30)
+        # set_current(deviceid2)
+        # start_app("org.telegram.messenger")  # 打开app
+        # sleep(5)
+        # if exists(Template(r"tpl1656466195927.png", record_pos=(0.247, -0.662), resolution=(720, 1280))):
+        #     touch(Template(r"tpl1656466195927.png", record_pos=(0.247, -0.662), resolution=(720, 1280)))
+        #     sleep(30)
+        # if exists(Template(r"tpl1661321268810.png", record_pos=(0.306, 0.776), resolution=(1080, 2400))):
+        #     touch(Template(r"tpl1661321268810.png", record_pos=(0.306, 0.776), resolution=(1080, 2400)))
+        #     sleep(30)
         try:
             set_current(deviceid1)  # 切换手机1
             sleep(2)
@@ -440,10 +425,21 @@ def socks5():
         poco(text="Add Proxy").click()
         if poco(text="Server").exists():
             poco(text="Server").click()
-        text("192.168.40.206")
+            text("192.168.40.206")
+        if exists(Template(r"tpl1665732623319.png", record_pos=(-0.397, -0.453), resolution=(1236, 2676))):
+            touch(Template(r"tpl1665732623319.png", record_pos=(-0.397, -0.453), resolution=(1236, 2676)))
+            text("192.168.40.206")
         poco(text="1080").set_text("10080")
-        poco(text="Username").set_text("test1")
-        poco(text="Password").set_text("test1")
+        if poco(text="Username").exists():
+            poco(text="Username").set_text("test1")
+        if poco(text="Password").exists():
+            poco(text="Password").set_text("test1")
+        if exists(Template(r"tpl1665732403350.png", record_pos=(-0.356, -0.129), resolution=(1236, 2676))):
+            touch(Template(r"tpl1665732403350.png", record_pos=(-0.356, -0.129), resolution=(1236, 2676)))
+            text("test1")
+        if exists(Template(r"tpl1665732412374.png", record_pos=(-0.366, 0.036), resolution=(1236, 2676))):
+            touch(Template(r"tpl1665732412374.png", record_pos=(-0.366, 0.036), resolution=(1236, 2676)))
+            text("test1")
         sleep(5)
         poco(name="Done").click()
         sleep(10)
@@ -569,9 +565,16 @@ def MTPROTO():
             print("MTProto代理已删除")
         poco(text="Add Proxy").click()
         poco(text="MTProto Proxy").click()
-        poco(text="Server").set_text("8.219.124.218")
+        sleep(2)
+        if poco(text="Server").exists():
+            poco(text="Server").click()
+        text("8.219.124.218")
         poco(text="1080").set_text("443")
-        poco(text="Secret").set_text("eedc71dc954b1bc6a006f1d82e107433f774657374312E73672E6765656467652E6E6574")
+        if poco(text="Secret").exists():
+            poco(text="Secret").set_text("eedc71dc954b1bc6a006f1d82e107433f774657374312E73672E6765656467652E6E6574")
+        if exists(Template(r"tpl1665733119911.png", record_pos=(-0.389, -0.13), resolution=(1236, 2676))):
+            touch(Template(r"tpl1665733119911.png", record_pos=(-0.389, -0.13), resolution=(1236, 2676)))
+            text("eedc71dc954b1bc6a006f1d82e107433f774657374312E73672E6765656467652E6E6574")
         sleep(2)
         poco(desc="Done").click()
         sleep(20)
@@ -1159,7 +1162,7 @@ def report_monitor():
 if __name__ == '__main__':
     telegram = sys.argv
     for i in telegram:
-        if deviceid1 == leidian2 or deviceid1 == xiaoyao or deviceid1 == MUMU or deviceid1 == leidian1:
+        if deviceid1 == leidian2 or deviceid1 == xiaoyao or deviceid1 == MUMU or deviceid1 == leidian1 or deviceid1 == huawei:
             if i == 'open':
                 open()
             elif i == 'closeProxy':
@@ -1311,3 +1314,11 @@ if __name__ == '__main__':
 
 
 
+
+
+
+
+
+
+
+
diff --git a/App_automation/air_test_auto/app/telegram/telegram_ios.py b/App_automation/air_test_auto/app/telegram/telegram_ios.py
index e00c08b..7d13d59 100644
--- a/App_automation/air_test_auto/app/telegram/telegram_ios.py
+++ b/App_automation/air_test_auto/app/telegram/telegram_ios.py
@@ -311,6 +311,7 @@ def close():
 
 def clearApp():
     keyevent("HOME")
+    keyevent("HOME")
     touch(Template(r"tpl1665468348186.png", record_pos=(-0.396, 0.657), resolution=(1170, 2532)))
     touch(Template(r"tpl1665468418365.png", record_pos=(-0.001, 0.756), resolution=(1170, 2532)))
     for i in range(10):
diff --git a/App_automation/air_test_auto/app/telegram/tpl1665732403350.png b/App_automation/air_test_auto/app/telegram/tpl1665732403350.png
new file mode 100644
index 0000000..118e87f
--- /dev/null
+++ b/App_automation/air_test_auto/app/telegram/tpl1665732403350.png
diff --git a/App_automation/air_test_auto/app/telegram/tpl1665732412374.png b/App_automation/air_test_auto/app/telegram/tpl1665732412374.png
new file mode 100644
index 0000000..ad6007d
--- /dev/null
+++ b/App_automation/air_test_auto/app/telegram/tpl1665732412374.png
diff --git a/App_automation/air_test_auto/app/telegram/tpl1665732623319.png b/App_automation/air_test_auto/app/telegram/tpl1665732623319.png
new file mode 100644
index 0000000..3c1feff
--- /dev/null
+++ b/App_automation/air_test_auto/app/telegram/tpl1665732623319.png
diff --git a/App_automation/air_test_auto/app/telegram/tpl1665733119911.png b/App_automation/air_test_auto/app/telegram/tpl1665733119911.png
new file mode 100644
index 0000000..1eeb0a8
--- /dev/null
+++ b/App_automation/air_test_auto/app/telegram/tpl1665733119911.png
diff --git a/App_automation/air_test_auto/app/telegram/tpl1665734834876.png b/App_automation/air_test_auto/app/telegram/tpl1665734834876.png
new file mode 100644
index 0000000..e7738f6
--- /dev/null
+++ b/App_automation/air_test_auto/app/telegram/tpl1665734834876.png