v1.5.2

CHANGELOG.md

@@ -1,4 +1,4 @@
 # Changelog
 
-修复无法创建分组的bug
-Fix bug that can't create group
+支持自定义图片数量的图文类型的tiktok发布
+Support custom number of images in tiktok post

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "tiktok-matrix",
-    "version": "1.5.1"
+    "version": "1.5.2"
   },
   "tauri": {
     "allowlist": {

src/api/index.js

@@ -60,7 +60,6 @@ const api = {
   scan_tcp: '/agent/api/tcp_scan',
   stop_task: '/agent/api/stop_task',
   menus: '/api/menus',
-  get_and_use_one_material: '/api/material/get_and_use_one',
   get_accounts_by_device: '/api/account_by_device',
   get_group_by_id: '/api/group/get_by_id',
   move_to_group: '/api/device/move_to_group',

src/components/Sidebar.vue

@@ -266,7 +266,8 @@ export default {
           train_duration: 0,
           min_duration: 10,
           max_duration: 30,
-          topic: ''
+          topic: '',
+          image_count: 2
         })
         .then(() => {
           this.newGroupName = ''

src/components/device/LeftBars.vue

@@ -116,29 +116,7 @@ export default {
   },
   methods: {
 
-    post() {
-      this.$service.get_and_use_one_material({
-        group_id: this.group.id
-      }).then(res => {
-        let titles = this.group.title.split("\n");
-        let ramdomTitle = ''
-        if (titles.length > 0) {
-          ramdomTitle = Math.floor(Math.random() * titles.length);
-        }
-        let video = res.data.name
-        this.$emitter.emit('scriptEventData', {
-          name: 'publish', args: [
-            '0',
-            video,
-            ramdomTitle,
-            ''
-          ]
-        })
-      }).catch(err => {
-
-      })
 
-    },
     get_group_by_id() {
       if (this.device.group_id == 0) {
         return;

src/components/device/Miniremote.vue

@@ -264,7 +264,7 @@ export default {
         // max size
         this.scrcpy.send(max_size)
         // control
-        this.scrcpy.send('true')
+        this.scrcpy.send(this.big ? 'false' : 'true')
         //fps
         this.scrcpy.send(this.big ? 30 : 15)
 

src/components/group/EditGroup.vue

@@ -118,21 +118,25 @@
             <input class="border-2 border-gray-300 p-2 rounded col-span-1" v-model="publish_time6"
               placeholder="00:00" />
           </div>
-          <!-- <div class="grid grid-cols-4 w-full items-center gap-2 mb-2">
+          <div class="grid grid-cols-4 w-full items-center gap-2 mb-2">
             <label class="font-bold text-right col-span-1">{{ $t('publishType') }}:</label>
             <div class="col-span-2 flex items-center gap-4">
-                <div class="flex items-center">
-                    <input type="radio" id="selfMade" value="1" v-model="mygroup.publish_type"
-                        class="form-radio text-blue-500 h-4 w-4">
-                    <label for="selfMade" class="ml-2">{{ $t('selfMade') }}</label>
-                </div>
-                <div class="flex items-center">
-                    <input type="radio" id="aiMade" value="2" v-model="mygroup.publish_type"
-                        class="form-radio text-blue-500 h-4 w-4">
-                    <label for="aiMade" class="ml-2">{{ $t('aiMade') }}</label>
-                </div>
+              <div class="flex items-center">
+                <input type="radio" id="video" value="0" v-model="mygroup.publish_type"
+                  class="form-radio text-blue-500 h-4 w-4">
+                <label for="video" class="ml-2">{{ $t('video') }}</label>
+              </div>
+              <div class="flex items-center">
+                <input type="radio" id="image" value="1" v-model="mygroup.publish_type"
+                  class="form-radio text-blue-500 h-4 w-4">
+                <label for="image" class="ml-2">{{ $t('image') }}</label>
+              </div>
+              <div class="flex items-center" v-if="mygroup.publish_type == 1">
+                <input class="border-2 border-gray-300 p-2 rounded col-span-1 input-sm" v-model="mygroup.image_count"
+                  :placeholder="$t('imageCount')" type="number" />
+              </div>
             </div>
-        </div> -->
+          </div>
 
           <div class="grid grid-cols-4 w-full items-center gap-2 mb-2">
             <label class="font-bold text-right col-span-1">{{ $t('titles') }}:</label>
@@ -181,6 +185,7 @@ export default {
       mygroup: {
         auto_train: 0,
         auto_publish: 0,
+        image_count: 2,
       },
       train_time1: '',
       train_time2: '',
@@ -235,7 +240,8 @@ export default {
           min_duration: Number(group.min_duration),
           max_duration: Number(group.max_duration),
           topic: group.topic,
-          comment: group.comment
+          comment: group.comment,
+          image_count: Number(group.image_count),
         })
         .then(() => {
           this.$emitter.emit('closePageDialog', {})

src/components/group/ManageGroups.vue

@@ -141,7 +141,7 @@ export default {
           like_probable: Number(group.like_probable),
           collect_probable: Number(group.collect_probable),
           train_duration: Number(group.train_duration),
-          topic: group.topic
+          topic: group.topic,
         })
         .then(() => {
           this.showMoal = false

src/components/material/ManageMaterials.vue

@@ -205,7 +205,7 @@ export default {
         multiple: true, // 是否允许多选文件
         directory: false, // 是否选择目录
         filters: [ // 文件过滤器
-          { name: 'Video Files', extensions: ['mp4'] },
+          { name: 'Video Files', extensions: ['mp4', 'jpg', 'png'] },
         ]
       });
 
@@ -220,9 +220,6 @@ export default {
         .then(() => {
           this.get_materials()
         })
-        .catch(err => {
-
-        })
 
     },
     fission() {

src/components/publishJob/ManagePublishJobs.vue

@@ -22,7 +22,7 @@
                 <th>{{ $t('startTime') }}</th>
                 <th>{{ $t('status') }}</th>
                 <!-- <th>{{ $t('remark') }}</th> -->
-                <th>{{ $t('material') }}</th>
+                <!-- <th>{{ $t('material') }}</th> -->
                 <th>{{ $t('username') }}</th>
                 <th>{{ $t('device') }}</th>
                 <th>{{ $t('group') }}</th>
@@ -40,15 +40,15 @@
                   <div class="badge badge-error" v-else-if="publish_job.status == '3'">{{ $t('failed') }}</div>
                 </td>
                 <!-- <td>{{ publish_job.remark }}</td> -->
-                <td>
+                <!-- <td>
                   <template v-if="publish_job.material.endsWith('.mp4') || publish_job.material.endsWith('.webm')">
                     <video :src="`${$config.apiUrl}/${publish_job.material}`"
                       class="w-[100px] h-[100px] max-w-none"></video>
                   </template>
-                  <template v-else>
+<template v-else>
                     <img :src="`${$config.apiUrl}/${publish_job.material}`" class="w-[100px] h-[100px] max-w-none" />
                   </template>
-                </td>
+</td> -->
                 <td>
                   <a class="link link-primary" :href="`https://www.tiktok.com/${publish_job.username}`"
                     target="_blank">{{

src/i18n.js

@@ -346,8 +346,14 @@ export const i18n = createI18n({
       onlyOneDeviceSelected: 'Only One Device Selected',
       openDownloadDir: 'Open Download Dir',
       operating: 'Operating',
+      image: 'Image',
+      video: 'Video',
+      imageCount: 'Image Count',
     },
     'zh-CN': {
+      imageCount: '图片数量',
+      image: '图片',
+      video: '视频',
       operating: '操作中',
       openDownloadDir: '打开下载目录',
       onlyOneDeviceSelected: '只能选择一个设备',

src/service/index.js

@@ -582,13 +582,7 @@ export function get_menus() {
     url: api.menus
   })
 }
-export function get_and_use_one_material({ group_id }) {
-  return request({
-    method: 'get',
-    params: { group_id },
-    url: api.get_and_use_one_material
-  })
-}
+
 export function get_accounts_by_device({ device }) {
   return request({
     method: 'get',