Add: island transport gui

module/island/island.py

@@ -23,7 +23,7 @@ class Island(IslandProjectRun, IslandTransportRun):
         else:
             return []
 
-    def island_run(self, transport=False, project=True, names=None):
+    def island_run(self, transport=True, project=True, names=None):
         """
         Execute island routine.
 
@@ -57,14 +57,16 @@ class Island(IslandProjectRun, IslandTransportRun):
 
     def run(self):
         if server.server in ['cn']:
-            names = self.island_config_to_names(
-                [self.config.__getattribute__(f'Island{i}_Receive') for i in range(1, 16)])
-            if len(names):
+            transport = self.config.IslandTransport_Enable
+            project_config = [self.config.__getattribute__(f'Island{i}_Receive') for i in range(1, 16)]
+            project = any(project_config)
+            names = self.island_config_to_names(project_config)
+            if transport or project:
                 self.ui_ensure(page_dormmenu)
                 self.ui_goto(page_island, get_ship=False)
                 self.device.sleep(0.5)
                 self.ui_ensure(page_island_phone)
-                self.island_run(names=names)
+                self.island_run(transport=transport, project=project, names=names)
                 self.ui_goto(page_main, get_ship=False)
             else:
                 logger.info('Nothing to receive, skip island running')

module/island/project_data.py

@@ -32,7 +32,7 @@ items_data_cn = {
     },
     8: {
         1: '胡萝卜秋梨汁', 2: '菊花茶', 3: '苹果汁', 4: '香蕉芒果汁',
-        5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '草莓蜂蜜冰沙', 8: '薰衣草茶',
+        5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '薰衣草茶', 8: '草莓蜂蜜冰沙',
         9: '阳光蜜水', 10: '缤纷果乐园', 11: '花香果韵',
     },
     9: {

module/island/transport.py

@@ -296,7 +296,7 @@ class IslandTransportRun(IslandUI):
 
             if self.handle_get_items():
                 success = True
-                self.interval_clear(TRANSPORT_START)
+                self.interval_reset(TRANSPORT_START)
                 confirm_timer.reset()
                 continue