From 11ab8e6824caa5eeee467143f725df0c9a0b2860 Mon Sep 17 00:00:00 2001 From: niostack Date: Wed, 25 Sep 2024 11:37:27 +0800 Subject: [PATCH] fix bugs --- CHANGELOG.md | 3 +-- src-tauri/tauri.conf.json | 2 +- src/App.vue | 10 +++++----- src/components/General.vue | 6 +++++- src/components/Sidebar.vue | 32 -------------------------------- src/components/Toast.vue | 29 ----------------------------- src/i18n.js | 6 +++++- 7 files changed, 17 insertions(+), 71 deletions(-) delete mode 100644 src/components/Toast.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index d47b458..8465f9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ # 更新日志 / Change Log -1. 为了方便试用, 增加了GitHub认证功能, 成功激活GitHub认证功能,可以永久免费连接5个设备 - To facilitate trial use, GitHub authentication has been added. Successfully activating GitHub authentication allows permanent free connection of up to 5 devices +1. 修复已知BUG / Fix known bugs diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 32fdb65..3c04c93 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "TikMatrix", - "version": "1.7.5" + "version": "1.7.6" }, "tauri": { "allowlist": { diff --git a/src/App.vue b/src/App.vue index 650fed2..ea97460 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,6 @@
-
@@ -103,7 +102,6 @@ import TrainSettings from './components/group/TrainSettings.vue' import PublishSettings from './components/group/PublishSettings.vue' import { inject } from 'vue' import * as util from './utils' -// import Toast from './components/Toast.vue' import { invoke } from "@tauri-apps/api/tauri"; import { window as tauriWindow } from "@tauri-apps/api" import { TauriEvent } from "@tauri-apps/api/event" @@ -147,7 +145,6 @@ export default { ManagePostBots, ManageEditBots, Miniremote, - // Toast, BuyLicense, TrainSettings, PublishSettings @@ -301,12 +298,13 @@ export default { this.is_updating = false return; } - this.check_file_update('tiktok-agent(6/6)', this.remote_version.agent_version, url, (updated) => { + this.check_file_update('tiktok-agent(6/6)', this.remote_version.agent_version, url, async (updated) => { this.is_updating = false if (updated) { invoke("grant_agent_permission"); invoke("start_agent"); } + await message(this.$t('updateServiceSuccess')); }, () => { invoke("stop_agent"); }); @@ -387,13 +385,15 @@ export default { this.$emitter.on('downloadOcr', () => { this.download_ocr() }); + this.$emitter.on('updateService', () => { + this.check_update() + }); listen("reload", async () => { if (this.is_updating) { return; } window.location.reload(); }); - this.check_update(); } } diff --git a/src/components/General.vue b/src/components/General.vue index 0cf6038..67c6640 100644 --- a/src/components/General.vue +++ b/src/components/General.vue @@ -59,7 +59,11 @@ @click="$emitter.emit('downloadOcr')"> {{ $t('downloadOcr') }} - +

{{ $t('proxyServer') }}

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index c2e6ca5..b865421 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -590,7 +590,6 @@ export default { setTimeout(() => { this.adb_command(['install', '-r', '-t', '-g', work_path + 'bin/com.github.tikmatrix.apk']) this.adb_command(['install', '-r', '-t', '-g', work_path + 'bin/com.github.tikmatrix.test.apk']) - this.$emitter.emit('showToast', this.$t('initSuccess')) }, 3000) }, @@ -605,12 +604,7 @@ export default { serials: this.selection, }) .then(res => { - console.log(res) this.$emitter.emit('showToast', `${res.data} ${this.$t('taskCreated')}`) - - }) - .catch(err => { - console.log(err) }) }, publish(addProductLink) { @@ -624,13 +618,9 @@ export default { add_product_link: addProductLink ? 1 : 0 }) .then(res => { - console.log(res) this.$emitter.emit('showToast', `${res.data} ${this.$t('taskCreated')}`) }) - .catch(err => { - console.log(err) - }) }, message() { if (this.selection.length == 0) { @@ -643,13 +633,9 @@ export default { serials: this.selection, }) .then(res => { - console.log(res) this.$emitter.emit('showToast', `${res.data} ${this.$t('taskCreated')}`) }) - .catch(err => { - console.log(err) - }) }, share(postUrl) { if (this.selection.length == 0) { @@ -663,12 +649,7 @@ export default { post_url: postUrl }) .then(res => { - console.log(res) this.$emitter.emit('showToast', `${res.data} ${this.$t('taskCreated')}`) - - }) - .catch(err => { - console.log(err) }) }, stop_task() { @@ -683,9 +664,6 @@ export default { .then(res => { this.$emitter.emit('showToast', this.$t('commandSendSuccess')) }) - .catch(err => { - console.log(err) - }) }, send_keycode(keycode) { this.$emitter.emit('eventData', JSON.stringify({ @@ -722,13 +700,9 @@ export default { target_username: targetUsername }) .then(res => { - console.log(res) this.$emitter.emit('showToast', `${res.data} ${this.$t('taskCreated')}`) }) - .catch(err => { - console.log(err) - }) }, follow(targetUsername) { if (this.selection.length == 0) { @@ -742,13 +716,9 @@ export default { target_username: targetUsername }) .then(res => { - console.log(res) this.$emitter.emit('showToast', `${res.data} ${this.$t('taskCreated')}`) }) - .catch(err => { - console.log(err) - }) }, async copyFromPhone() { @@ -858,12 +828,10 @@ export default { this.send_screen_mode(mode) }); document.addEventListener('copy', () => { - console.log('复制事件被触发'); this.copyFromPhone() }); document.addEventListener('paste', () => { - console.log('粘贴事件被触发'); this.pasteToPhone() }); this.get_menus() diff --git a/src/components/Toast.vue b/src/components/Toast.vue deleted file mode 100644 index fa4ce8b..0000000 --- a/src/components/Toast.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - \ No newline at end of file diff --git a/src/i18n.js b/src/i18n.js index c48d788..219c314 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -429,9 +429,13 @@ export const i18n = createI18n({ githubAuthFailureMessage: 'GitHub authorization failed. Please try again.', githubAuthErrorMessage: 'An error occurred during GitHub authorization.', left_days: 'Left Days', - unlicensed: 'Unlicensed' + unlicensed: 'Unlicensed', + updateService: 'Update Service', + updateServiceSuccess: 'Update Service Success' }, 'zh-CN': { + updateServiceSuccess: '更新服务成功', + updateService: '更新服务', unlicensed: '未授权', left_days: '剩余天数', githubAuth: 'GitHub 认证',