Merge pull request #8 from Night-stars-1/dev

feat: 优化跑商算法，添加跑商测试接口

.vscode/settings.json

@@ -11,7 +11,8 @@
         "black"
     ],
     "python.testing.pytestArgs": [
-        "tests"
+        "tests",
+        "--log-cli-level=INFO"
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,

app/common/config.py

@@ -1,7 +1,7 @@
 """
 Author: Night-stars-1 nujj1042633805@gmail.com
 Date: 2024-04-02 19:13:20
-LastEditTime: 2024-04-08 00:19:18
+LastEditTime: 2024-04-11 20:59:15
 LastEditors: Night-stars-1 nujj1042633805@gmail.com
 """
 
@@ -22,8 +22,7 @@
     qconfig,
 )
 
-from core import adb
-
+from .running_business_config import RunningBusinessConfig
 
 class Language(Enum):
     """Language enumeration"""
@@ -48,7 +47,7 @@ def isWin11():
     return sys.platform == "win32" and sys.getwindowsversion().build >= 22000
 
 
-class Config(QConfig):
+class Config(RunningBusinessConfig):
     """Config of application"""
 
     # uuid

app/common/running_business_config.py

@@ -0,0 +1,23 @@
+"""
+Author: Night-stars-1 nujj1042633805@gmail.com
+Date: 2024-04-11 20:58:19
+LastEditTime: 2024-04-12 21:06:41
+LastEditors: Night-stars-1 nujj1042633805@gmail.com
+"""
+
+from qfluentwidgets import ConfigItem, QConfig
+
+
+class RunningBusinessConfig(QConfig):
+    """Config of application"""
+
+    七号自由港 = ConfigItem("RunningBusiness", "7号自由港", 0, None)
+    澄明数据中心 = ConfigItem("RunningBusiness", "澄明数据中心", 0, None)
+    阿妮塔战备工厂 = ConfigItem("RunningBusiness", "阿妮塔战备工厂", 0, None)
+    阿妮塔能源研究所 = ConfigItem("RunningBusiness", "阿妮塔能源研究所", 0, None)
+    淘金乐园 = ConfigItem("RunningBusiness", "淘金乐园", 0, None)
+    曼德矿场 = ConfigItem("RunningBusiness", "曼德矿场", 0, None)
+    荒原站 = ConfigItem("RunningBusiness", "荒原站", 0, None)
+    铁盟哨站 = ConfigItem("RunningBusiness", "铁盟哨站", 0, None)
+    修格里城 = ConfigItem("RunningBusiness", "修格里城", 0, None)
+    priceThreshold = ConfigItem("RunningBusiness", "priceThreshold", 500, None)

app/common/worker.py

@@ -1,7 +1,7 @@
 """
 Author: Night-stars-1 nujj1042633805@gmail.com
 Date: 2024-04-06 23:29:48
-LastEditTime: 2024-04-08 21:33:26
+LastEditTime: 2024-04-12 00:59:07
 LastEditors: Night-stars-1 nujj1042633805@gmail.com
 """
 
@@ -13,14 +13,15 @@
 
 
 class Worker(QThread):
-    def __init__(self, func, stop, parent=None):
-        super(Worker, self).__init__(parent)
+    def __init__(self, func, stop, **kargs):
+        super(Worker, self).__init__()
         self.func = func
         self.stop_func = stop
+        self.kargs = kargs
 
     def run(self):
         try:
-            self.func(cfg.adbOrder.value, cfg.adbPath.value)
+            self.func(**self.kargs)
         except StopExecution:
             pass
 

app/components/settings/spin_box_setting_card.py

