Merge pull request #449 from ArkMowers/revert-446-dev_shawn

Revert "add:发送基报至邮件"
ArkMowers · Dec 19, 2023 · 4ed2d2e · 4ed2d2e
2 parents 5f4a4b8 + 07b65a0
commit 4ed2d2e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 40 deletions.
diff --git a/arknights_mower/__main__.py b/arknights_mower/__main__.py
@@ -358,7 +358,7 @@ def simulate():
                 if sleep_time > 540:
                     # 刷新时间以鹰历为准
                     if base_scheduler.daily_report < (datetime.now() - timedelta(hours=4)).date():
-                        if base_scheduler.report_plan_solver(conf["send_report"]):
+                        if base_scheduler.report_plan_solver():
                             base_scheduler.daily_report = (datetime.now() - timedelta(hours=4)).date()
 
                     if base_scheduler.skland_config['skland_enable'] and base_scheduler.daily_skland < (

diff --git a/arknights_mower/command.py b/arknights_mower/command.py
@@ -101,8 +101,8 @@ def recruit(args: list[str] = [], send_message_config={}, recruit_config={}, dev
     return choose, result
 
 
-def daily_report(device: Device = None,send_message_config={},send_report:bool=False):
-    return ReportSolver(device,None,send_message_config,send_report).run()
+def daily_report(device: Device = None):
+    return ReportSolver(device).run()
 
 
 def mission(args: list[str] = [], device: Device = None):

diff --git a/arknights_mower/templates/conf.yml b/arknights_mower/templates/conf.yml
@@ -13,7 +13,6 @@ free_blacklist: ''
 ling_xi: 1
 check_mail_enable: true
 report_enable: true
-send_report: true
 maa_adb_path: D:\Program Files\Nox\bin\adb.exe
 maa_enable: 0
 maa_rg_enable: 0

diff --git a/arknights_mower/templates/email/report_template.html b/arknights_mower/templates/email/report_template.html
diff --git a/arknights_mower/utils/digit_reader.py b/arknights_mower/utils/digit_reader.py
@@ -130,6 +130,8 @@ def get_report_number_white(self, digit_part):
             )
 
             threshold = 0.93
+            min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)
+            print(j, max_val)
             loc = np.where(res >= threshold)
             for i in range(len(loc[0])):
                 x = loc[1][i]

diff --git a/arknights_mower/utils/email.py b/arknights_mower/utils/email.py
@@ -28,4 +28,3 @@
 maa_template = env.get_template("maa.html")
 recruit_template = env.get_template("recruit_template.html")
 recruit_rarity = env.get_template("recruit_rarity.html")
-report_template = env.get_template("report_template.html")
diff --git a/ui/src/components/DailyMission.vue b/ui/src/components/DailyMission.vue
@@ -3,7 +3,7 @@ import { storeToRefs } from 'pinia'
 import { useConfigStore } from '@/stores/config'
 
 const store = useConfigStore()
-const { check_mail_enable, report_enable, send_report } = storeToRefs(store)
+const { check_mail_enable, report_enable } = storeToRefs(store)
 </script>
 <template>
   <n-card>
@@ -19,10 +19,5 @@ const { check_mail_enable, report_enable, send_report } = storeToRefs(store)
         <div class="card-title">读取基报 {{ report_enable ? '开启' : '关闭' }}</div>
       </n-checkbox>
     </template>
-    <template #footer v-if="report_enable">
-      <n-checkbox v-model:checked="send_report">
-        <div>发送至邮件 {{ send_report ? '开启' : '关闭' }}</div>
-      </n-checkbox>
-    </template>
   </n-card>
 </template>
diff --git a/ui/src/stores/config.js b/ui/src/stores/config.js
@@ -62,7 +62,6 @@ export const useConfigStore = defineStore('config', () => {
   const sendKey = ref('') // Server酱Key值
   const check_mail_enable = ref(true)
   const report_enable = ref(true)
-  const send_report = ref(true)
   const recruit_gap = ref(false)
   const recruit_auto_5 = ref('hand')
   const webview = ref({})
@@ -146,7 +145,6 @@ export const useConfigStore = defineStore('config', () => {
     sendKey.value = response.data.sendKey
     check_mail_enable.value = response.data.check_mail_enable
     report_enable.value = response.data.report_enable
-    send_report.value = response.data.send_report
     recruit_gap.value = response.data.recruit_gap
     recruit_auto_5.value = response.data.recruit_auto_5
     webview.value = response.data.webview
@@ -219,7 +217,6 @@ export const useConfigStore = defineStore('config', () => {
       sendKey: sendKey.value,
       check_mail_enable: check_mail_enable.value,
       report_enable: report_enable.value,
-      send_report: send_report.value,
       recruit_gap: recruit_gap.value,
       recruit_auto_5: recruit_auto_5.value,
       webview: webview.value,
@@ -298,7 +295,6 @@ export const useConfigStore = defineStore('config', () => {
     sendKey,
     check_mail_enable,
     report_enable,
-    send_report,
     recruit_gap,
     recruit_auto_5,
     webview,