#89 增加忘却之庭配置页面 未完成

.gitignore

@@ -17,4 +17,5 @@ config/app_run_record/
 config/trailblaze_power.yml
 config/echo_of_war.yml
 config/world_patrol.yml
-config/mystool
+config/mystool
+config/forgotten_hall.yml

config/forgotten_hall_sample.yml

@@ -0,0 +1 @@
+team_list: []

src/basic/img/cv2_utils.py

@@ -652,4 +652,4 @@ def scale_image(img: MatLike, scale: float = None, copy: bool = True):
     if scale is None or scale == 1:
         return img.copy() if copy else img
     target_size = (int(img.shape[0] * scale), int(img.shape[1] * scale))
-    return cv2.resize(img, target_size)
+    return cv2.resize(img, target_size)

src/gui/app.py

@@ -1,5 +1,6 @@
-import threading
 import logging
+import threading
+from typing import Optional
 
 import flet as ft
 import keyboard
@@ -8,7 +9,7 @@
 from basic.i18_utils import gt, update_default_lang
 from gui import log_view, calibrator_view, version, one_stop_view, scheduler
 from gui.settings import gui_config, settings_basic_view, settings_trailblaze_power_view, settings_echo_of_war_view, \
-    settings_world_patrol_view, settings_mys_view
+    settings_world_patrol_view, settings_mys_view, settings_forgotten_hall_view
 from gui.settings.gui_config import ThemeColors, GuiConfig
 from gui.sr_basic_view import SrBasicView
 from gui.world_patrol import world_patrol_run_view, world_patrol_draft_route_view, world_patrol_whitelist_view
@@ -116,6 +117,11 @@ def __init__(self, page: ft.Page, ctx: Context):
                     selected_icon=ft.icons.SURROUND_SOUND,
                     label=gt('历战回响', model='ui')
                 ),
