Merge pull request LmeSzinc#429 from LmeSzinc/dev

Bug fix

module/device/connection.py

@@ -955,7 +955,7 @@ def list_known_packages(self, show_log=True):
             list[str]: List of package names
         """
         packages = self.list_package(show_log=show_log)
-        packages = [p for p in packages if p in server_.VALID_PACKAGE]
+        packages = [p for p in packages if p in server_.VALID_PACKAGE or p in server_.VALID_CLOUD_PACKAGE]
         return packages
 
     def detect_package(self, set_config=True):

module/device/device.py

@@ -165,6 +165,16 @@ def release_during_wait(self):
         if self.config.Emulator_ScreenshotMethod == 'nemu_ipc':
             self.nemu_ipc_release()
 
+    def get_orientation(self):
+        """
+        Callbacks when orientation changed.
+        """
+        o = super().get_orientation()
+
+        self.on_orientation_change_maatouch()
+
+        return o
+
     def stuck_record_add(self, button):
         self.detect_record.add(str(button))
 

module/device/method/maatouch.py

@@ -102,9 +102,10 @@ class MaaTouch(Connection):
     """
     max_x: int
     max_y: int
-    _maatouch_stream = socket.socket
+    _maatouch_stream: socket.socket = None
     _maatouch_stream_storage = None
     _maatouch_init_thread = None
+    _maatouch_orientation: int = None
 
     @cached_property
     @retry
@@ -137,12 +138,40 @@ def early_maatouch_init_func():
         self._maatouch_init_thread = thread
         thread.start()
 
+    def on_orientation_change_maatouch(self):
+        """
+        MaaTouch caches devices orientation at its startup
+        A restart is required when orientation changed
+        """
+        if self._maatouch_orientation is None:
+            return
+        if self.orientation == self._maatouch_orientation:
+            return
+
+        logger.info(f'Orientation changed {self._maatouch_orientation} => {self.orientation}, re-init MaaTouch')
+        del_cached_property(self, '_maatouch_builder')
+        self.early_maatouch_init()
+
     def maatouch_init(self):
         logger.hr('MaaTouch init')
         max_x, max_y = 1280, 720
         max_contacts = 2
         max_pressure = 50
 
+        # Try to close existing stream
+        if self._maatouch_stream is not None:
+            try:
+                self._maatouch_stream.close()
+            except Exception as e:
+                logger.error(e)
+            del self._maatouch_stream
+        if self._maatouch_stream_storage is not None:
+            del self._maatouch_stream_storage
+
+        # MaaTouch caches devices orientation at its startup
+        super(MaaTouch, self).get_orientation()
+        self._maatouch_orientation = self.orientation
+
         # CLASSPATH=/data/local/tmp/maatouch app_process / com.shxyke.MaaTouch.App
         stream = self.adb_shell(
             ['CLASSPATH=/data/local/tmp/maatouch', 'app_process', '/', 'com.shxyke.MaaTouch.App'],

module/device/method/minitouch.py

@@ -365,7 +365,7 @@ def init():
 
 class Minitouch(Connection):
     _minitouch_port: int = 0
-    _minitouch_client: socket.socket
+    _minitouch_client: socket.socket = None
     _minitouch_pid: int
     _minitouch_ws: websockets.WebSocketClientProtocol
     max_x: int
@@ -409,6 +409,15 @@ def minitouch_init(self):
         max_x, max_y = 1280, 720
         max_contacts = 2
         max_pressure = 50
+
+        # Try to close existing stream
+        if self._minitouch_client is not None:
+            try:
+                self._minitouch_client.close()
+            except Exception as e:
+                logger.error(e)
+            del self._minitouch_client
+
         self.get_orientation()
 
         self._minitouch_port = self.adb_forward("localabstract:minitouch")

tasks/rogue/route/loader.py

@@ -177,6 +177,11 @@ def _position_match_special(
             'Combat_Herta_SupplyZone_F2_X45Y369',
         ] and similarity > 0.20:
             return True
+        # Before Occurrence_Luofu_DivinationCommission_F2_X425Y791
+        if route.name in [
+            'Occurrence_Jarilo_RivetTown_F1_X157Y435',
+        ] and similarity > 0.15:
+            return True
         if route.name in [
             'Combat_Herta_StorageZone_F1_X273Y92',
             'Occurrence_Herta_StorageZone_F1_X273Y93',