@@ -0,0 +1,60 @@
+"""
+Author: Night-stars-1 nujj1042633805@gmail.com
+Date: 2024-04-07 23:54:39
+LastEditTime: 2024-04-12 13:01:47
+LastEditors: Night-stars-1 nujj1042633805@gmail.com
+"""
+
+from typing import Union
+
+from PyQt5.QtCore import Qt, pyqtSignal
+from PyQt5.QtGui import QIcon
+from qfluentwidgets import ConfigItem, FluentIconBase, SettingCard, SpinBox, qconfig
+
+
+class SpinBoxSettingCard(SettingCard):
+    """Setting card with a push button"""
+
+    text_change = pyqtSignal()
+
+    def __init__(
+        self,
+        configItem: ConfigItem,
+        icon: Union[str, QIcon, FluentIconBase],
+        title: str,
+        content=None,
+        spin_box_min: int = 0,
+        spin_box_max: int = 100,
+        parent=None,
+    ):
+        """
+        Parameters
+        ----------
+        text: str
+            the text of push button
+
+        icon: str | QIcon | FluentIconBase
+            the icon to be drawn
+
+        title: str
+            the title of card
+
+        content: str
+            the content of card
+
+        parent: QWidget
+            parent widget
+        """
+        super().__init__(icon, title, content, parent)
+        self.configItem = configItem
+
+        self.spinBox = SpinBox(self)
+        self.spinBox.setRange(spin_box_min, spin_box_max)
+        self.spinBox.setValue(configItem.value)
+
+        self.spinBox.valueChanged.connect(self.valueChanged)
+        self.hBoxLayout.addWidget(self.spinBox, 0, Qt.AlignRight)
+        self.hBoxLayout.addSpacing(16)
+
+    def valueChanged(self, value: int):
+        qconfig.set(self.configItem, value)

app/view/home_interface.py

@@ -1,7 +1,7 @@
 """
 Author: Night-stars-1 nujj1042633805@gmail.com
 Date: 2024-04-02 19:12:22
-LastEditTime: 2024-04-08 21:15:56
+LastEditTime: 2024-04-12 01:43:08
 LastEditors: Night-stars-1 nujj1042633805@gmail.com
 """
 
@@ -12,7 +12,7 @@
 from PyQt5.QtWidgets import QLabel, QVBoxLayout, QWidget
 from qfluentwidgets import FluentIcon, ScrollArea, isDarkTheme
 
-from ..common.config import REPO_URL
+from ..common.config import REPO_URL, cfg
 from ..common.style_sheet import StyleSheet
 from ..common.worker import Worker
 from ..components.link_card import LinkCardView
@@ -126,7 +126,9 @@ def _run(self):
             self.run.titleLabel.setText("停止")
             from main import main, stop
 
-            self.workers = Worker(main, stop)
+            self.workers = Worker(
+                main, stop, order=cfg.adbOrder.value, path=cfg.adbPath.value
+            )
             self.workers.finished.connect(lambda: self.on_worker_finished(self.workers))
             self.workers.start()
         else:

app/view/main_window.py

@@ -20,6 +20,7 @@
 )
 
 from app.view.daily_task_interface import DailyTaskInterface
+from app.view.running_business_interface import RunningBusinessInterface
 
 from ..common import resource  # 图标数据
 from ..common.config import cfg
@@ -45,6 +46,7 @@ def __init__(self):
         self.loggerInterface = LoggerInterface(self)
         self.settingInterface = SettingInterface(self)
         self.daily_task_interface = DailyTaskInterface(self)
+        self.running_business_interface = RunningBusinessInterface(self)
 
         self.connectSignalToSlot()
 
@@ -62,6 +64,7 @@ def initNavigation(self):
         self.addSubInterface(self.tajInterface, FIF.AIRPLANE, "铁安局")
         self.addSubInterface(self.loggerInterface, FIF.ALIGNMENT, "日志")
         self.addSubInterface(self.daily_task_interface, FIF.CALENDAR, "每日任务")