+                ft.NavigationRailDestination(
+                    icon=ft.icons.SURROUND_SOUND_OUTLINED,
+                    selected_icon=ft.icons.SURROUND_SOUND,
+                    label=gt('忘却之庭', model='ui')
+                ),
                 ft.NavigationRailDestination(
                     icon=ft.icons.PEOPLE_OUTLINED,
                     selected_icon=ft.icons.PEOPLE,
@@ -175,7 +181,7 @@ def _get_secondary_rail(self):
         else:
             return None
 
-    def _get_view_component(self) -> SrBasicView:
+    def _get_view_component(self) -> Optional[SrBasicView]:
         if self.app_rail.selected_index == 0:
             return one_stop_view.get(self.ctx)
         elif self.app_rail.selected_index == 1:
@@ -197,6 +203,8 @@ def _get_view_component(self) -> SrBasicView:
             elif self.settings_rail.selected_index == 3:
                 return settings_echo_of_war_view.get(self.ctx)
             elif self.settings_rail.selected_index == 4:
+                return settings_forgotten_hall_view.get(self.page, self.ctx)
+            elif self.settings_rail.selected_index == 5:
                 return settings_mys_view.get(self.page, self.ctx)
 
         return None

src/gui/one_stop_view.py

@@ -16,9 +16,7 @@
 from sr.app.routine import echo_of_war, forgotten_hall_app
 from sr.context import Context
 from sr.mystools import mys_config
-from sr.mystools.data_model import StarRailNoteExpedition
 from sr.mystools.mys_config import MysConfig
-from sr.operation.unit import forgotten_hall
 
 info_text_width = 200
 info_text_spacing = 5
@@ -211,11 +209,11 @@ def __init__(self, ctx: Context):
         self.echo = Label2NormalValueRow('历战回响剩余(本地)', '3', '/3')
         training_row = ft.Row(controls=[self.training, self.echo])
 
-        self.sim_rank = Label2NormalValueRow('模拟宇宙', '14000', '/14000')
+        self.sim_rank = Label2NormalValueRow('模拟宇宙', '0', '/14000')
         self.sim_times = Label2NormalValueRow('通关次数', '未实现')
         sim_row = ft.Row(controls=[self.sim_rank, self.sim_times])
 
-        self.hall = Label2NormalValueRow('忘却之庭(本地)', '0')
+        self.hall = Label2NormalValueRow('忘却之庭(本地)', '0', suffix_label='30')
         hall_row = ft.Row(controls=[self.hall])
 
         self.card_title = components.CardTitleText('游戏角色状态')
@@ -385,6 +383,8 @@ def _update_character_status(self, e=None):
         :param e:
         :return:
         """
+        if self.page is None:
+            return
         self._update_character_status_note_part()
         self._update_character_status_local_part()
 

src/gui/settings/settings_forgotten_hall_view.py

@@ -0,0 +1,242 @@
+from typing import Callable, Optional, List
+
+import flet as ft
+from flet_core import Control
+
+from basic.i18_utils import gt
+from basic.log_utils import log
+from gui import components
+from gui.components.character_input import CharacterInput
+from gui.settings import gui_config
+from gui.settings.gui_config import ThemeColors
+from gui.sr_basic_view import SrBasicView
+from sr.app.routine.forgotten_hall_app import ForgottenHallConfig, get_config, ForgottenHallTeam
+from sr.const.character_const import CHARACTER_LIST
+from sr.context import Context
+
+
+class TeamListItem(ft.Row):
+
+    def __init__(self, item: ForgottenHallTeam,
+                 max_character_cnt: int = 4,
+                 on_choose_team_member: Optional[Callable] = None,
+                 on_click_del: Optional[Callable] = None,
+                 on_value_changed: Optional[Callable] = None):
+
+        self.team_value: ForgottenHallTeam = item
+        self.value_changed_callback: Optional[Callable] = on_value_changed
+
+        self.team_name_input = ft.TextField(label=gt('配队名称', 'ui'), value=self.team_value.team_name)
+
+        self.character_dropdown_list: List[ft.Dropdown] = []
+        for i in range(max_character_cnt):
+            dropdown = ft.Dropdown(label='%s %d' % (gt('角色', 'ui'), (i + 1)),
+                                   value='none', disabled=True, width=80,
+                                   options=[ft.dropdown.Option(text='无', key='none')])
+            for c in CHARACTER_LIST:
+                dropdown.options.append(ft.dropdown.Option(text=gt(c.cn, 'ui'), key=c.id))
+            self.character_dropdown_list.append(dropdown)
+
+        self.del_btn = ft.IconButton(icon=ft.icons.DELETE_FOREVER_OUTLINED, data=id(self), on_click=on_click_del)
+
+        controls = []
+        controls.append(self.team_name_input)
+        for dropdown in self.character_dropdown_list:
+            controls.append(ft.Container(content=dropdown, data=id(self), on_click=on_choose_team_member))
+        controls.append(self.del_btn)
+
+        super().__init__(controls=controls)
+
+        self._update_dropdown_value()
+
+    def _update(self):
+        if self.page is not None:
+            self.update()
+
+    def _on_value_changed(self):
+        if self.value_changed_callback is not None:
+            self.value_changed_callback(id(self))
+
+    def _update_dropdown_value(self):
+        """
+        根据配队中的角色更新显示
+        :return:
+        """
+        for i in range(len(self.character_dropdown_list)):
+            dropdown = self.character_dropdown_list[i]
+            if i < len(self.team_value.character_id_list):
+                dropdown.value = self.team_value.character_id_list[i - 1]
+            else:
+                dropdown.value = 'none'
+        self._update()
+
+    def update_team_member(self, character_id_list: List[str]):
+        """
+        更新配队角色列表
+        :param character_id_list: 角色ID列表
+        :return:
+        """
+        self.team_value.character_id_list = character_id_list
+        self._update_dropdown_value()
+        self._on_value_changed()
+
+
+class TeamList(ft.ListView):
+
+    def __init__(self, on_click_choose_member: Optional[Callable] = None):
+        self.config: ForgottenHallConfig = get_config()
+        plan_item_list: List[ForgottenHallTeam] = self.config.team_list
+
+        super().__init__(controls=[self._list_view_item(i) for i in plan_item_list])
+        self.add_btn = ft.Container(
+            content=components.RectOutlinedButton(text='+', on_click=self._on_add_click),
+            margin=ft.margin.only(top=5)
+        )
+        self.controls.append(self.add_btn)
+        self._start_choose_member_callback: Optional[Callable] = on_click_choose_member
+
+    def refresh_by_config(self):
+        plan_item_list: List[ForgottenHallTeam] = self.config.team_list
+        self.controls = [self._list_view_item(i) for i in plan_item_list]
+        self.controls.append(self.add_btn)
+        self.update()
+
+    def _list_view_item(self, team: ForgottenHallTeam) -> ft.Container:
+        """
+        获取单行配队的组件
+        :param team:
+        :return:
+        """
+        theme: ThemeColors = gui_config.theme()
+        return ft.Container(
+                content=TeamListItem(team,
+                                     on_choose_team_member=self._start_choose_member,
+                                     on_value_changed=self._on_list_item_value_changed,
+                                     on_click_del=self._on_item_click_del,
+                                     ),
+                border=ft.border.only(bottom=ft.border.BorderSide(1, theme['divider_color'])),
+                padding=10
+            )
+
+    def _on_add_click(self, e):
+        """
+        添加一个新的配队
+        :param e:
+        :return:
+        """
+        # 新的队名
+        new_team_name: str = ''
+        for i in range(99):
+            new_team_name = '%s%d' % (gt('配队', 'ui'), (i + 1))
+            existed_name: bool = False  # 名称是否已经存在
+            for item in self.controls:
+                if type(item.content) == TeamListItem:
+                    list_item: TeamListItem = item.content
+                    if list_item.team_value.team_name == new_team_name:
+                        existed_name = True
+                        break
+            if not existed_name:
+                break
+
+        new_team_value = ForgottenHallTeam(team_name=new_team_name, character_id_list=[])
+        new_list_item = self._list_view_item(new_team_value)
+        self.controls.append(new_list_item)
+
+        # 交换添加按钮
+        last = len(self.controls) - 1
+        tmp = self.controls[last - 1]
+        self.controls[last - 1] = self.controls[last]
+        self.controls[last] = tmp
+
+        # 更新
+        self.update()
+        self._on_list_item_value_changed(id(new_list_item))
+
+    def _get_list_item_component(self, component_id: int) -> Optional[TeamListItem]:
+        """
+        根据组件ID 获取对应的组件
+        :param component_id: 组件ID
+        :return:
+        """
+        for item in self.controls:
+            if type(item.content) == TeamListItem and id(item.content) == component_id:
+                return item.content
+        return None
+
+    def _start_choose_member(self, e):
+        """
+        开始为某个配队选择角色
+        :param e: 点击事件
+        :return:
+        """
+        component_id: int = e.control.data
+        component = self._get_list_item_component(component_id)
+        if component is None:  # 理论不可能的情况
+            log.error('找不到配队组件 %d', component_id)
+            return
+        if self._start_choose_member_callback is not None:
+            self._start_choose_member_callback(component)
+
+    def _on_list_item_value_changed(self, component_id: int):
+        """
+        配队改变后的回调
+        需要更新配置
+        :param component_id: 改变的组件ID
+        :return:
+        """
+        print('列表项改变')
+
+    def _on_item_click_del(self, component_id: int):
+        """
+        配队删除后的回调
+        需要更新配置
+        :param component_id: 改变的组件ID
+        :return:
+        """
+        print('删除')
+
+class SettingsForgottenHallView(SrBasicView, ft.Row):
+
+    def __init__(self, page: ft.Page, ctx: Context):
+        SrBasicView.__init__(self, page, ctx)
+        team_card_title = components.CardTitleText(gt('配队规划', 'ui'))
+        self.team_list = TeamList(on_click_choose_member=self._start_choose_member)
+        team_card = components.Card(self.team_list, team_card_title, width=800)
+
+        self.character_card = CharacterInput(ctx.ih, max_chosen_num=4)
+        self.character_card.visible = False
+
+        ft.Row.__init__(self, controls=[team_card, self.character_card], spacing=10)
+
+        self.chosen_item: Optional[TeamListItem] = None
+
+    def _start_choose_member(self, item: TeamListItem):
+        """
+        开始给某个配队选择角色
+        :param item: 配队的组件 用于选择角色后回调
+        :return:
+        """
+        self.character_card.visible = True
+        self.character_card.update_title(item.team_value.team_name)
+        self.character_card.update_chosen_list(item.team_value.character_id_list)
+        self.character_card.update_value_changed_callback(self._on_choose_member_changed)
+
+        self.chosen_item = item
+
+    def _on_choose_member_changed(self, character_id_list: List[str]):
+        """
+
+        :param character_id_list:
+        :return:
+        """
+        self.chosen_item.update_team_member(character_id_list)
+
+
+_settings_forgotten_hall_view: Optional[SettingsForgottenHallView] = None
+
+
+def get(page: ft.Page, ctx: Context) -> SettingsForgottenHallView:
+    global _settings_forgotten_hall_view
+    if _settings_forgotten_hall_view is None:
+        _settings_forgotten_hall_view = SettingsForgottenHallView(page, ctx)
+    return _settings_forgotten_hall_view