Merge pull request #2 from wflixu/dev

v1.0.6

README.md

@@ -1,18 +1,39 @@
 # ICamera
 
 视频录像或直播头像
+### 主界面
+<img src="public/imgs/preview.jpg"/>
+
+### 配置
+可以配置大小、边框、形状等参数
+
+<img src="public/imgs/config.jpg"/>
+
+
 
 # 技术栈
 
 Tauri + Vue 3 + TypeScript
 
+
 # 使用
 
+## 下载
+
+在 [release](https://github.com/wflixu/icamera/releases) 页面下载
+
+<img src="public/imgs/download.jpg"/>
+
+
+
+## 本地构建
+
+本地构建
+
 ```shell
 # 安装依赖
 pnpm install
 # 构建
 pnpm run tb
 
-
 ```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "icamera",
   "private": true,
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "scripts": {
     "dev": "vite",

setver.mjs

@@ -1,15 +1,31 @@
 import { writeFile } from 'fs/promises';
 import pkg from './package.json'   with { type: "json" };
-import tconfig from './src-tauri/tauri.conf.json' with {type:'json'}
+import tconfig from './src-tauri/tauri.conf.json' with {type: 'json'}
 
-const vs=process.argv[2]
+const vs = process.argv[2]
+const nextType = process.argv[3] ?? 'patch'
 console.log(vs)
 pkg.version = vs;
 
 await writeFile('./package.json', JSON.stringify(pkg, null, 2))
 
 
 tconfig.package.version = vs;
-tconfig.tauri.updater.endpoints = [`https://github.com/wflixu/icamera/releases/download/v${vs}/latest.json`]
 
-await writeFile('./src-tauri/tauri.conf.json', JSON.stringify(tconfig, null, 2))
+const nv = nextVersion(vs, nextType);
+
+tconfig.tauri.updater.endpoints = [`https://github.com/wflixu/icamera/releases/download/v${nv}/latest.json`]
+
+await writeFile('./src-tauri/tauri.conf.json', JSON.stringify(tconfig, null, 2))
+
+function nextVersion(vs, nt) {
+    const arr = vs.split('.').map(item => parseInt(item))
+    if (nt == 'major') {
+        return `${arr[0] + 1}.0.0`
+    } else if (nt == 'minor') {
+        return `${arr[0]}.${arr[1] + 1}.0`
+    } else {
+        return `${arr[0]}.${arr[1]}.${arr[2] + 1}`
+    }
+
+}

src-tauri/Cargo.toml

@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5.2", features = [ "api-all", "macos-private-api"] }
+tauri = { version = "1.5.2", features = [ "updater", "api-all", "macos-private-api"] }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "icamera",
-    "version": "1.0.4"
+    "version": "1.0.6"
   },
   "tauri": {
     "macOSPrivateApi": true,
@@ -43,7 +43,7 @@
       "shortDescription": "",
       "targets": [
         "dmg",
-        "app"
+        "updater"
       ],
       "windows": {
         "certificateThumbprint": null,
@@ -55,9 +55,9 @@
       "csp": null
     },
     "updater": {
-      "active": false,
+      "active": true,
       "endpoints": [
-        "https://github.com/wflixu/icamera/releases/download/v1.0.4/latest.json"
+        "https://github.com/wflixu/icamera/releases/download/v1.0.7/latest.json"
       ],
       "dialog": true,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyMEYyMjlBOEFCRjM4RDcKUldUWE9MK0ttaUlQMHFVdmE1cDA5b1l6TmlHTjloWTh4cWw1bGl3WTU1OEg1cmpsam94bCt4RHcK"