yangjie #37

Merged
yangqiang merged 8 commits from yangjie into master 2024-11-26 10:15:06 +08:00
10 changed files with 70 additions and 16 deletions
Showing only changes of commit ccc20c4aab - Show all commits

View File

@ -1,6 +1,5 @@
#基础API 绝对的 #基础API 绝对的
VITE_BASE_URL_API = 'http://192.168.2.9:5192' VITE_BASE_URL_API = 'http://192.168.2.9:5192'
VITE_BASE_URL_DRAW_API = 'http://192.168.2.9:6555'
#当前IP 相对的 #当前IP 相对的
VITE_BASE_CURRENT_API = '.' VITE_BASE_CURRENT_API = '.'
#开发环境 #开发环境

View File

@ -1,6 +1,5 @@
#基础API 绝对的 #基础API 绝对的
VITE_BASE_URL_API = 'https://meeting-api.23544.com/pc' VITE_BASE_URL_API = 'https://meeting-api.23544.com/pc'
VITE_BASE_URL_DRAW_API = 'http://192.168.2.9:6555'
#当前IP 相对的 #当前IP 相对的
VITE_BASE_CURRENT_API = '.' VITE_BASE_CURRENT_API = '.'
#生产环境 #生产环境

View File

@ -1,7 +0,0 @@
#基础API 绝对的
VITE_BASE_URL_API = 'http://192.168.2.9:5192'
VITE_BASE_URL_DRAW_API = 'http://192.168.2.9:6555'
#当前IP 相对的
VITE_BASE_CURRENT_API = '.'
#测试环境
VITE_ENV = 'test'

6
.env.xy Normal file
View File

@ -0,0 +1,6 @@
#基础API 绝对的
VITE_BASE_URL_API = 'https://meeting-api.23544.com/pc'
#当前IP 相对的
VITE_BASE_CURRENT_API = '.'
#测试环境
VITE_ENV = 'xy'

56
config/xy.json Normal file
View File

@ -0,0 +1,56 @@
{
"appId": "agora.io.ElectronApiExample",
"asar": true,
"asarUnpack": [
"node_modules/agora-electron-sdk"
],
"buildDependenciesFromSource": true,
"compression": "normal",
"productName": "湖北襄阳四中-教研平台",
"publish": [
{
"provider": "generic",
"url": "https://meeting-api.23544.com/meeting/update"
}
],
"files": [
"!*.log"
],
"win": {
"icon": "build/start.ico",
"requestedExecutionLevel": "highestAvailable",
"target": [
{
"target": "nsis",
"arch": [
"ia32"
]
}
]
},
"directories": {
"output": "electron"
},
"extraResources": [
{
"from": "src/assets/virtualBackground",
"to": "images",
"filter": [
"**/*"
]
}
],
"nsis": {
"oneClick": false,
"installerIcon": "build/install.ico",
"uninstallerIcon": "build/install.ico",
"installerHeaderIcon": "build/install.ico",
"allowToChangeInstallationDirectory": true,
"createDesktopShortcut": true,
"createStartMenuShortcut": true,
"deleteAppDataOnUninstall": true,
"shortcutName": "湖北襄阳四中-教研平台",
"allowElevation": true,
"perMachine": true
}
}

View File

@ -82,7 +82,6 @@ function createTray() {
// icon: iconPath, // icon: iconPath,
}, },
]); ]);
tray.setToolTip('智汇享');
tray.setContextMenu(contextMenu); tray.setContextMenu(contextMenu);
tray.on('click', () => { tray.on('click', () => {
mainWindow.webContents.send('isOpenWindows'); mainWindow.webContents.send('isOpenWindows');

View File

@ -7,15 +7,15 @@
"description": "智汇享", "description": "智汇享",
"scripts": { "scripts": {
"dev": "concurrently \"electron . --env=development\" \"cross-env BROWSER=none vite\"", "dev": "concurrently \"electron . --env=development\" \"cross-env BROWSER=none vite\"",
"test": "concurrently \"electron . --env=test\" \"cross-env BROWSER=none vite\"",
"prod": "concurrently \"electron . --env=production\" \"cross-env BROWSER=none vite\"", "prod": "concurrently \"electron . --env=production\" \"cross-env BROWSER=none vite\"",
"xy": "concurrently \"electron . --env=xy\" \"cross-env BROWSER=none vite\"",
"build": "vite build --mode development", "build": "vite build --mode development",
"build:test": "vite build --mode test",
"build:prod": "vite build --mode production", "build:prod": "vite build --mode production",
"build:xy": "vite build --mode xy",
"preview": "vite preview", "preview": "vite preview",
"build:dev-win": "vite build --mode development & electron-builder -w --config=./config/build.json", "build:dev-win": "vite build --mode development & electron-builder -w --config=./config/build.json",
"build:test-win": "vite build --mode test & electron-builder -w --config=./config/build.json", "build:prod-win": "vite build --mode production & electron-builder -w --config=./config/build.json",
"build:prod-win": "vite build --mode production & electron-builder -w --config=./config/build.json" "build:xy-win": "vite build --mode xy & electron-builder -w --config=./config/xy.json"
}, },
"agora_electron": { "agora_electron": {
"platform": "win32", "platform": "win32",

BIN
src/assets/icon53.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

View File

@ -173,7 +173,7 @@ const Login: React.FC = () => {
<> <>
<div className={styles.login}> <div className={styles.login}>
<div className={styles.loginBg}> <div className={styles.loginBg}>
<img src={ImageUrl.icon1} alt="" /> <img src={import.meta.env.VITE_ENV === 'xy' ? ImageUrl.icon53 : ImageUrl.icon1} alt="" />
</div> </div>
<div className={styles.loginContent}> <div className={styles.loginContent}>
<div> <div>

View File

@ -81,6 +81,7 @@ import virtualBackground5 from '@/assets/virtualBackground/5.png'
import virtualBackground6 from '@/assets/virtualBackground/6.png' import virtualBackground6 from '@/assets/virtualBackground/6.png'
import icon52 from '@/assets/icon52.png' import icon52 from '@/assets/icon52.png'
import icon52Select from '@/assets/icon52-select.png' import icon52Select from '@/assets/icon52-select.png'
import icon53 from '@/assets/icon53.png'
export default { export default {
loading, loading,
icon, icon,
@ -164,5 +165,6 @@ export default {
virtualBackground5, virtualBackground5,
virtualBackground6, virtualBackground6,
icon52, icon52,
icon52Select icon52Select,
icon53
} }