Răsfoiți Sursa

fix(device): Can not start game in version 1.7.66

runhey 3 ani în urmă
părinte
comite
ca7a1a5cec
3 a modificat fișierele cu 14 adăugiri și 4 ștergeri
  1. 3 2
      module/device/connection.py
  2. 10 1
      module/device/method/adb.py
  3. 1 1
      tasks/Restart/script_task.py

+ 3 - 2
module/device/connection.py

@@ -104,12 +104,13 @@ class Connection(ConnectionAttr):
 
         # Package
         # self.package = self.config.Emulator_PackageName
-        self.package = self.config.script.device.package_name
+        self.package = self.config.script.device.package_name.value
         if self.package == 'auto':
             self.detect_package()
         else:
             pass
-            set_server(self.package)
+            # 因为用不到就注释掉了
+            # set_server(self.package)
         logger.attr('PackageName', self.package)
         # logger.attr('Server', self.config.SERVER)
 

+ 10 - 1
module/device/method/adb.py

@@ -271,12 +271,21 @@ class Adb(Connection):
             # ## Network stats: elapsed time=4ms (0ms mobile, 0ms wifi, 4ms not connected)
             return True
 
+        logger.warning('Fallback to use am start')
         result = self.adb_shell(['dumpsys', 'package', package_name])
         res = re.search(r'android.intent.action.MAIN:\s+\w+ ([\w.\/]+) filter \w+\s+'
                         r'.*\s+Category: "android.intent.category.LAUNCHER"',
                         result)
         if res:
             activity_name = res.group(1)
+            self.adb_shell(['am', 'start', '-a', 'android.intent.action.MAIN', '-c',
+                            'android.intent.category.LAUNCHER', '-n', activity_name])
+        elif 'com.netease.ntunisdk.base.deeplink.UniDeepLinkActivity' in result:
+            activity_name = 'com.netease.ntunisdk.base.deeplink.UniDeepLinkActivity'
+            result = self.adb_shell([
+                'am', 'start', '-n',
+                'com.netease.onmyoji.wyzymnqsd_cps/com.netease.ntunisdk.base.deeplink.UniDeepLinkActivity'
+            ])
         else:
             if allow_failure:
                 return False
@@ -335,4 +344,4 @@ if __name__ == "__main__":
     adb = Adb(config='oas1')
     # logger.info(adb.app_start_adb())
     cv2.imshow("iiii", adb.screenshot_adb_nc())
-    cv2.waitKey(0)
+    cv2.waitKey(0)

+ 1 - 1
tasks/Restart/script_task.py

@@ -53,7 +53,7 @@ if __name__ == '__main__':
     config = Config('oas2')
     device = Device(config)
     task = ScriptTask(config, device)
-    task.app_restart()
+    task.app_start()