+        self.addSubInterface(self.running_business_interface, FIF.TRAIN, "跑商配置")
 
         # add custom widget to bottom
         self.addSubInterface(

app/view/running_business_interface.py

@@ -0,0 +1,145 @@
+"""
+Author: Night-stars-1 nujj1042633805@gmail.com
+Date: 2024-04-10 22:54:08
+LastEditTime: 2024-04-12 21:06:56
+LastEditors: Night-stars-1 nujj1042633805@gmail.com
+"""
+
+from loguru import logger
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QLabel, QWidget
+from qfluentwidgets import CheckBox, ExpandLayout
+from qfluentwidgets import FluentIcon as FIF
+from qfluentwidgets import ScrollArea, SettingCardGroup
+
+from ..common.config import cfg
+from ..common.style_sheet import StyleSheet
+from ..components.settings.spin_box_setting_card import SpinBoxSettingCard
+
+
+class RunningBusinessInterface(ScrollArea):
+    """每日任务 interface"""
+
+    def __init__(self, parent=None):
+        super().__init__(parent=parent)
+        self.scrollWidget = QWidget(self)
+        self.expandLayout = ExpandLayout(self.scrollWidget)
+
+        # label
+        self.settingLabel = QLabel("跑商配置", self)
+
+        self.__initWidget()
+
+    def loadSamples(self):
+        """load samples"""
+        # basic input samples
+        self.configGroup = SettingCardGroup("进货书设置", self.scrollWidget)
+
+        self.七号自由港 = SpinBoxSettingCard(
+            cfg.七号自由港,
+            FIF.ACCEPT,
+            "七号自由港",
+            "七号自由港单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.澄明数据中心 = SpinBoxSettingCard(
+            cfg.澄明数据中心,
+            FIF.ACCEPT,
+            "澄明数据中心",
+            "澄明数据中心单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.阿妮塔战备工厂 = SpinBoxSettingCard(
+            cfg.阿妮塔战备工厂,
+            FIF.ACCEPT,
+            "阿妮塔战备工厂",
+            "阿妮塔战备工厂单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.阿妮塔能源研究所 = SpinBoxSettingCard(
+            cfg.阿妮塔能源研究所,
+            FIF.ACCEPT,
+            "阿妮塔能源研究所",
+            "阿妮塔能源研究所单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.淘金乐园 = SpinBoxSettingCard(
+            cfg.淘金乐园,
+            FIF.ACCEPT,
+            "淘金乐园",
+            "淘金乐园单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.曼德矿场 = SpinBoxSettingCard(
+            cfg.曼德矿场,
+            FIF.ACCEPT,
+            "曼德矿场",
+            "曼德矿场单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.荒原站 = SpinBoxSettingCard(
+            cfg.荒原站,
+            FIF.ACCEPT,
+            "荒原站",
+            "荒原站单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.铁盟哨站 = SpinBoxSettingCard(
+            cfg.铁盟哨站,
+            FIF.ACCEPT,
+            "铁盟哨站",
+            "铁盟哨站单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.修格里城 = SpinBoxSettingCard(
+            cfg.修格里城,
+            FIF.ACCEPT,
+            "修格里城",
+            "修格里城单次最大进货书",
+            parent=self.configGroup,
+        )
+        self.priceThreshold = SpinBoxSettingCard(
+            cfg.priceThreshold,
+            FIF.ACCEPT,
+            "价格阈值",
+            "低价值商品统计阈值",
+            spin_box_min=0,
+            spin_box_max=1000,
+            parent=self.configGroup,
+        )
+
+    def __initWidget(self):
+        self.resize(1000, 800)
+        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.setViewportMargins(0, 80, 0, 20)
+        self.setWidget(self.scrollWidget)
+        self.setWidgetResizable(True)
+        self.setObjectName("RunningBusinessInterface")
+
+        # initialize style sheet
+        self.scrollWidget.setObjectName("scrollWidget")
+        self.settingLabel.setObjectName("settingLabel")
+        StyleSheet.SETTING_INTERFACE.apply(self)
+
+        # initialize layout
+        self.loadSamples()
+        self.__initLayout()
+
+    def __initLayout(self):
+        self.settingLabel.move(36, 30)
+
+        self.configGroup.addSettingCard(self.七号自由港)
+        self.configGroup.addSettingCard(self.澄明数据中心)
+        self.configGroup.addSettingCard(self.阿妮塔战备工厂)
+        self.configGroup.addSettingCard(self.阿妮塔能源研究所)
+        self.configGroup.addSettingCard(self.淘金乐园)
+        self.configGroup.addSettingCard(self.曼德矿场)
+        self.configGroup.addSettingCard(self.荒原站)
+        self.configGroup.addSettingCard(self.铁盟哨站)
+        self.configGroup.addSettingCard(self.修格里城)
+        self.configGroup.addSettingCard(self.priceThreshold)
+
+        # add setting card group to layout
+        self.expandLayout.setSpacing(28)
+        self.expandLayout.setContentsMargins(36, 10, 36, 0)
+        self.expandLayout.addWidget(self.configGroup)