fix bugs

tikmatrix · Sep 25, 2024 · 11ab8e6 · 11ab8e6
1 parent 9b0959d
commit 11ab8e6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 71 deletions.
diff --git 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
@@ -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
@@ -2,7 +2,6 @@
 
   <div class="flex flex-row items-start bg-base-300 h-screen w-screen">
     <Sidebar />
-    <!-- <Toast /> -->
     <ManageDevices />
   </div>
 
@@ -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();
   }
 }
 </script>
diff --git a/src/components/General.vue b/src/components/General.vue
@@ -59,7 +59,11 @@
         @click="$emitter.emit('downloadOcr')">
         <font-awesome-icon icon="fa fa-download" class="h-3 w-3" />{{ $t('downloadOcr') }}
     </button>
-
+    <button
+        class="btn btn-sm bg-blue-500 hover:bg-blue-300 border-0 text-white text-xs block font-normal ml-1 mb-1 min-w-max"
+        @click="$emitter.emit('updateService')">
+        <font-awesome-icon icon="fa fa-cloud-arrow-down" class="h-3 w-3" />{{ $t('updateService') }}
+    </button>
     <dialog ref="proxy_dialog" class="modal">
         <div class="modal-box">
             <h3 class="font-bold text-lg">{{ $t('proxyServer') }}</h3>

diff --git 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
diff --git 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 认证',