Compare commits

..

3 Commits

Author SHA1 Message Date
shefengchun 7223e51517 重写疏密校正界面 2023-01-11 10:15:01 +08:00
shefengchun 5f2fc69a06 修改 疏密校正界面 2023-01-10 16:45:56 +08:00
shefengchun 41d1913f72 投影机数量从后端动态显示个数 2023-01-09 15:03:43 +08:00
77 changed files with 11764 additions and 20453 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "media_player_client", "name": "media_player_client",
"version": "1.6.0", "version": "1.5.6",
"description": "A Quasar Framework app", "description": "A Quasar Framework app",
"productName": "MediaPlayerClient", "productName": "MediaPlayerClient",
"author": "fangxiang <fangxiang@cloudview.work>", "author": "fangxiang <fangxiang@cloudview.work>",
@ -9,18 +9,16 @@
"test": "echo \"No test specified\" && exit 0" "test": "echo \"No test specified\" && exit 0"
}, },
"dependencies": { "dependencies": {
"@quasar/cli": "^2.0.0", "@quasar/cli": "^1.3.2",
"@quasar/extras": "^1.15.11", "@quasar/extras": "^1.15.6",
"@tinymce/tinymce-vue": "4", "@tinymce/tinymce-vue": "4",
"@types/element-resize-detector": "^1.1.3", "@types/element-resize-detector": "^1.1.3",
"autoprefixer": "^10.4.2", "autoprefixer": "^10.4.2",
"axios": "^0.21.1", "axios": "^0.21.1",
"babel-loader": "^9.1.2",
"core-js": "^3.21.0", "core-js": "^3.21.0",
"element-resize-detector": "^1.2.4", "element-resize-detector": "^1.2.4",
"konva": "^8.4.2",
"qrcode.vue": "^3.3.3", "qrcode.vue": "^3.3.3",
"quasar": "^2.11.6", "quasar": "^2.10.2",
"reconnecting-websocket": "^4.4.0", "reconnecting-websocket": "^4.4.0",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"to": "^0.2.9", "to": "^0.2.9",
@ -29,15 +27,13 @@
"v-viewer": "^3.0.9", "v-viewer": "^3.0.9",
"vue": "^3.0.0", "vue": "^3.0.0",
"vue-i18n": "^9.1.9", "vue-i18n": "^9.1.9",
"vue-konva": "^3.0.2",
"vue-router": "^4.0.0", "vue-router": "^4.0.0",
"vue3-draggable-resizable": "^1.6.5",
"vuex": "^4.0.1", "vuex": "^4.0.1",
"zrender": "^5.3.1" "zrender": "^5.3.1"
}, },
"devDependencies": { "devDependencies": {
"@capacitor/core": "^2.5.0", "@capacitor/core": "^2.5.0",
"@quasar/app-webpack": "^3.7.1", "@quasar/app": "^3.3.3",
"@types/node": "^10.17.15", "@types/node": "^10.17.15",
"workbox-webpack-plugin": "^6.4.2" "workbox-webpack-plugin": "^6.4.2"
}, },

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

View File

@ -1,5 +1,3 @@
window.media_control_client_product = "LED_PLAYER"; window.media_control_client_product = "LED_PLAYER";
// window.media_control_client_product = "SPECIAL_VIDEO"; // window.media_control_client_product = "SPECIAL_VIDEO";
// window.media_control_client_product = "RK_3568"; // window.media_control_client_product = "RK_3568";
window.media_control_client_custom_title = "SmartPlayer";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

After

Width:  |  Height:  |  Size: 1.5 MiB

File diff suppressed because one or more lines are too long

View File

@ -1,3 +0,0 @@
This is where language files should be placed.
Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/

View File

@ -1,412 +0,0 @@
/*!
* TinyMCE Language Pack
*
* Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
* Licensed under the Tiny commercial license. See https://www.tiny.cloud/legal/
*/
tinymce.addI18n('zh-Hans', {
"Redo": "重做",
"Undo": "撤销",
"Cut": "剪切",
"Copy": "复制",
"Paste": "粘贴",
"Select all": "全选",
"New document": "新建文档",
"Ok": "确定",
"Cancel": "取消",
"Visual aids": "网格线",
"Bold": "粗体",
"Italic": "斜体",
"Underline": "下划线",
"Strikethrough": "删除线",
"Superscript": "上标",
"Subscript": "下标",
"Clear formatting": "清除格式",
"Remove": "移除",
"Align left": "左对齐",
"Align center": "居中对齐",
"Align right": "右对齐",
"No alignment": "未对齐",
"Justify": "两端对齐",
"Bullet list": "无序列表",
"Numbered list": "有序列表",
"Decrease indent": "减少缩进",
"Increase indent": "增加缩进",
"Close": "关闭",
"Formats": "格式",
"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.": "你的浏览器不支持打开剪贴板请使用Ctrl+X/C/V等快捷键。",
"Headings": "标题",
"Heading 1": "一级标题",
"Heading 2": "二级标题",
"Heading 3": "三级标题",
"Heading 4": "四级标题",
"Heading 5": "五级标题",
"Heading 6": "六级标题",
"Preformatted": "预先格式化的",
"Div": "Div",
"Pre": "前言",
"Code": "代码",
"Paragraph": "段落",
"Blockquote": "引文区块",
"Inline": "文本",
"Blocks": "样式",
"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "当前为纯文本粘贴模式,再次点击可以回到普通粘贴模式。",
"Fonts": "字体",
"Font sizes": "字体大小",
"Class": "类型",
"Browse for an image": "浏览图像",
"OR": "或",
"Drop an image here": "拖放一张图像至此",
"Upload": "上传",
"Uploading image": "上传图片",
"Block": "块",
"Align": "对齐",
"Default": "预设",
"Circle": "空心圆",
"Disc": "实心圆",
"Square": "实心方块",
"Lower Alpha": "小写英文字母",
"Lower Greek": "小写希腊字母",
"Lower Roman": "小写罗马数字",
"Upper Alpha": "大写英文字母",
"Upper Roman": "大写罗马数字",
"Anchor...": "锚点...",
"Anchor": "锚点",
"Name": "名称",
"ID": "ID",
"ID should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID应该以英文字母开头后面只能有英文字母、数字、破折号、点、冒号或下划线。",
"You have unsaved changes are you sure you want to navigate away?": "你还有文档尚未保存,确定要离开?",
"Restore last draft": "恢复上次的草稿",
"Special character...": "特殊字符...",
"Special Character": "特殊字符",
"Source code": "源代码",
"Insert/Edit code sample": "插入/编辑代码示例",
"Language": "语言",
"Code sample...": "示例代码...",
"Left to right": "由左到右",
"Right to left": "由右到左",
"Title": "标题",
"Fullscreen": "全屏",
"Action": "动作",
"Shortcut": "快捷方式",
"Help": "帮助",
"Address": "地址",
"Focus to menubar": "移动焦点到菜单栏",
"Focus to toolbar": "移动焦点到工具栏",
"Focus to element path": "移动焦点到元素路径",
"Focus to contextual toolbar": "移动焦点到上下文菜单",
"Insert link (if link plugin activated)": "插入链接 (如果链接插件已激活)",
"Save (if save plugin activated)": "保存(如果保存插件已激活)",
"Find (if searchreplace plugin activated)": "查找(如果查找替换插件已激活)",
"Plugins installed ({0}):": "已安装插件 ({0}):",
"Premium plugins:": "优秀插件:",
"Learn more...": "了解更多...",
"You are using {0}": "你正在使用 {0}",
"Plugins": "插件",
"Handy Shortcuts": "快捷键",
"Horizontal line": "水平分割线",
"Insert/edit image": "插入/编辑图片",
"Alternative description": "替代描述",
"Accessibility": "辅助功能",
"Image is decorative": "图像是装饰性的",
"Source": "源",
"Dimensions": "尺寸",
"Constrain proportions": "保持比例",
"General": "一般",
"Advanced": "高级",
"Style": "样式",
"Vertical space": "垂直间距",
"Horizontal space": "水平间距",
"Border": "框线",
"Insert image": "插入图片",
"Image...": "图片...",
"Image list": "图片清单",
"Resize": "调整大小",
"Insert date/time": "插入日期/时间",
"Date/time": "日期/时间",
"Insert/edit link": "插入/编辑链接",
"Text to display": "要显示的文本",
"Url": "地址",
"Open link in...": "链接打开位置...",
"Current window": "当前窗口",
"None": "无",
"New window": "新窗口",
"Open link": "打开链接",
"Remove link": "移除链接",
"Anchors": "锚点",
"Link...": "链接...",
"Paste or type a link": "粘贴或输入链接",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "你所填写的URL地址为邮件地址需要加上mailto: 前缀吗?",
"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "你所填写的URL地址属于外部链接需要加上http:// 前缀吗?",
"The URL you entered seems to be an external link. Do you want to add the required https:// prefix?": "您输入的 URL 似乎是一个外部链接。您想添加所需的 https:// 前缀吗?",
"Link list": "链接清单",
"Insert video": "插入视频",
"Insert/edit video": "插入/编辑视频",
"Insert/edit media": "插入/编辑媒体",
"Alternative source": "镜像",
"Alternative source URL": "替代来源网址",
"Media poster (Image URL)": "封面(图片地址)",
"Paste your embed code below:": "将内嵌代码粘贴在下面:",
"Embed": "内嵌",
"Media...": "多媒体...",
"Nonbreaking space": "不间断空格",
"Page break": "分页符",
"Paste as text": "粘贴为文本",
"Preview": "预览",
"Print": "打印",
"Print...": "打印...",
"Save": "保存",
"Find": "寻找",
"Replace with": "替换为",
"Replace": "替换",
"Replace all": "替换全部",
"Previous": "上一个",
"Next": "下一个",
"Find and Replace": "查找和替换",
"Find and replace...": "查找并替换...",
"Could not find the specified string.": "未找到搜索内容。",
"Match case": "大小写匹配",
"Find whole words only": "全字匹配",
"Find in selection": "在选区中查找",
"Insert table": "插入表格",
"Table properties": "表格属性",
"Delete table": "删除表格",
"Cell": "单元格",
"Row": "行",
"Column": "栏目",
"Cell properties": "单元格属性",
"Merge cells": "合并单元格",
"Split cell": "拆分单元格",
"Insert row before": "在上方插入行",
"Insert row after": "在下方插入行",
"Delete row": "删除行",
"Row properties": "行属性",
"Cut row": "剪切行",
"Cut column": "剪切列",
"Copy row": "复制行",
"Copy column": "复制列",
"Paste row before": "粘贴行到上方",
"Paste column before": "粘贴此列前",
"Paste row after": "粘贴行到下方",
"Paste column after": "粘贴后面的列",
"Insert column before": "在左侧插入列",
"Insert column after": "在右侧插入列",
"Delete column": "删除列",
"Cols": "列",
"Rows": "行数",
"Width": "宽度",
"Height": "高度",
"Cell spacing": "单元格外间距",
"Cell padding": "单元格内边距",
"Row clipboard actions": "行剪贴板操作",
"Column clipboard actions": "列剪贴板操作",
"Table styles": "表格样式",
"Cell styles": "单元格样式",
"Column header": "列标题",
"Row header": "行头",
"Table caption": "表格标题",
"Caption": "标题",
"Show caption": "显示标题",
"Left": "左",
"Center": "居中",
"Right": "右",
"Cell type": "储存格别",
"Scope": "范围",
"Alignment": "对齐",
"Horizontal align": "水平对齐",
"Vertical align": "垂直对齐",
"Top": "上方对齐",
"Middle": "居中对齐",
"Bottom": "下方对齐",
"Header cell": "表头单元格",
"Row group": "行组",
"Column group": "列组",
"Row type": "行类型",
"Header": "表头",
"Body": "表体",
"Footer": "表尾",
"Border color": "框线颜色",
"Solid": "实线",
"Dotted": "虚线",
"Dashed": "虚线",
"Double": "双精度",
"Groove": "凹槽",
"Ridge": "海脊座",
"Inset": "嵌入",
"Outset": "外置",
"Hidden": "隐藏",
"Insert template...": "插入模板...",
"Templates": "模板",
"Template": "模板",
"Insert Template": "插入模板",
"Text color": "文本颜色",
"Background color": "背景颜色",
"Custom...": "自定义......",
"Custom color": "自定义颜色",
"No color": "无",
"Remove color": "移除颜色",
"Show blocks": "显示区块边框",
"Show invisible characters": "显示不可见字符",
"Word count": "字数",
"Count": "计数",
"Document": "文档",
"Selection": "选择",
"Words": "单词",
"Words: {0}": "字数:{0}",
"{0} words": "{0} 字",
"File": "文件",
"Edit": "编辑",
"Insert": "插入",
"View": "查看",
"Format": "格式",
"Table": "表格",
"Tools": "工具",
"Powered by {0}": "由{0}驱动",
"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "编辑区。按ALT-F9打开菜单按ALT-F10打开工具栏按ALT-0查看帮助",
"Image title": "图片标题",
"Border width": "边框宽度",
"Border style": "边框样式",
"Error": "错误",
"Warn": "警告",
"Valid": "有效",
"To open the popup, press Shift+Enter": "按Shitf+Enter键打开对话框",
"Rich Text Area": "富文本区域",
"Rich Text Area. Press ALT-0 for help.": "编辑区。按Alt+0键打开帮助。",
"System Font": "系统字体",
"Failed to upload image: {0}": "图片上传失败: {0}",
"Failed to load plugin: {0} from url {1}": "插件加载失败: {0} 来自链接 {1}",
"Failed to load plugin url: {0}": "插件加载失败 链接: {0}",
"Failed to initialize plugin: {0}": "插件初始化失败: {0}",
"example": "示例",
"Search": "搜索",
"All": "全部",
"Currency": "货币",
"Text": "文字",
"Quotations": "引用",
"Mathematical": "数学",
"Extended Latin": "拉丁语扩充",
"Symbols": "符号",
"Arrows": "箭头",
"User Defined": "自定义",
"dollar sign": "美元符号",
"currency sign": "货币符号",
"euro-currency sign": "欧元符号",
"colon sign": "冒号",
"cruzeiro sign": "克鲁赛罗币符号",
"french franc sign": "法郎符号",
"lira sign": "里拉符号",
"mill sign": "密尔符号",
"naira sign": "奈拉符号",
"peseta sign": "比塞塔符号",
"rupee sign": "卢比符号",
"won sign": "韩元符号",
"new sheqel sign": "新谢克尔符号",
"dong sign": "越南盾符号",
"kip sign": "老挝基普符号",
"tugrik sign": "图格里克符号",
"drachma sign": "德拉克马符号",
"german penny symbol": "德国便士符号",
"peso sign": "比索符号",
"guarani sign": "瓜拉尼符号",
"austral sign": "澳元符号",
"hryvnia sign": "格里夫尼亚符号",
"cedi sign": "塞地符号",
"livre tournois sign": "里弗弗尔符号",
"spesmilo sign": "spesmilo符号",
"tenge sign": "坚戈符号",
"indian rupee sign": "印度卢比",
"turkish lira sign": "土耳其里拉",
"nordic mark sign": "北欧马克",
"manat sign": "马纳特符号",
"ruble sign": "卢布符号",
"yen character": "日元字样",
"yuan character": "人民币元字样",
"yuan character, in hong kong and taiwan": "元字样(港台地区)",
"yen/yuan character variant one": "元字样(大写)",
"Emojis": "Emojis",
"Emojis...": "Emojis...",
"Loading emojis...": "正在加载Emojis...",
"Could not load emojis": "无法加载Emojis",
"People": "人类",
"Animals and Nature": "动物和自然",
"Food and Drink": "食物和饮品",
"Activity": "活动",
"Travel and Places": "旅游和地点",
"Objects": "物件",
"Flags": "旗帜",
"Characters": "字符",
"Characters (no spaces)": "字符(无空格)",
"{0} characters": "{0} 个字符",
"Error: Form submit field collision.": "错误: 表单提交字段冲突。",
"Error: No form element found.": "错误: 没有表单控件。",
"Color swatch": "颜色样本",
"Color Picker": "选色器",
"Invalid hex color code: {0}": "十六进制颜色代码无效: {0}",
"Invalid input": "无效输入",
"R": "R",
"Red component": "红色部分",
"G": "G",
"Green component": "绿色部分",
"B": "B",
"Blue component": "白色部分",
"#": "#",
"Hex color code": "十六进制颜色代码",
"Range 0 to 255": "范围0至255",
"Turquoise": "青绿色",
"Green": "绿色",
"Blue": "蓝色",
"Purple": "紫色",
"Navy Blue": "海军蓝",
"Dark Turquoise": "深蓝绿色",
"Dark Green": "深绿色",
"Medium Blue": "中蓝色",
"Medium Purple": "中紫色",
"Midnight Blue": "深蓝色",
"Yellow": "黄色",
"Orange": "橙色",
"Red": "红色",
"Light Gray": "浅灰色",
"Gray": "灰色",
"Dark Yellow": "暗黄色",
"Dark Orange": "深橙色",
"Dark Red": "深红色",
"Medium Gray": "中灰色",
"Dark Gray": "深灰色",
"Light Green": "浅绿色",
"Light Yellow": "浅黄色",
"Light Red": "浅红色",
"Light Purple": "浅紫色",
"Light Blue": "浅蓝色",
"Dark Purple": "深紫色",
"Dark Blue": "深蓝色",
"Black": "黑色",
"White": "白色",
"Switch to or from fullscreen mode": "切换全屏模式",
"Open help dialog": "打开帮助对话框",
"history": "历史",
"styles": "样式",
"formatting": "格式化",
"alignment": "对齐",
"indentation": "缩进",
"Font": "字体",
"Size": "字号",
"More...": "更多...",
"Select...": "选择...",
"Preferences": "首选项",
"Yes": "是",
"No": "否",
"Keyboard Navigation": "键盘指引",
"Version": "版本",
"Code view": "代码视图",
"Open popup menu for split buttons": "打开弹出式菜单,用于拆分按钮",
"List Properties": "列表属性",
"List properties...": "标题字体属性",
"Start list at number": "以数字开始列表",
"Line height": "行高",
"Dropped file type is not supported": "此文件类型不支持拖放",
"Loading...": "加载中...",
"ImageProxy HTTP error: Rejected request": "图片代理请求错误:请求被拒绝",
"ImageProxy HTTP error: Could not find Image Proxy": "图片代理请求错误:无法找到图片代理",
"ImageProxy HTTP error: Incorrect Image Proxy URL": "图片代理请求错误:图片代理地址错误",
"ImageProxy HTTP error: Unknown ImageProxy error": "图片代理请求错误:未知的图片代理错误"
});

View File

@ -0,0 +1,417 @@
tinymce.addI18n('zh_CN',{
"Redo": "恢复",
"Undo": "撤销",
"Cut": "剪切",
"Copy": "复制",
"Paste": "粘贴",
"Select all": "全选",
"New document": "新建文档",
"Ok": "确定",
"Cancel": "取消",
"Visual aids": "网格线",
"Bold": "粗体",
"Italic": "斜体",
"Underline": "下划线",
"Strikethrough": "删除线",
"Superscript": "上标",
"Subscript": "下标",
"Clear formatting": "清除格式",
"Align left": "左对齐",
"Align center": "居中",
"Align right": "右对齐",
"Justify": "两端对齐",
"Bullet list": "符号列表",
"Numbered list": "数字列表",
"Decrease indent": "减少缩进",
"Increase indent": "增加缩进",
"Close": "关闭",
"Formats": "格式",
"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "当前浏览器不支持访问剪贴板请使用快捷键Ctrl+X/C/V复制粘贴",
"Headers": "标题",
"Header 1": "标题1",
"Header 2": "标题2",
"Header 3": "标题3",
"Header 4": "标题4",
"Header 5": "标题5",
"Header 6": "标题6",
"Headings": "标题",
"Heading 1": "标题1",
"Heading 2": "标题2",
"Heading 3": "标题3",
"Heading 4": "标题4",
"Heading 5": "标题5",
"Heading 6": "标题6",
"Preformatted": "预格式化",
"Div": "Div区块",
"Pre": "预格式文本",
"Code": "代码",
"Paragraph": "段落",
"Blockquote": "引用",
"Inline": "文本",
"Blocks": "区块",
"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "当前为纯文本粘贴模式,再次点击可以回到普通粘贴模式。",
"Fonts": "字体",
"Font Sizes": "字号",
"Class": "Class",
"Browse for an image": "浏览图像",
"OR": "或",
"Drop an image here": "拖放一张图片文件至此",
"Upload": "上传",
"Block": "块",
"Align": "对齐",
"Default": "默认",
"Circle": "空心圆",
"Disc": "实心圆",
"Square": "方块",
"Lower Alpha": "小写英文字母",
"Lower Greek": "小写希腊字母",
"Lower Roman": "小写罗马字母",
"Upper Alpha": "大写英文字母",
"Upper Roman": "大写罗马字母",
"Anchor...": "锚点...",
"Name": "名称",
"Id": "id",
"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id应该以字母开头后跟字母、数字、横线、点、冒号或下划线。",
"You have unsaved changes are you sure you want to navigate away?": "你对文档的修改尚未保存,确定离开吗?",
"Restore last draft": "恢复上次的草稿",
"Special characters...": "特殊字符...",
"Source code": "HTML源码",
"Insert\/Edit code sample": "插入/编辑代码示例",
"Language": "语言",
"Code sample...": "代码示例...",
"Color Picker": "选取颜色",
"R": "R",
"G": "G",
"B": "B",
"Left to right": "从左到右",
"Right to left": "从右到左",
"Emoticons...": "表情符号...",
"Metadata and Document Properties": "元数据和文档属性",
"Title": "标题",
"Keywords": "关键词",
"Description": "描述",
"Robots": "机器人",
"Author": "作者",
"Encoding": "编码",
"Fullscreen": "全屏",
"Action": "操作",
"Shortcut": "快捷键",
"Help": "帮助",
"Address": "地址",
"Focus to menubar": "移动焦点到菜单栏",
"Focus to toolbar": "移动焦点到工具栏",
"Focus to element path": "移动焦点到元素路径",
"Focus to contextual toolbar": "移动焦点到上下文菜单",
"Insert link (if link plugin activated)": "插入链接 (如果链接插件已激活)",
"Save (if save plugin activated)": "保存(如果保存插件已激活)",
"Find (if searchreplace plugin activated)": "查找(如果查找替换插件已激活)",
"Plugins installed ({0}):": "已安装插件 ({0})",
"Premium plugins:": "优秀插件:",
"Learn more...": "了解更多...",
"You are using {0}": "你正在使用 {0}",
"Plugins": "插件",
"Handy Shortcuts": "快捷键",
"Horizontal line": "水平分割线",
"Insert\/edit image": "插入/编辑图片",
"Image description": "图片描述",
"Source": "地址",
"Dimensions": "大小",
"Constrain proportions": "保持宽高比",
"General": "常规",
"Advanced": "高级",
"Style": "样式",
"Vertical space": "垂直边距",
"Horizontal space": "水平边距",
"Border": "边框",
"Insert image": "插入图片",
"Image...": "图片...",
"Image list": "图片列表",
"Rotate counterclockwise": "逆时针旋转",
"Rotate clockwise": "顺时针旋转",
"Flip vertically": "垂直翻转",
"Flip horizontally": "水平翻转",
"Edit image": "编辑图片",
"Image options": "图片选项",
"Zoom in": "放大",
"Zoom out": "缩小",
"Crop": "裁剪",
"Resize": "调整大小",
"Orientation": "方向",
"Brightness": "亮度",
"Sharpen": "锐化",
"Contrast": "对比度",
"Color levels": "色阶",
"Gamma": "伽马值",
"Invert": "反转",
"Apply": "应用",
"Back": "后退",
"Insert date\/time": "插入日期/时间",
"Date\/time": "日期/时间",
"Insert\/Edit Link": "插入/编辑链接",
"Insert\/edit link": "插入/编辑链接",
"Text to display": "显示文字",
"Url": "地址",
"Open link in...": "链接打开方式...",
"Current window": "当前窗口打开",
"None": "在当前窗口/框架打开",
"New window": "在新窗口打开",
"Remove link": "删除链接",
"Anchors": "锚点",
"Link...": "链接...",
"Paste or type a link": "粘贴或输入链接",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "你所填写的URL地址为邮件地址需要加上mailto:前缀吗?",
"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "你所填写的URL地址属于外部链接需要加上http://:前缀吗?",
"Link list": "链接列表",
"Insert video": "插入视频",
"Insert\/edit video": "插入/编辑视频",
"Insert\/edit media": "插入/编辑媒体",
"Alternative source": "替代资源",
"Alternative image URL": "资源备用地址",
"Media poster (Image URL)": "封面(图片地址)",
"Paste your embed code below:": "将内嵌代码粘贴在下面:",
"Embed": "内嵌",
"Media...": "多媒体...",
"Nonbreaking space": "不间断空格",
"Page break": "分页符",
"Paste as text": "粘贴为文本",
"Preview": "预览",
"Print...": "打印...",
"Save": "保存",
"Find": "查找",
"Replace with": "替换为",
"Replace": "替换",
"Replace all": "替换全部",
"Previous": "上一个",
"Next": "下一个",
"Find and replace...": "查找并替换...",
"Could not find the specified string.": "未找到搜索内容。",
"Match case": "区分大小写",
"Find whole words only": "全单词匹配",
"Spell check": "拼写检查",
"Ignore": "忽略",
"Ignore all": "忽略全部",
"Finish": "完成",
"Add to Dictionary": "添加到字典",
"Insert table": "插入表格",
"Table properties": "表格属性",
"Delete table": "删除表格",
"Cell": "单元格",
"Row": "行",
"Column": "列",
"Cell properties": "单元格属性",
"Merge cells": "合并单元格",
"Split cell": "拆分单元格",
"Insert row before": "在上方插入",
"Insert row after": "在下方插入",
"Delete row": "删除行",
"Row properties": "行属性",
"Cut row": "剪切行",
"Copy row": "复制行",
"Paste row before": "粘贴到上方",
"Paste row after": "粘贴到下方",
"Insert column before": "在左侧插入",
"Insert column after": "在右侧插入",
"Delete column": "删除列",
"Cols": "列",
"Rows": "行",
"Width": "宽",
"Height": "高",
"Cell spacing": "单元格外间距",
"Cell padding": "单元格内边距",
"Show caption": "显示标题",
"Left": "左对齐",
"Center": "居中",
"Right": "右对齐",
"Cell type": "单元格类型",
"Scope": "范围",
"Alignment": "对齐方式",
"H Align": "水平对齐",
"V Align": "垂直对齐",
"Top": "顶部对齐",
"Middle": "垂直居中",
"Bottom": "底部对齐",
"Header cell": "表头单元格",
"Row group": "行组",
"Column group": "列组",
"Row type": "行类型",
"Header": "表头",
"Body": "表体",
"Footer": "表尾",
"Border color": "边框颜色",
"Insert template...": "插入模板...",
"Templates": "模板",
"Template": "模板",
"Text color": "文字颜色",
"Background color": "背景色",
"Custom...": "自定义...",
"Custom color": "自定义颜色",
"No color": "无",
"Remove color": "删除颜色",
"Table of Contents": "目录",
"Show blocks": "显示区块边框",
"Show invisible characters": "显示不可见字符",
"Word count": "字数统计",
"Words: {0}": "字数:{0}",
"{0} words": "{0} 个字",
"File": "文件",
"Edit": "编辑",
"Insert": "插入",
"View": "查看",
"Format": "格式",
"Table": "表格",
"Tools": "工具",
"Powered by {0}": "Powered by {0}",
"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "在编辑区按ALT+F9打开菜单按ALT+F10打开工具栏按ALT+0查看帮助",
"Image title": "图片标题",
"Border width": "边框宽度",
"Border style": "边框样式",
"Error": "错误",
"Warn": "警告",
"Valid": "有效",
"To open the popup, press Shift+Enter": "此快捷为软回车(插入<br>",
"Rich Text Area. Press ALT-0 for help.": "编辑区. 按Alt+0键打开帮助",
"System Font": "默认字体",
"Failed to upload image: {0}": "图片上传失败: {0}",
"Failed to load plugin: {0} from url {1}": "插件加载失败: {0} - {1}",
"Failed to load plugin url: {0}": "插件加载失败: {0}",
"Failed to initialize plugin: {0}": "插件初始化失败: {0}",
"example": "示例",
"Search": "查找",
"All": "全部",
"Currency": "货币",
"Text": "文本",
"Quotations": "引用",
"Mathematical": "数学运算符",
"Extended Latin": "拉丁语扩充",
"Symbols": "符号",
"Arrows": "箭头",
"User Defined": "自定义",
"dollar sign": "美元",
"currency sign": "货币",
"euro-currency sign": "欧元",
"colon sign": "冒号",
"cruzeiro sign": "克鲁赛罗币",
"french franc sign": "法郎",
"lira sign": "里拉",
"mill sign": "密尔",
"naira sign": "奈拉",
"peseta sign": "比塞塔",
"rupee sign": "卢比",
"won sign": "韩元",
"new sheqel sign": "新谢克尔",
"dong sign": "越南盾",
"kip sign": "老挝基普",
"tugrik sign": "图格里克",
"drachma sign": "德拉克马",
"german penny symbol": "德国便士",
"peso sign": "比索",
"guarani sign": "瓜拉尼",
"austral sign": "澳元",
"hryvnia sign": "格里夫尼亚",
"cedi sign": "塞地",
"livre tournois sign": "里弗弗尔",
"spesmilo sign": "一千spesoj的货币符号该货币未使用",
"tenge sign": "坚戈",
"indian rupee sign": "印度卢比",
"turkish lira sign": "土耳其里拉",
"nordic mark sign": "北欧马克",
"manat sign": "马纳特",
"ruble sign": "卢布",
"yen character": "日元",
"yuan character": "人民币元",
"yuan character, in hong kong and taiwan": "元的繁体字",
"yen\/yuan character variant one": "元(大写)",
"Loading emoticons...": "正在加载表情文字...",
"Could not load emoticons": "不能加载表情文字",
"People": "人类",
"Animals and Nature": "动物和自然",
"Food and Drink": "食物和饮品",
"Activity": "活动",
"Travel and Places": "旅游和地点",
"Objects": "物件",
"Flags": "旗帜",
"Characters": "字数",
"Characters (no spaces)": "字数(不含空格)",
"Error: Form submit field collision.": "错误: 表单提交字段冲突.",
"Error: No form element found.": "错误: 未找到可用的form.",
"Update": "更新",
"Color swatch": "颜色样本",
"Turquoise": "青绿",
"Green": "绿色",
"Blue": "蓝色",
"Purple": "紫色",
"Navy Blue": "海军蓝",
"Dark Turquoise": "深蓝绿色",
"Dark Green": "暗绿",
"Medium Blue": "中蓝",
"Medium Purple": "中紫",
"Midnight Blue": "深蓝",
"Yellow": "黄色",
"Orange": "橙色",
"Red": "红色",
"Light Gray": "浅灰",
"Gray": "灰色",
"Dark Yellow": "暗黄",
"Dark Orange": "暗橙",
"Dark Red": "暗红",
"Medium Gray": "中灰",
"Dark Gray": "深灰",
"Black": "黑色",
"White": "白色",
"Switch to or from fullscreen mode": "切换全屏模式",
"Open help dialog": "打开帮助对话框",
"history": "历史",
"styles": "样式",
"formatting": "格式化",
"alignment": "对齐",
"indentation": "缩进",
"permanent pen": "记号笔",
"comments": "注释",
"Anchor": "锚点",
"Special character": "特殊字符",
"Code sample": "代码示例",
"Color": "颜色",
"Emoticons": "表情",
"Document properties": "文档属性",
"Image": "图片",
"Insert link": "插入链接",
"Target": "目标",
"Link": "链接",
"Poster": "封面",
"Media": "音视频",
"Print": "打印",
"Prev": "上一个",
"Find and replace": "查找并替换",
"Whole words": "全字匹配",
"Spellcheck": "拼写检查",
"Caption": "标题",
"Insert template": "插入模板",
//以下为补充汉化内容 by 莫若卿
"Code view": "代码区域",
"Select...": "选择...",
"Format Painter": "格式刷",
"No templates defined.": "无内置模板",
"Special character...": "特殊字符...",
"Open link": "打开链接",
"None": "无",
"Count": "统计",
"Document": "整个文档",
"Selection": "选取部分",
"Words": "字词数",
"{0} characters": "{0} 个字符",
"Alternative source URL": "替代资源地址",
"Alternative description": "替代说明文字",
"Accessibility": "可访问性",
"Image is decorative": "仅用于装饰",
//5.6新增
"Line height": "行高",
"Cut column": "剪切列",
"Copy column": "复制列",
"Paste column before": "粘贴到前方",
"Paste column after": "粘贴到后方",
"Copy column": "复制列",
//帮助窗口内的文字
"Version": "版本",
"Keyboard Navigation": "键盘导航",
"Open popup menu for split buttons": "该组合键的作用是软回车插入br",
});

View File

@ -1,21 +0,0 @@
MIT License
Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -41,12 +41,9 @@ module.exports = configure(function (ctx) {
// Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
build: { build: {
vueRouterMode: "hash", // available values: 'hash', 'history' vueRouterMode: "hash", // available values: 'hash', 'history'
uglifyOptions: {
compress: {
drop_console: true,
},
},
// transpile: false, // transpile: false,
// Add dependencies for transpiling with Babel (Array of string/regex) // Add dependencies for transpiling with Babel (Array of string/regex)
// (from node_modules, which are by default not transpiled). // (from node_modules, which are by default not transpiled).
// Applies only if "transpile" is set to true. // Applies only if "transpile" is set to true.
@ -55,7 +52,7 @@ module.exports = configure(function (ctx) {
// rtl: true, // https://v2.quasar.dev/options/rtl-support // rtl: true, // https://v2.quasar.dev/options/rtl-support
// preloadChunks: true, // preloadChunks: true,
// showProgress: false, // showProgress: false,
gzip: true, // gzip: true,
// analyze: true, // analyze: true,
// Options below are automatically set depending on the env, set them if you want to override // Options below are automatically set depending on the env, set them if you want to override

View File

@ -10,13 +10,10 @@ import { SessionStorage, Cookies, useQuasar, setCssVar } from "quasar";
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import EventBus, { EventNamesDefine } from "src/common/EventBus"; import EventBus, { EventNamesDefine } from "src/common/EventBus";
import { IWuJieInterface, useStore } from "src/store"; import { useStore } from "src/store";
import GlobalData from "./common/GlobalData"; import GlobalData from "./common/GlobalData";
import { EProductNames } from "./entities/ProductNames"; import { EProductNames } from "./entities/ProductNames";
import { api } from "./boot/axios"; import { api } from "./boot/axios";
import { WuJieInitializer } from "./common/WuJieInitializer";
import ClientConnection from "./common/ClientConnection";
import { Common } from "./common/Common";
export default defineComponent({ export default defineComponent({
name: "App", name: "App",
@ -26,12 +23,6 @@ export default defineComponent({
const $store = useStore(); const $store = useStore();
const $q = useQuasar(); const $q = useQuasar();
if ((window as any).$wujie) {
const $wujie = (window as any).$wujie as IWuJieInterface;
$store.commit("setWuJie", $wujie);
WuJieInitializer.initialize($wujie, $store, $q, $t);
}
document.title = $t.t("title"); document.title = $t.t("title");
if (!navigator.cookieEnabled) { if (!navigator.cookieEnabled) {
@ -72,12 +63,7 @@ export default defineComponent({
(<any>window).media_control_client_product == EProductNames.LED_PLAYER || (<any>window).media_control_client_product == EProductNames.LED_PLAYER ||
(<any>window).media_control_client_product == EProductNames.OLD_LED_PLAYER (<any>window).media_control_client_product == EProductNames.OLD_LED_PLAYER
) { ) {
const custom_title = (<any>window).media_control_client_custom_title;
if (custom_title && typeof custom_title == "string") {
document.title = custom_title;
} else {
document.title = $t.t("LedPlayer") + "WebApp"; document.title = $t.t("LedPlayer") + "WebApp";
}
} else if ( } else if (
(<any>window).media_control_client_product == EProductNames.SPECIAL_VIDEO (<any>window).media_control_client_product == EProductNames.SPECIAL_VIDEO
) { ) {
@ -286,40 +272,6 @@ export default defineComponent({
}); });
} }
EventBus.getInstance().on(
EventNamesDefine.CurrentConnectConnected,
async (connection: ClientConnection) => {
const show_version_tip = () =>
$q.dialog({
persistent: true,
title: $t.t("Version Mismatch !"),
message: $t.t(
"Version Mismatch ! Please Upgrade The Software Again ! Otherwise, The File Function Cannot Be Used !"
),
});
if (connection) {
let count = 0;
while (
connection &&
!connection.is_login &&
count < (1000 * 10) / 100 /* 10 S */
) {
await Common.waitFor(100);
}
if (count < (1000 * 10) / 100) {
try {
const response = await connection.getHttpInterfaceVersion();
if (!response || response.version != 2) {
show_version_tip();
}
} catch (e) {
show_version_tip();
}
}
}
}
);
return {}; return {};
}, },
}); });

View File

@ -16,7 +16,6 @@ import JointActionEquipmentTableEntity from "src/entities/JointActionEquipmentTa
import { CustomProtocol } from "src/entities/WSProtocolCustom"; import { CustomProtocol } from "src/entities/WSProtocolCustom";
import ClientConnectionCustom from "./ClientConnectionCustom"; import ClientConnectionCustom from "./ClientConnectionCustom";
import MagicWallConfig from "src/entities/MagicWallConfig"; import MagicWallConfig from "src/entities/MagicWallConfig";
import WuJieReconnectingWebSocket from "./WuJieReconnectingWebSocket";
class _RpcInfo { class _RpcInfo {
send_timestamp: number; send_timestamp: number;
@ -46,7 +45,7 @@ class _RpcInfo {
} }
export default class ClientConnection { export default class ClientConnection {
ws: ReconnectingWebSocket | null | WuJieReconnectingWebSocket = null; ws: ReconnectingWebSocket | null = null;
url = ""; url = "";
user_name = ""; user_name = "";
password = ""; password = "";
@ -68,17 +67,14 @@ export default class ClientConnection {
this.url = url; this.url = url;
this.user_name = user_name ?? ""; this.user_name = user_name ?? "";
this.password = password ?? ""; this.password = password ?? "";
const $wujie = (window as any).$wujie;
if (this.ws) { if (this.ws) {
this.ws.close(); this.ws.close();
} }
if ($wujie) {
this.ws = new WuJieReconnectingWebSocket();
} else {
this.ws = new ReconnectingWebSocket(url); this.ws = new ReconnectingWebSocket(url);
}
this.initializeWs(); this.initializeWs();
setInterval(() => { setInterval(() => {
this.checkRpcTimeout(); this.checkRpcTimeout();
}, 1000); }, 1000);
@ -108,13 +104,13 @@ export default class ClientConnection {
initializeWs() { initializeWs() {
if (this.ws) { if (this.ws) {
this.ws.onclose = (ev: any) => { this.ws.onclose = (ev) => {
this.onClose(ev); this.onClose(ev);
}; };
this.ws.onerror = (ev: any) => { this.ws.onerror = (ev) => {
this.onError(ev); this.onError(ev);
}; };
this.ws.onopen = (ev: any) => { this.ws.onopen = (ev) => {
this.onOpen(ev); this.onOpen(ev);
}; };
this.ws.onmessage = (ev) => { this.ws.onmessage = (ev) => {
@ -710,23 +706,6 @@ export default class ClientConnection {
) )
); );
} }
public setMagicWallList(list:any) {
this.ws?.send(
JSON.stringify(
new Protocol.SetApplicationConfigRequestEntity(
0,
"magic_list",
typeof (list) == 'string' ? list : JSON.stringify(list)
)
)
);
}
public setConfigure(k: string, v: string) {
this.ws?.send(
JSON.stringify(new Protocol.SetApplicationConfigRequestEntity(0, k, v))
);
}
public setUserName(user_name: string) { public setUserName(user_name: string) {
this.ws?.send( this.ws?.send(
@ -834,7 +813,6 @@ export default class ClientConnection {
active_code: string, active_code: string,
online: boolean, online: boolean,
active_forever: boolean, active_forever: boolean,
attribute: number,
secret_key?: string, secret_key?: string,
hour?: number hour?: number
) { ) {
@ -845,7 +823,6 @@ export default class ClientConnection {
active_code, active_code,
online, online,
active_forever, active_forever,
attribute,
secret_key, secret_key,
hour, hour,
0 0
@ -1265,6 +1242,7 @@ export default class ClientConnection {
console.error(e); console.error(e);
} }
} }
public async setMagicWallConfig(config: MagicWallConfig) { public async setMagicWallConfig(config: MagicWallConfig) {
try { try {
return await this.doRpc<Protocol.RpcSetMagicWallConfigResponseEntity>( return await this.doRpc<Protocol.RpcSetMagicWallConfigResponseEntity>(
@ -1274,26 +1252,7 @@ export default class ClientConnection {
console.error(e); console.error(e);
} }
} }
//
public async getMagicWallGridState() {
try {
return await this.doRpc<Protocol.RpcGetMagicWallGridStateResponseEntity>(
new Protocol.RpcGetMagicWallGridStateRequestEntity()
);
} catch (e) {
console.error(e);
}
}
public async setMagicWallGridState(show_grid: boolean) {
try {
return await this.doRpc<Protocol.RpcSetMagicWallGridStateResponseEntity>(
new Protocol.RpcSetMagicWallGridStateRequestEntity(show_grid)
);
} catch (e) {
console.error(e);
}
}
public async testA( public async testA(
x: number, x: number,
y: number, y: number,
@ -1356,12 +1315,6 @@ export default class ClientConnection {
); );
} }
public async getHttpInterfaceVersion() {
return await this.doRpc<Protocol.RpcGetHttpInterfaceVersionResponseEntity>(
new Protocol.RpcGetHttpInterfaceVersionRequestEntity()
);
}
public async setJointActionEquipment( public async setJointActionEquipment(
entity: JointActionEquipmentTableEntity entity: JointActionEquipmentTableEntity
) { ) {
@ -1380,7 +1333,6 @@ export default class ClientConnection {
row: number, row: number,
column: number, column: number,
correction_type: number, correction_type: number,
control_point_count: number,
control_point: number, control_point: number,
x: number, x: number,
y: number y: number
@ -1390,7 +1342,6 @@ export default class ClientConnection {
row, row,
column, column,
correction_type, correction_type,
control_point_count,
control_point, control_point,
x, x,
y y
@ -1446,9 +1397,13 @@ export default class ClientConnection {
); );
} }
public async EnableBlending(enable: boolean) { public async EnableBlending(
enable: boolean
) {
return await this.doRpc<Protocol.NoneResponse>( return await this.doRpc<Protocol.NoneResponse>(
new Protocol.EnableBlendingRequestEntity(enable) new Protocol.EnableBlendingRequestEntity(
enable
)
); );
} }
@ -1457,8 +1412,7 @@ export default class ClientConnection {
column: number, column: number,
location: number, location: number,
enable: boolean, enable: boolean,
width: number, width: number
auto_sync: boolean,
) { ) {
return await this.doRpc<Protocol.NoneResponse>( return await this.doRpc<Protocol.NoneResponse>(
new Protocol.SetBlendingOverlapRequestEntity( new Protocol.SetBlendingOverlapRequestEntity(
@ -1466,8 +1420,7 @@ export default class ClientConnection {
column, column,
location, location,
enable, enable,
width, width
auto_sync
) )
); );
} }
@ -1484,118 +1437,6 @@ export default class ClientConnection {
); );
} }
public async SetBlendingHorDensity(
row: number,
column: number,
control_point_count: number,
control_point: number,
value: number
) {
return await this.doRpc<Protocol.NoneResponse>(
new Protocol.SetBlendingHorDensityRequestEntity(
row,
column,
control_point_count,
control_point,
value
)
);
}
public async SetBlendingVerDensity(
row: number,
column: number,
control_point_count: number,
control_point: number,
value: number
) {
return await this.doRpc<Protocol.NoneResponse>(
new Protocol.SetBlendingVerDensityRequestEntity(
row,
column,
control_point_count,
control_point,
value
)
);
}
public async ResetBlendingConfig() {
return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
new Protocol.ResetBlendingConfigRequestEntity()
);
}
public async SetBlendingOption(id: string, value: string) {
return await this.doRpc<Protocol.NoneResponse>(
new Protocol.SetBlendingOptionRequestEntity(id, value)
);
}
public async EnumBlendingScene() {
return await this.doRpc<Protocol.EnumBlendingSceneResponseEntity>(
new Protocol.EnumBlendingSceneRequestEntity()
);
}
public async ApplyBlendingScene(name: string) {
return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
new Protocol.ApplyBlendingSceneRequestEntity(name)
);
}
public async DeleteBlendingScene(name: string) {
return await this.doRpc<Protocol.RpcBlendingResponseEntity>(
new Protocol.DeleteBlendingSceneRequestEntity(name)
);
}
public async AddBlendingCtrlPoint(
type: string,
row: number,
column: number,
count: number
) {
return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
new Protocol.AddBlendingCtrlPointRequestEntity(type, row, column, count)
);
}
public async DelBlendingCtrlPoint(
type: string,
row: number,
column: number,
count: number
) {
return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
new Protocol.DelBlendingCtrlPointRequestEntity(type, row, column, count)
);
}
public async SetProjectorResolution(width: number, height: number) {
return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
new Protocol.SetProjectorResolutionRequestEntity(width, height)
);
}
public async SetProjectorLayout(row: number, column: number) {
return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
new Protocol.SetProjectorLayoutRequestEntity(row, column)
);
}
public async setCloudServerSetting(
cloud_server_address: string,
cloud_server_verify_key: string,
cloud_server_use_wss: boolean,
cloud_server_enable: boolean
) {
this.setConfigure("cloud_server_address", cloud_server_address);
this.setConfigure("cloud_server_verify_key", cloud_server_verify_key);
this.setConfigure("cloud_server_use_wss", cloud_server_use_wss ? "1" : "0");
this.setConfigure("cloud_server_enable", cloud_server_enable ? "1" : "0");
}
public destory() { public destory() {
this.ws?.close(); this.ws?.close();
if (this.ws) { if (this.ws) {
@ -1606,59 +1447,6 @@ export default class ClientConnection {
} }
this.ws = null; this.ws = null;
} }
public async getFileListFileManager(dir_path: string) {
try {
return await this.doRpc<Protocol.RpcFileManagerGetFileListResponse>(
new Protocol.RpcFileManagerGetFileListRequest(dir_path)
);
} catch (e) {
console.error(e);
}
}
public async RenameFileManager(
base_dir: string,
file_name: string,
new_file_name: string
) {
try {
return await this.doRpc<Protocol.RpcFileManagerRenameResponse>(
new Protocol.RpcFileManagerRenameRequest(
base_dir,
file_name,
new_file_name
)
);
} catch (e) {
console.error(e);
}
}
public async DeleteFileManager(base_dir: string, file_name: string) {
try {
return await this.doRpc<Protocol.RpcFileManagerDeleteResponse>(
new Protocol.RpcFileManagerDeleteRequest(base_dir, file_name)
);
} catch (e) {
console.error(e);
}
}
public async CreateDirectoryFileManager(base_dir: string, dir_name: string) {
try {
return await this.doRpc<Protocol.RpcFileManagerCreateDirectoryResponse>(
new Protocol.RpcFileManagerCreateDirectoryRequest(base_dir, dir_name)
);
} catch (e) {
console.error(e);
}
}
public async CheckModeIndex(mode_index: number) {
try {
return await this.doRpc<Protocol.RpcCheckModeIndexResponseEntity>(
new Protocol.RpcCheckModeIndexRequestEntity(mode_index)
);
} catch (e) {
console.error(e);
}
}
} }
export interface NotifyMessage { export interface NotifyMessage {

View File

@ -21,10 +21,6 @@ export default class GlobalData {
return 61428; return 61428;
} }
public static get kDefaultHttpPort() {
return 80;
}
private _current_client_name = ""; private _current_client_name = "";
public static getInstance() { public static getInstance() {

View File

@ -1,59 +0,0 @@
export default class ValidationUtil {
static isIpAddress(str: string): boolean {
return (
str == "localhost" ||
/^([1-9]|[1-9][0-9]|1\d\d|2[0-2][0-3])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-4])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-4])\.([1-9]|[1-9][0-9]|1\d\d|2[0-4]\d|25[0-4])$/.test(
str
)
);
}
static isHost(str: string): boolean {
return (
str == "localhost" ||
/^([1-9]|[1-9][0-9]|1\d\d|2[0-2][0-3])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-4])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-4])\.([1-9]|[1-9][0-9]|1\d\d|2[0-4]\d|25[0-4])$/.test(
str
) ||
/^([1-9]|[1-9][0-9]|1\d\d|2[0-2][0-3])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-4])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-4])\.([1-9]|[1-9][0-9]|1\d\d|2[0-4]\d|25[0-4])\:([0-9]|[1-9]\d{1,3}|[1-5]\d{4}|6[0-5]{2}[0-3][0-5])$/.test(
str
)
);
}
static isMacAddress(str: string): boolean {
return /([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}/.test(str);
}
static isMaskAddress(str: string): boolean {
return /^(254|252|248|240|224|192|128|0)\.0\.0\.0|255\.(254|252|248|240|224|192|128|0)\.0\.0|255\.255\.(254|252|248|240|224|192|128|0)\.0|255\.255\.255\.(254|252|248|240|224|192|128|0)$/.test(
str
);
}
static isHexStr(str: string): boolean {
if (str != null && str != undefined && typeof str == "string") {
str = str.trim();
if (str.length == 0) {
return true;
}
for (const item of str.split(" ")) {
if (item.length > 4) {
return false;
}
if (!/^0[xX][A-Fa-f0-9]{1,2}/.test(item)) {
return false;
}
}
return true;
}
return false;
}
static isResolution(str: string): boolean {
return /([0-9]{1,5})[x|X]([0-9]{1,5}@[0-9]{1,3}$)/.test(str);
}
static isEnglishOrNum(str: string): boolean {
return /^[0-9a-zA-Z_\-]+$/.test(str);
}
}

View File

@ -1,92 +0,0 @@
import GlobalData from "src/common/GlobalData";
import {
LocaleMessage,
DateTimeFormat,
NumberFormat,
} from "@intlify/core-base";
import { QVueGlobals } from "quasar";
import { Composer, VueMessageType } from "vue-i18n";
import { Store } from "vuex";
import { IWuJieInterface, StateInterface } from "./../store/index";
import EventBus, { EventNamesDefine } from "./EventBus";
import Initializer from "./Initializer";
import ClientConnection from "./ClientConnection";
export class WuJieInitializer {
public static initialize(
$wujie: IWuJieInterface,
$store: Store<StateInterface>,
$q: QVueGlobals,
$t: Composer<
{
[x: string]: LocaleMessage<VueMessageType>;
},
{
[x: string]: DateTimeFormat;
},
{
[x: string]: NumberFormat;
},
string,
string,
string
>
) {
if ($wujie) {
$wujie.bus.$on("initialize_app", (device_sn: string) => {
WuJieInitializer.onInitializeApp(device_sn, $wujie, $store, $q, $t);
});
setTimeout(() => {
$wujie.bus.$emit("client_mounted");
}, 500);
}
}
private static onInitializeApp(
device_sn: string,
$wujie: IWuJieInterface,
$store: Store<StateInterface>,
$q: QVueGlobals,
$t: Composer<
{
[x: string]: LocaleMessage<VueMessageType>;
},
{
[x: string]: DateTimeFormat;
},
{
[x: string]: NumberFormat;
},
string,
string,
string
>
) {
setTimeout(() => {
const global_data = GlobalData.getInstance();
const client = global_data.getCurrentClient();
if (!client) {
const client_name = "WuJie@" + device_sn;
console.log(client_name);
global_data.addClient(client_name, new ClientConnection("", "", ""));
global_data.setCurrentClientName(client_name);
}
if (client) {
client._is_login = true;
}
new Initializer({
$t,
$store,
$q,
})
.initialize()
.then(() => {
$store.commit("setInitialized");
if ($wujie) {
$wujie.bus.$emit("client_initialize_end");
}
});
EventBus.getInstance().emit(EventNamesDefine.WebSocketConnected, this);
}, 0);
}
}

View File

@ -1,59 +0,0 @@
import { IWuJieInterface } from "./../store/index";
import { store } from "quasar/wrappers";
export default class WuJieReconnectingWebSocket {
readyState: number;
$wujie: IWuJieInterface;
constructor() {
this.readyState = WebSocket.OPEN;
this.onclose = (ev: any) => {};
this.onerror = (ev: any) => {};
this.onmessage = (ev: any) => {};
this.onopen = (ev: any) => {};
this.$wujie = (window as any).$wujie;
if (this.$wujie) {
this.$wujie.bus.$on("onclose", this.onclose);
this.$wujie.bus.$on("onerror", this.onerror);
this.$wujie.bus.$on("onmessage", (ev: any) => {
if (this.onmessage) {
this.onmessage(ev);
}
});
this.$wujie.bus.$on("onopen", this.onopen);
setTimeout(() => {
if (this.onopen) {
this.onopen(null);
}
}, 500);
}
}
onclose: ((event: any) => void) | null;
/**
* An event listener to be called when an error occurs
*/
onerror: ((event: any) => void) | null;
/**
* An event listener to be called when a message is received from the server
*/
onmessage: ((event: MessageEvent) => void) | null;
/**
* An event listener to be called when the WebSocket connection's readyState changes to OPEN;
* this indicates that the connection is ready to send and receive data
*/
onopen: ((event: any) => void) | null;
/**
* Closes the WebSocket connection or connection attempt, if any. If the connection is already
* CLOSED, this method does nothing
*/
close(code?: number, reason?: string) {}
/**
* Enqueue specified data to be transmitted to the server over the WebSocket connection
*/
send(data: string) {
if (this.$wujie) {
this.$wujie.bus.$emit("send_to", data);
}
}
}

View File

@ -11,7 +11,7 @@
} }
" "
> >
<q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 40vw"> <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 35vw">
<q-form> <q-form>
<q-card-section class="q-ma-none q-pa-sm"> <q-card-section class="q-ma-none q-pa-sm">
<div class="row"> <div class="row">
@ -37,67 +37,8 @@
<q-separator /> <q-separator />
<q-card-section style="max-height: 60vh; width: 40vw" class="scroll"> <q-card-section style="max-height: 50vh; width: 35vw" class="scroll">
<q-list> <q-list>
<q-item>
<q-item-section avatar>{{ $t("product") }}</q-item-section>
<q-item-section>
<q-radio
v-model="selected_product"
val=""
:label="$t('normal')"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
</q-item-section>
<q-item-section>
<q-radio
v-model="selected_product"
val="magic_wall"
:label="$t('magic wall')"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
</q-item-section>
<q-item-section>
<q-radio
v-model="selected_product"
val="fusion"
:label="$t('fusion')"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
</q-item-section>
</q-item>
<q-item v-if="selected_product == 'fusion'">
<q-item-section avatar>{{ $t("fusion") }}</q-item-section>
<q-item-section>
<div class="row" v-for="(row, row_index) in 3" :key="row">
<q-radio
v-for="(item, item_index) in 3"
:key="row_index * 3 + item"
v-model="function_fusion_count"
:val="row_index * 3 + item"
:label="
(row_index * 3 + item).toString() +
$t(' ') +
$t('fusion out')
"
color="cyan"
class="col"
:class="item_index ? 'offset-md-1 ' : ''"
:loading="loading"
:disable="loading"
/>
</div>
</q-item-section>
</q-item>
<q-item> <q-item>
<q-item-section avatar>{{ $t("function") }}</q-item-section> <q-item-section avatar>{{ $t("function") }}</q-item-section>
<q-item-section> <q-item-section>
@ -128,6 +69,15 @@
:disable="loading" :disable="loading"
/> />
</q-item-section> </q-item-section>
<q-item-section avatar>
<q-btn
@click="setDeviceAttribute"
:label="$t('commit')"
no-caps
outline
color="primary"
/>
</q-item-section>
</q-item> </q-item>
<q-item> <q-item>
<q-item-section avatar></q-item-section> <q-item-section avatar></q-item-section>
@ -135,28 +85,13 @@
<q-checkbox <q-checkbox
v-model="function_custom_ISV" v-model="function_custom_ISV"
:label="$t('Custom ISV')" :label="$t('Custom ISV')"
class="offset-md-1 col"
color="cyan" color="cyan"
class="col"
:loading="loading" :loading="loading"
:disable="loading" :disable="loading"
/> />
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item>
<q-item-section> </q-item-section>
<q-item-section>
<q-btn
@click="setDeviceAttributeAndProduct"
:label="$t('commit')"
no-caps
outline
class="q-px-lg"
color="primary"
/>
</q-item-section>
<q-item-section> </q-item-section>
</q-item>
<q-separator />
<q-item> <q-item>
<q-item-section avatar> <q-item-section avatar>
{{ $t("language") }} {{ $t("language") }}
@ -193,6 +128,7 @@
/> />
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-separator class="q-mt-md" /> <q-separator class="q-mt-md" />
<q-item class="q-mt-md"> <q-item class="q-mt-md">
@ -238,10 +174,8 @@ import { useStore } from "src/store";
import { useQuasar, date as $date } from "quasar"; import { useQuasar, date as $date } from "quasar";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import GlobalData from "src/common/GlobalData"; import GlobalData from "src/common/GlobalData";
import { import { Protocol } from "src/entities/WSProtocol";
EDeviceAttribute, import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
EDeviceAttributeHelper,
} from "src/entities/EDeviceAttribute";
export default defineComponent({ export default defineComponent({
name: "ComponentAdvancedDebugDialog", name: "ComponentAdvancedDebugDialog",
@ -264,47 +198,7 @@ export default defineComponent({
const function_mirroring_output = ref( const function_mirroring_output = ref(
$store.state.custom_defines.function_mirroring_output $store.state.custom_defines.function_mirroring_output
); );
const function_magic_wall = ref(
$store.state.custom_defines.function_magic_wall
);
const function_fusion = ref($store.state.custom_defines.function_fusion);
const function_fusion_count = ref(0);
const target_language = ref("zh-CN"); const target_language = ref("zh-CN");
const selected_product = ref("");
watch(
() => selected_product.value,
(newValue) => {
function_fusion.value = newValue == "fusion";
function_magic_wall.value = newValue == "magic_wall";
}
);
const getFinalAttribute = () => {
let attribute = EDeviceAttribute.None;
if (function_center_control.value) {
attribute |= EDeviceAttribute.CenterControl;
}
if (function_output_board.value) {
attribute |= EDeviceAttribute.OutputBoard;
}
if (function_mirroring_output.value) {
attribute |= EDeviceAttribute.MirroringOutput;
}
if (function_custom_ISV.value) {
attribute |= EDeviceAttribute.CustomISV;
}
if (function_magic_wall.value) {
attribute |= EDeviceAttribute.ProductMagicWall;
}
if (function_fusion.value) {
attribute |= EDeviceAttributeHelper.getProdictFusionAttributeByIndex(
function_fusion_count.value
);
}
return attribute;
};
return { return {
show_dialog, show_dialog,
@ -312,12 +206,8 @@ export default defineComponent({
function_center_control, function_center_control,
function_output_board, function_output_board,
function_custom_ISV, function_custom_ISV,
function_magic_wall,
function_fusion,
function_fusion_count,
function_mirroring_output, function_mirroring_output,
target_language, target_language,
selected_product,
showDialog() { showDialog() {
show_dialog.value = true; show_dialog.value = true;
@ -329,20 +219,6 @@ export default defineComponent({
$store.state.custom_defines.function_output_board; $store.state.custom_defines.function_output_board;
function_mirroring_output.value = function_mirroring_output.value =
$store.state.custom_defines.function_mirroring_output; $store.state.custom_defines.function_mirroring_output;
function_magic_wall.value =
$store.state.custom_defines.function_magic_wall;
function_fusion.value = $store.state.custom_defines.function_fusion;
function_fusion_count.value =
EDeviceAttributeHelper.getProductFusionOutputCountDefault(
$store.state.device_attribute,
1
);
if (function_magic_wall.value) {
selected_product.value = "magic_wall";
} else if (function_fusion.value) {
selected_product.value = "fusion";
}
}, },
resetData() { resetData() {
loading.value = false; loading.value = false;
@ -351,9 +227,6 @@ export default defineComponent({
function_output_board.value = false; function_output_board.value = false;
function_mirroring_output.value = false; function_mirroring_output.value = false;
function_custom_ISV.value = false; function_custom_ISV.value = false;
function_magic_wall.value = false;
function_fusion.value = false;
selected_product.value = "";
}, },
restartDevice() { restartDevice() {
@ -431,22 +304,21 @@ export default defineComponent({
</div>`, </div>`,
}); });
}, },
setDeviceAttributeAndProduct() {
let attribute = getFinalAttribute();
GlobalData.getInstance()
.getCurrentClient()
?.setDeviceAttribute(attribute);
$q.notify({
color: "positive",
icon: "done",
message: $t.t("set device function") + $t.t("success") + "!",
position: "top",
timeout: 1500,
});
},
setDeviceAttribute() { setDeviceAttribute() {
let attribute = getFinalAttribute(); let attribute = EDeviceAttribute.None;
if (function_center_control.value) {
attribute |= EDeviceAttribute.CenterControl;
}
if (function_output_board.value) {
attribute |= EDeviceAttribute.OutputBoard;
}
if (function_mirroring_output.value) {
attribute |= EDeviceAttribute.MirroringOutput;
}
if (function_custom_ISV.value) {
attribute |= EDeviceAttribute.CustomISV;
}
GlobalData.getInstance() GlobalData.getInstance()
.getCurrentClient() .getCurrentClient()
@ -472,16 +344,6 @@ export default defineComponent({
timeout: 1500, timeout: 1500,
}); });
}, },
changeMagic() {
if (function_magic_wall.value) {
function_fusion.value = false;
}
},
changeFusion() {
if (function_fusion.value) {
function_magic_wall.value = false;
}
},
}; };
}, },
}); });

View File

@ -20,7 +20,14 @@
</div> </div>
<q-space /> <q-space />
<div> <div>
<q-btn flat round icon="close" color="red" v-close-popup> <q-btn
flat
round
icon="close"
:disable="loading"
color="red"
v-close-popup
>
<q-tooltip> <q-tooltip>
{{ $t("close") }} {{ $t("close") }}
</q-tooltip> </q-tooltip>
@ -81,8 +88,7 @@
(val) => (val) =>
(val && val.length > 0) || $t('Please type something'), (val && val.length > 0) || $t('Please type something'),
(val) => (val) =>
isMaskAddress(val) || isIpAddress(val) || $t('Please input vaild ip address'),
$t('Please input vaild netmask address'),
]" ]"
lazy-rules lazy-rules
/> />
@ -156,12 +162,12 @@
</style> </style>
<script lang="ts"> <script lang="ts">
import { defineComponent, ref } from "vue"; import { defineComponent, ref, Ref, reactive } from "vue";
import { useStore } from "src/store"; import { useStore } from "src/store";
import { useQuasar } from "quasar"; import { useQuasar, copyToClipboard, uid } from "quasar";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import GlobalData from "src/common/GlobalData";
import { AdvancedIpAddressEntity } from "src/entities/AdvancedIpAddressEntity"; import { AdvancedIpAddressEntity } from "src/entities/AdvancedIpAddressEntity";
import ValidationUtil from "src/common/ValidationUtil";
export default defineComponent({ export default defineComponent({
name: "ComponentSystenSettingAdvancedNetworkDialog", name: "ComponentSystenSettingAdvancedNetworkDialog",
@ -261,10 +267,12 @@ export default defineComponent({
} catch {} } catch {}
}, },
isIpAddress(str: string) { isIpAddress(str: string) {
return ValidationUtil.isIpAddress(str); return (
}, str == "localhost" ||
isMaskAddress(str: string) { /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
return ValidationUtil.isMaskAddress(str); str
)
);
}, },
checkFilterListIp(str: string) { checkFilterListIp(str: string) {
if (Array.isArray(ip_filter_list)) { if (Array.isArray(ip_filter_list)) {

View File

@ -47,6 +47,7 @@
ref="uploader" ref="uploader"
:url="upload_url" :url="upload_url"
method="post" method="post"
:headers="generatorFileUploadHeaders"
:label="$t('select background image') + ':'" :label="$t('select background image') + ':'"
:accept="$store.state.isSpecialVideo() ? '.svdoj' : 'image/*'" :accept="$store.state.isSpecialVideo() ? '.svdoj' : 'image/*'"
:hide-upload-btn="true" :hide-upload-btn="true"
@ -55,7 +56,6 @@
@added="(files) => files && (file_count += files.length)" @added="(files) => files && (file_count += files.length)"
@removed="(files) => files && (file_count -= files.length)" @removed="(files) => files && (file_count -= files.length)"
/> />
<!-- :headers="generatorFileUploadHeaders" -->
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
@ -70,7 +70,7 @@
no-caps no-caps
:loading="loading" :loading="loading"
color="primary" color="primary"
@click="showBackgroundImage()" @click="showBackgroundImage"
:label="$t('view current background image')" :label="$t('view current background image')"
/> />
<q-space /> <q-space />
@ -131,11 +131,35 @@ export default defineComponent({
loga(a: any) { loga(a: any) {
console.log(a); console.log(a);
}, },
generatorFileUploadHeaders(files: File[]) {
if (files.length > 0) {
return [
{
name: HttpProtocol.kHeaderXProductName,
value: HttpProtocol.getProductName($store),
},
{
name: HttpProtocol.kHeaderXFileLength,
value: files[0].size,
},
];
}
return [];
},
showDialog() { showDialog() {
show_dialog.value = true; show_dialog.value = true;
let url = GlobalData.getInstance().createCurrentRequestUrl(); let client = GlobalData.getInstance().getCurrentClient();
if (url) { if (client) {
url.pathname = "/upload_background_image_file"; let url = new URL(client.url);
url.port =
GlobalData.getInstance().applicationConfig?.httpserver_port ??
HttpProtocol.DefaultHttpPort.toString();
url.pathname = HttpProtocol.RequestUploadFile;
url.protocol = "http:";
url.searchParams.append(
"type",
HttpProtocol.UploadTypeBackgroundImage
);
upload_url.value = url.toString(); upload_url.value = url.toString();
} }
}, },
@ -145,10 +169,17 @@ export default defineComponent({
file_count.value = 0; file_count.value = 0;
}, },
showBackgroundImage() { showBackgroundImage() {
const temp_port =
GlobalData.getInstance().applicationConfig?.httpserver_port ??
HttpProtocol.DefaultHttpPort.toString();
try { try {
let url = GlobalData.getInstance().createCurrentRequestUrl(); const url = new URL(
if (url) { GlobalData.getInstance().getCurrentClient()?.url ??
url.pathname = "/get_background_image_file"; "http://127.0.0.1:" + temp_port
);
url.protocol = "http";
url.port = temp_port.toString();
url.pathname = "/static/background_image.png";
viewerApi({ viewerApi({
options: { options: {
toolbar: true, toolbar: true,
@ -162,7 +193,6 @@ export default defineComponent({
}, },
], ],
}); });
}
} catch {} } catch {}
}, },
async onSubmit() { async onSubmit() {

View File

@ -139,7 +139,6 @@ import { useQuasar, copyToClipboard } from "quasar";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { ExternalControlTableEntity } from "src/entities/ExternalControlTableEntity"; import { ExternalControlTableEntity } from "src/entities/ExternalControlTableEntity";
import ValidationUtil from "src/common/ValidationUtil";
export default defineComponent({ export default defineComponent({
name: "ComponentCenterControlButtonDialog", name: "ComponentCenterControlButtonDialog",
@ -247,7 +246,22 @@ export default defineComponent({
show_dialog.value = false; show_dialog.value = false;
}, },
isHexStr(val: string) { isHexStr(val: string) {
return ValidationUtil.isHexStr(val); if (val != null && val != undefined && typeof val == "string") {
val = val.trim();
if (val.length == 0) {
return true;
}
for (const item of val.split(" ")) {
if (item.length > 4) {
return false;
}
if (!/^0[xX][A-Fa-f0-9]{1,2}/.test(item)) {
return false;
}
}
return true;
}
return false;
}, },
}; };
}, },

View File

@ -406,7 +406,6 @@ import {
SerialPortConfigEntity, SerialPortConfigEntity,
} from "src/entities/SerialPortConfigEntity"; } from "src/entities/SerialPortConfigEntity";
import { Protocol } from "src/entities/WSProtocol"; import { Protocol } from "src/entities/WSProtocol";
import ValidationUtil from "src/common/ValidationUtil";
export default defineComponent({ export default defineComponent({
name: "ComponentCenterControlDialog", name: "ComponentCenterControlDialog",
@ -734,7 +733,12 @@ export default defineComponent({
} }
}, },
isIpAddress(str: string) { isIpAddress(str: string) {
return ValidationUtil.isIpAddress(str); return (
str == "localhost" ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
str
)
);
}, },
}; };
}, },

File diff suppressed because it is too large Load Diff

View File

@ -152,7 +152,6 @@ import { api } from "boot/axios";
import { HttpProtocol } from "src/entities/HttpProtocol"; import { HttpProtocol } from "src/entities/HttpProtocol";
import JointActionEquipmentTableEntity from "src/entities/JointActionEquipmentTableEntity"; import JointActionEquipmentTableEntity from "src/entities/JointActionEquipmentTableEntity";
import EventBus, { EventNamesDefine } from "src/common/EventBus"; import EventBus, { EventNamesDefine } from "src/common/EventBus";
import ValidationUtil from "src/common/ValidationUtil";
export default defineComponent({ export default defineComponent({
name: "ComponentEditJointActionEquipmentDialog", name: "ComponentEditJointActionEquipmentDialog",
@ -331,7 +330,15 @@ export default defineComponent({
} }
}, },
isHost(str: string) { isHost(str: string) {
return ValidationUtil.isHost(str); return (
str == "localhost" ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
str
) ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\:([0-9]|[1-9]\d{1,3}|[1-5]\d{4}|6[0-5]{2}[0-3][0-5])$/.test(
str
)
);
}, },
}; };
}, },

View File

@ -156,7 +156,7 @@
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
v-if="!uploading &&!iswujie" v-if="!uploading"
no-caps no-caps
icon="upload" icon="upload"
:label="$t('upload file')" :label="$t('upload file')"
@ -222,11 +222,10 @@
style="color: #ffbe4a; font-size: 2.5em" style="color: #ffbe4a; font-size: 2.5em"
></q-icon> ></q-icon>
{{ {{
props.value.length > 25 props.value.length > 60
? props.value.substr(0, 25) + "..." ? props.value.substr(0, 60) + "..."
: props.value : props.value
}} }}
<q-tooltip> {{ props.value }} </q-tooltip> <q-tooltip> {{ props.value }} </q-tooltip>
</div> </div>
<div v-else-if="props.col.name == 'file_size'"> <div v-else-if="props.col.name == 'file_size'">
@ -347,12 +346,14 @@
style="height: 69vh; width: 70%" style="height: 69vh; width: 70%"
:disable="uploader_loading" :disable="uploader_loading"
:url="getUrl" :url="getUrl"
multiple method="post"
method="POST" :headers="generatorFileUploadHeaders"
:label="$t('select file') + ':'" :label="$t('select file') + ':'"
:accept="uploader_accept" :accept="uploader_accept"
@start="onStartUpload" @start="onStartUpload"
@finish="onfinish" @uploaded="onUploaded"
@failed="onFailed"
@added="/*onFileAdded*/ null"
> >
</q-uploader> </q-uploader>
<q-space /> <q-space />
@ -623,25 +624,41 @@ export default defineComponent({
label: $t.t("operator"), label: $t.t("operator"),
}, },
]; ];
const _request_list_files = async (path: string) => { const _request_list_files = async (path: string) => {
loading.value = true; loading.value = true;
let client = GlobalData.getInstance().getCurrentClient(); let client = GlobalData.getInstance().getCurrentClient();
if (client) { if (client) {
let file_list = await GlobalData.getInstance() let url = new URL(client.url);
.getCurrentClient() url.port =
?.getFileListFileManager(path); GlobalData.getInstance().applicationConfig?.httpserver_port ??
return file_list; HttpProtocol.DefaultHttpPort.toString();
url.pathname = HttpProtocol.RequestPathListFile;
url.protocol = "http:";
url.searchParams.append("path", path);
return await api.get(url.toString());
} }
loading.value = false; loading.value = false;
return null; return null;
}; };
const _show_files = (response: any) => { const _show_files = (response: any) => {
if (response) { if (response) {
if (response.success) { if (response.status == 200) {
interface IRsponseData {
files: FileEntity[];
free: number;
}
let file_entitys: FileEntity[] = []; let file_entitys: FileEntity[] = [];
let free = 0; let free = 0;
file_entitys = response.files;
free = response.free; if (Array.isArray(response.data)) {
file_entitys = response.data as FileEntity[];
} else {
const resposne_data = response.data as IRsponseData;
file_entitys = resposne_data.files;
free = resposne_data.free;
}
free_space.value = free; free_space.value = free;
if (Array.isArray(file_entitys)) { if (Array.isArray(file_entitys)) {
directory_count.value = 0; directory_count.value = 0;
@ -806,10 +823,7 @@ export default defineComponent({
console.log(e); console.log(e);
} }
}; };
let iswujie=ref(false)
if ((window as any).$wujie) {
iswujie.value=true
}
// //
// watch( // watch(
// () => filters.value, // () => filters.value,
@ -847,7 +861,6 @@ export default defineComponent({
refresh_file_list_async, refresh_file_list_async,
status, status,
filters, filters,
iswujie,
showDialogAsync( showDialogAsync(
in_status: string, in_status: string,
no_filter = true, no_filter = true,
@ -880,6 +893,21 @@ export default defineComponent({
resolve = _resolve; resolve = _resolve;
}); });
}, },
generatorFileUploadHeaders(files: File[]) {
if (files.length > 0) {
return [
{
name: HttpProtocol.kHeaderXProductName,
value: HttpProtocol.getProductName($store),
},
{
name: HttpProtocol.kHeaderXFileLength,
value: files[0].size,
},
];
}
return [];
},
resetData() { resetData() {
loading.value = false; loading.value = false;
uploading.value = false; uploading.value = false;
@ -895,13 +923,14 @@ export default defineComponent({
resolve_value = null; resolve_value = null;
}, },
async onCreateNewFolder() { async onCreateNewFolder() {
let url = GlobalData.getInstance().createCurrentRequestUrl();
if (url) {
$q.dialog({ $q.dialog({
title: $t.t("create folder"), title: $t.t("create folder"),
message: $t.t("input folder name") + ":", message: $t.t("input folder name") + ":",
prompt: { prompt: {
model: "", model: "",
isValid: (val: string) => isValid: (val: string) => !!val && val.trim().length > 0,
!!val && val.trim().length > 0&& val.indexOf(".") != 0 ,
type: "text", type: "text",
}, },
ok: { ok: {
@ -916,9 +945,14 @@ export default defineComponent({
}, },
persistent: true, persistent: true,
}).onOk(async (data: string) => { }).onOk(async (data: string) => {
const response = await GlobalData.getInstance() if (url) {
.getCurrentClient() url.pathname = HttpProtocol.RequestPathCreateDirectory;
?.CreateDirectoryFileManager(path.value, data); let response = (
await api.post(url.toString(), {
base_dir: path.value,
dir_name: data,
})
).data as NormalResult;
if (response && response.success) { if (response && response.success) {
refresh_file_list(); refresh_file_list();
$q.notify({ $q.notify({
@ -928,45 +962,36 @@ export default defineComponent({
timeout: 1500, timeout: 1500,
}); });
} else { } else {
// if (
// response?.error_message ==
// "the folder name cannot start with a '.'"
// ) {
// $q.notify({
// type: "warning",
// message:
// $t.t("create folder") +
// $t.t("fail") +
// "!" +
// $t.t("the folder name cannot start with a '.'"),
// position: "top",
// timeout: 1500,
// });
// }
// else {
if (response) {
$q.notify({ $q.notify({
type: "warning", type: "warning",
message: message:
$t.t("create folder") + $t.t("create folder") +
$t.t("fail") + $t.t("fail") +
"!" + "!" +
$t.t(response.error_message), (response ? response.message : ""),
position: "top", position: "top",
timeout: 1500, timeout: 1500,
}); });
} }
} }
}); });
}
}, },
selectFile, selectFile,
async deleteFile(file: FileEntity) { async deleteFile(file: FileEntity) {
let url = GlobalData.getInstance().createCurrentRequestUrl();
if (url) {
url.pathname = HttpProtocol.RequestPathDeleteFile;
let response = null; let response = null;
try { try {
response = await GlobalData.getInstance() response = (
.getCurrentClient() await api.delete(url.toString(), {
?.DeleteFileManager(path.value, file.name); data: {
base_dir: path.value,
file_name: file.name,
},
})
).data as NormalResult;
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }
@ -985,13 +1010,16 @@ export default defineComponent({
$t.t("delete file") + $t.t("delete file") +
$t.t("fail") + $t.t("fail") +
"!" + "!" +
(response ? response.error_message : ""), (response ? response.message : ""),
position: "top", position: "top",
timeout: 1500, timeout: 1500,
}); });
} }
}
}, },
renameFile(file: FileEntity) { renameFile(file: FileEntity) {
let url = GlobalData.getInstance().createCurrentRequestUrl();
if (url) {
$q.dialog({ $q.dialog({
title: $t.t("rename"), title: $t.t("rename"),
message: $t.t("input new file name") + ":", message: $t.t("input new file name") + ":",
@ -1015,9 +1043,20 @@ export default defineComponent({
if (data == file.name) { if (data == file.name) {
return; return;
} }
let response = await GlobalData.getInstance() if (url) {
.getCurrentClient() url.pathname = HttpProtocol.RequestPathRenameFile;
?.RenameFileManager(path.value, file.name, data); url.searchParams.append(
"type",
HttpProtocol.RequestPathRenameFile
);
let response = (
await api.put(url.toString(), {
base_dir: path.value,
file_name: file.name,
new_file_name: data,
})
).data as NormalResult;
if (response && response.success) { if (response && response.success) {
refresh_file_list(); refresh_file_list();
$q.notify({ $q.notify({
@ -1033,12 +1072,14 @@ export default defineComponent({
$t.t("file rename") + $t.t("file rename") +
$t.t("fail") + $t.t("fail") +
"!" + "!" +
(response ? response.error_message : ""), (response ? response.message : ""),
position: "top", position: "top",
timeout: 1500, timeout: 1500,
}); });
} }
}
}); });
}
}, },
copyStringToClipboard(value: string) { copyStringToClipboard(value: string) {
copyToClipboard(value); copyToClipboard(value);
@ -1070,8 +1111,8 @@ export default defineComponent({
getUrl(file: File[]) { getUrl(file: File[]) {
let url = GlobalData.getInstance().createCurrentRequestUrl(); let url = GlobalData.getInstance().createCurrentRequestUrl();
if (url) { if (url) {
url.pathname = "/upload_media_file"; //HttpProtocol.RequestUploadFile; url.pathname = HttpProtocol.RequestUploadFile;
// url.searchParams.append("type", HttpProtocol.HttpUploadTypeNormal); url.searchParams.append("type", HttpProtocol.HttpUploadTypeNormal);
url.searchParams.append("base_dir", path.value); url.searchParams.append("base_dir", path.value);
return url.toString(); return url.toString();
} }
@ -1080,19 +1121,101 @@ export default defineComponent({
onStartUpload() { onStartUpload() {
loading.value = true; loading.value = true;
}, },
async onfinish(info: any) { async onFileAdded(files: File[] | File) {
setTimeout(() => { setTimeout(async () => {
const onError = async (file: File | null) => {
await nextTick(() => {});
uploader.value.reset();
$q.notify({
color: "negative",
icon: "warning",
message: $t.t("load file error") + "!",
position: "top",
timeout: 3000,
});
};
let file: File | null = null;
try {
if (Array.isArray(files)) {
if (files.length > 0) {
file = files[0];
}
} else {
file = files;
}
if (file) {
const file_name = file.name;
const blob = file.slice(0, 1024 * 1024 * 1); // 1 MB
uploader_loading.value = true;
try {
let url = GlobalData.getInstance().createCurrentRequestUrl();
if (url) {
url.pathname = HttpProtocol.RequestPathCheckFileSupport;
// if (FileSuffixHelper.isVideoPath(file_name)) {
// }
const data = new FormData();
data.append(
"file",
new File([blob], file_name, {
lastModified: file.lastModified,
})
);
const response = await api.post(url.toString(), data, {
headers: {
"Content-Type": "multipart/form-data",
},
});
if (response && response.data && response.data.is_support) {
} else {
onError(file);
}
console.log(response);
} else {
throw "";
}
} catch (e) {
console.error(e);
onError(file);
}
uploader_loading.value = false;
return;
}
} catch (e) {
console.error(e);
onError(file);
}
}, 1);
},
onUploaded() {
uploading.value = false;
uploader.value.reset();
refresh_file_list();
$q.notify({ $q.notify({
type: "positive", type: "positive",
message: $t.t("file upload") + $t.t("finish") + "!", message: $t.t("file upload") + $t.t("success") + "!",
position: "top", position: "top",
timeout: 1500, timeout: 1500,
}); });
loading.value = false; loading.value = false;
uploading.value = false; },
refresh_file_list() onFailed(info: any) {
uploader.value.reset() console.log(info);
}, 500); $q.notify({
type: "warning",
message: $t.t("file upload") + $t.t("fail") + "!",
position: "top",
timeout: 1500,
});
loading.value = false;
loading.value = false;
}, },
copyFile(file: FileEntity) { copyFile(file: FileEntity) {
if (file) { if (file) {

View File

@ -1,92 +0,0 @@
<template>
<div>
<q-list dense bordered separator>
<q-item clickable v-ripple v-for="(item, index) in data">
<q-item-section>
<DebuggingItem
:name="Object.keys(item)[0]"
:value="Object.values(item)[0]"
>
</DebuggingItem>
</q-item-section>
</q-item>
<q-item clickable v-ripple v-for="(item, index) in btn">
<q-item-section>
<div>
<q-btn
color="white"
text-color="black"
@click="send_btn(Object.keys(item)[0])"
:label="$t(btn_name(Object.keys(item)[0]))"
/>
</div>
</q-item-section>
</q-item>
</q-list>
</div>
</template>
<script lang="ts">
import {
defineComponent,
ref,
watch,
computed,
defineProps,
withDefaults,
reactive,
onMounted,
onBeforeUnmount,
} from "vue";
import { useStore } from "src/store";
import { useI18n } from "vue-i18n";
import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
import GlobalData from "src/common/GlobalData";
import DebuggingItem from "src/components/FusionSettings/DebuggingItem.vue";
export default defineComponent({
name: "Debugging",
components: {
vue3ResizeDrag,
DebuggingItem,
},
setup() {
let set = GlobalData.getInstance().getCurrentClient();
let $store = useStore();
let $t = useI18n();
const data = computed(() => {
let array = [];
let tmp = JSON.parse($store.state.fusion_configuration).options;
for (let key in tmp) {
if (key.indexOf("@") != -1 && key.indexOf("@btn") == -1) {
array.push({ [key]: tmp[key] });
}
}
return array;
});
const btn = computed(() => {
let array = [];
let tmp = JSON.parse($store.state.fusion_configuration).options;
for (let key in tmp) {
if (key.indexOf("@btn") != -1) {
array.push({ [key]: tmp[key] });
}
}
return array;
});
const btn_name = (name: string): string => {
return name.split("@")[2];
};
const send_btn = (name: string) => {
set?.SetBlendingOption(name, "1");
};
return {
btn_name,
send_btn,
data,
btn,
};
},
});
</script>

View File

@ -1,98 +0,0 @@
<template>
<div><span>{{ $t(show_name) }}</span> <q-checkbox v-model="val" @click="send" /></div>
</template>
<script lang="ts">
import {
defineComponent,
ref,
watch,
computed,
defineProps,
withDefaults,
reactive,
onMounted,
onBeforeUnmount,
} from "vue";
import { useStore } from "src/store";
import { useI18n } from "vue-i18n";
import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
import GlobalData from "src/common/GlobalData";
export default defineComponent({
name: "DebuggingItem",
components: {
vue3ResizeDrag,
},
props: {
name: {
type: String,
default: ''
},
value: {
type: String,
default: ''
}
},
setup(props) {
let set = GlobalData.getInstance().getCurrentClient();
let $store = useStore();
let $t = useI18n();
const val = ref(false)
const show_name = computed(() => {
let tmp=""
if(props.name.indexOf("@") != -1){
tmp=props.name.split("@")[1]
}else{
tmp=props.name
}
return tmp
})
val.value=props.value=="1"?true:false
const send = () => {
set?.SetBlendingOption(props.name, val.value ? "1" : "0");
}
const use_sessionStorage=()=>{
if(sessionStorage.Debugging){
let tmp=JSON.parse(sessionStorage.Debugging);
for (let index = 0;index < tmp.length; index++) {
if(Object.keys(tmp[index])[0]==props.name){
val.value=Object.values(tmp[index])[0]=="1"?true:false
break
}
}
}
}
onMounted(()=>{
use_sessionStorage()
})
onBeforeUnmount(() => {
let key=props.name
let value=val.value
if(sessionStorage.Debugging){
let tmp=JSON.parse(sessionStorage.Debugging);
let count=0;
for (let index = 0;index < tmp.length; index++) {
if(Object.keys(tmp[index])[0]==key){
tmp[index]={[key]:value}
break
}
count=index
}
if(count==tmp.length-1)tmp.push({[key]:value});
sessionStorage.Debugging = JSON.stringify(tmp);
}else{
sessionStorage.Debugging = JSON.stringify([{[key]:value}]);
}
});
return {
send,
val,
show_name,
...props
}
}
})
</script>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -4,96 +4,58 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="row"> <div class="row">
<div class="col-4 col-sm-3"></div> <div class="col-4"></div>
<div class="col-4 col-sm-6 q-pt-sm"><q-select outlined v-model="model[0]" <div class="col-4 q-pt-sm"><q-select outlined v-model="model[0]" :options="options" :dense="true"
@update:model-value="update_row_col(0, model[0])" :options="options" :dense="true" :options-dense="true" :options-dense="true" label="单元行数" /> </div><q-checkbox v-model="RowsColumns[0]" />
:label="$t('wall row')" /> </div><q-checkbox @update:model-value="send_off(0)"
v-model="RowsColumns[0]" />
</div> </div>
</div> </div>
<div class="col-12"> <div class="col-12">
<div class="row"> <div class="row">
<div class="col-4 col-sm-3"></div> <div class="col-4"></div>
<div class="col-4 col-sm-6 q-pt-sm"><q-select outlined v-model="model[1]" <div class="col-4 q-pt-sm"><q-select outlined v-model="model[1]" :options="options" :dense="true"
@update:model-value="update_row_col(1, model[1])" :options="options" :dense="true" :options-dense="true" :options-dense="true" label="单元列数" /> </div><q-checkbox v-model="RowsColumns[1]" />
:label="$t('wall col')" /> </div><q-checkbox @update:model-value="send_off(1)"
v-model="RowsColumns[1]" />
</div>
</div>
<div class="col-12">
<div class="row">
<div class="col-4 col-sm-3"></div>
<div class="col-4 col-sm-6 q-pt-sm"><q-select outlined v-model="model[2]"
@update:model-value="update_row_col(2, model[2])" :options="line_width_options" :dense="true" :options-dense="true"
:label="$t('line width')" /> </div>
</div> </div>
</div> </div>
<div class="col-12"> <div class="col-12">
<div class="row" style="min-height: 40px;"> <div class="row" style="min-height: 40px;">
<div class="col-4 col-sm-3"></div> <div class="col-4"></div>
<div class="col-4 col-sm-6 q-pt-sm"> <div class="col-4 q-pt-sm"><div class="row"><div class="col-4"><span>网格颜色</span></div><div class="col-8" @click="isshowhex=true;index=0" :style="{'background-color':color[0]}"></div></div></div>
<q-item>
<q-item-section avatar class="head_1">
{{ $t("line color") }}
</q-item-section>
<q-item-section>
<q-input v-model="color[0]" :rules="['anyColor']">
<template v-slot:append>
<q-icon name="colorize" class="cursor-pointer" @click="index = 0">
<q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-color v-model="color[0]" @change="submit" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</q-item-section>
</q-item>
</div> </div>
</div> </div>
</div>
<div class="col-12"> <div class="col-12">
<div class="row" style="min-height: 40px;"> <div class="row" style="min-height: 40px;">
<div class="col-4 col-sm-3"></div> <div class="col-4"></div>
<div class="col-4 col-sm-6 q-pt-sm"> <div class="col-4 q-pt-sm"><div class="row"><div class="col-4"><span>背景颜色</span></div><div class="col-8" @click="isshowhex=true;index=1" :style="{'background-color':color[1]}"></div></div></div>
<q-item>
<q-item-section avatar class="head_1">
{{ $t("center circle color") }}
</q-item-section>
<q-item-section>
<q-input v-model="color[2]" :rules="['anyColor']">
<template v-slot:append>
<q-icon name="colorize" class="cursor-pointer" @click="index = 2">
<q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-color v-model="color[2]" @change="submit" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</q-item-section>
</q-item>
</div> </div>
<div class="col-2"><q-checkbox class="q-pt-md" @update:model-value="send_off(2)" v-model="RowsColumns[2]" /></div> </div>
<div class="col-12">
<div class="row" style="min-height: 40px;">
<div class="col-4"></div>
<div class="col-4 q-pt-sm"><div class="row"><div class="col-4"><span>中心线颜色</span></div><div class="col-8" @click="isshowhex=true;index=2" :style="{'background-color':color[2]}"></div></div></div><q-checkbox v-model="RowsColumns[2]" />
</div>
</div>
<div class="col-12">
<div class="row" style="min-height: 40px;">
<div class="col-4"></div>
<div class="col-4 q-pt-sm"><div class="row"><div class="col-4"><span>中心圆颜色</span></div><div class="col-8" @click="isshowhex=true;index=3" :style="{'background-color':color[3]}"></div></div></div><q-checkbox v-model="RowsColumns[3]" />
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="isshowhex" style="margin: 0 auto;text-align: center;"><q-color no-header-tabs no-footer v-model="color[index]" class="my-picker" /> <q-btn style="margin-top: 0.5rem;" color="white" @click="isshowhex=false" class=" q-pt-sm" text-color="black" label="提交" /></div>
</div> </div>
</template> </template>
<style scoped> <style scoped>
.border {
border: 1px solid;
}
</style> </style>
<script lang="ts"> <script lang="ts">
import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue"; import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
import { defineComponent, ref, reactive, onBeforeUnmount } from "vue"; import { defineComponent, ref,reactive } from "vue";
import { useStore } from "src/store"; import { useStore } from "src/store";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import GlobalData from "src/common/GlobalData";
import { json } from "body-parser";
export default defineComponent({ export default defineComponent({
name: "ComponentGridSettings", name: "ComponentGridSettings",
@ -101,134 +63,23 @@ export default defineComponent({
vue3ResizeDrag vue3ResizeDrag
}, },
setup() { setup() {
let set = GlobalData.getInstance().getCurrentClient();
let $store = useStore(); let $store = useStore();
let $t = useI18n(); let $t = useI18n();
const RowsColumns=reactive([false,false,false,false]); const RowsColumns=reactive([false,false,false,false]);
const hex=ref("")
const isshowhex=ref(false);
const index=ref(0); const index=ref(0);
const color = reactive(["#ffffff", "#CCCCCC", "#000", "#000"]); const color=reactive(["#000","#000","#000","#000"]);
let model = reactive([20, 40, 20]); let model = reactive([10,10]);
let options = ref([10, 20, 30, 40, 50, 60 ,80]); let options = ref(['10', '20', '30', '40', '50']);
let line_width_options = ref([2,4,6,8,10, 20, 30, 40, 50]);
/**
* 发送颜色 根据index不同确定是那个接口
*/
const submit = () => {
switch (index.value) {
case 0:
set?.SetBlendingOption("blending_grids_line_color", color[index.value]);
break;
case 1:
set?.SetBlendingOption("blending_grids_background_color", color[index.value]);
break;
case 2:
set?.SetBlendingOption("blending_grids_ellipse_line_color",color[index.value]);
break;
case 3:
//set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
break;
default:
break;
}
}
/**
* 修改 横纵 线的数量
* @param type 类型
* @param value
*/
const update_row_col = (type: number, value: number) => {
switch (type) {
case 0:
set?.SetBlendingOption("blending_grids_row", value + "");
break;
case 1:
set?.SetBlendingOption("blending_grids_column", value + "");
break;
case 2:
set?.SetBlendingOption("blending_grids_line_width", value + "");
break;
default:
break;
}
}
/**
* 修改 单选 发送数据 使用switch 匹配多个
* @param type
*/
const send_off = (type: number) => {
setTimeout(() => {
switch (type) {
case 0:
set?.SetBlendingOption("blending_grids_show_row", RowsColumns[type] + "");
break;
case 1:
if (!RowsColumns[1]) RowsColumns[2] = false; RowsColumns[3] = false
set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + "");
break;
case 2:
set?.SetBlendingOption("blending_grids_show_ellipse", RowsColumns[type] + "");
break;
case 3:
break;
default:
break;
}
}, 100);
}
/**
* 使用服务端配置
*/
const use_server_config = () => {
let server_conf = JSON.parse($store.state.fusion_configuration).options
model[0] = server_conf.blending_grids_row ?? 20;
model[1] = server_conf.blending_grids_column ?? 40;
model[2] = server_conf.blending_grids_line_width ?? 6;
color[0] = server_conf.blending_grids_line_color ?? "#ffffff"
color[1] = server_conf.blending_grids_background_color ?? "#7f7f7f"
color[2] = server_conf.blending_grids_ellipse_line_color ?? "#0000ff"
RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
RowsColumns[2] = server_conf.blending_grids_show_ellipse === "false" ? false : true
}
use_server_config()
onBeforeUnmount(() => {
set_sessionStorage()
});
/**
* 保存缓存到sessionStorage
*/
const set_sessionStorage = () => {
let tmp = { RowsColumns: RowsColumns, color: color, model: model }
sessionStorage.GridSettings = JSON.stringify(tmp)
}
/**
* 获取sessionStorage
*/
const get_sessionStorage = () => {
let tmp = JSON.parse(sessionStorage.GridSettings)
for (let index = 0; index < tmp.RowsColumns.length; index++) {
RowsColumns[index] = tmp.RowsColumns[index];
}
for (let index = 0; index < tmp.color.length; index++) {
color[index] = tmp.color[index];
}
for (let index = 0; index < tmp.model.length; index++) {
model[index] = tmp.model[index];
}
}
if (sessionStorage.GridSettings) get_sessionStorage()
return { return {
line_width_options,
model, model,
options, options,
submit, hex,
RowsColumns, RowsColumns,
isshowhex,
index, index,
color, color,
update_row_col,
send_off
}; };
}, },
}); });

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -457,17 +457,13 @@ export default defineComponent({
resolve($t.t("Please type 0~65535")); resolve($t.t("Please type 0~65535"));
} else { } else {
try { try {
// let url = GlobalData.getInstance().createCurrentRequestUrl(); let url = GlobalData.getInstance().createCurrentRequestUrl();
// if (!url) { if (!url) {
// url = new URL(window.location.hostname); url = new URL(window.location.hostname);
// } }
// url.pathname = HttpProtocol.RequestCheckModeIndex; url.pathname = HttpProtocol.RequestCheckModeIndex;
// url.searchParams.append("index", index.value.toString()); url.searchParams.append("index", index.value.toString());
// let response = (await api.get(url.toString())).data as boolean; let response = (await api.get(url.toString())).data as boolean;
// console.log(url)
let response= (await GlobalData.getInstance().getCurrentClient()?.CheckModeIndex(index.value))?.success as boolean;
// let response:boolean;
// console.log(res)
if (typeof response != "boolean") { if (typeof response != "boolean") {
try { try {
response = JSON.parse(response); response = JSON.parse(response);

View File

@ -466,7 +466,7 @@ export default defineComponent({
{ {
align: "left", align: "left",
name: "delay", name: "delay",
label: $t.t("duration"), label: $t.t("delay"),
field: "delay", field: "delay",
sortable: false, sortable: false,
}, },

View File

@ -311,7 +311,7 @@ export default defineComponent({
{ {
align: "left", align: "left",
name: "delay", name: "delay",
label: $t.t("duration"), label: $t.t("delay"),
field: "delay", field: "delay",
sortable: false, sortable: false,
}, },

View File

@ -47,7 +47,8 @@
class="full-width" class="full-width"
ref="uploader" ref="uploader"
:url="upload_url" :url="upload_url"
method="POST" method="post"
:headers="generatorFileUploadHeaders"
:label="$t('select data(DBP) file') + ':'" :label="$t('select data(DBP) file') + ':'"
accept=".dbp" accept=".dbp"
:hide-upload-btn="true" :hide-upload-btn="true"
@ -118,11 +119,32 @@ export default defineComponent({
upload_url, upload_url,
uploader, uploader,
file_count, file_count,
generatorFileUploadHeaders(files: File[]) {
if (files.length > 0) {
return [
{
name: HttpProtocol.kHeaderXProductName,
value: HttpProtocol.getProductName($store),
},
{
name: HttpProtocol.kHeaderXFileLength,
value: files[0].size,
},
];
}
return [];
},
showDialog() { showDialog() {
show_dialog.value = true; show_dialog.value = true;
let url = GlobalData.getInstance().createCurrentRequestUrl(); let client = GlobalData.getInstance().getCurrentClient();
if (url) { if (client) {
url.pathname = "/upload_db_file"; let url = new URL(client.url);
url.port =
GlobalData.getInstance().applicationConfig?.httpserver_port ??
HttpProtocol.DefaultHttpPort.toString();
url.pathname = HttpProtocol.RequestUploadFile;
url.protocol = "http:";
url.searchParams.append("type", HttpProtocol.UploadTypeDatabase);
upload_url.value = url.toString(); upload_url.value = url.toString();
} }
}, },

View File

@ -73,7 +73,6 @@
<q-separator /> <q-separator />
<q-card-section class="scroll" style="width: 70vw"> <q-card-section class="scroll" style="width: 70vw">
<q-scroll-area style="height: 65vh">
<q-list> <q-list>
<q-item v-if="ext_flag"> <q-item v-if="ext_flag">
<q-item-section avatar class="header_label"> <q-item-section avatar class="header_label">
@ -109,15 +108,7 @@
{{ $t("register code") }} {{ $t("register code") }}
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<div <div style="word-break: break-all">
style="
word-break: break-all;
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
"
>
{{ register_code }} {{ register_code }}
</div> </div>
</q-item-section> </q-item-section>
@ -126,7 +117,7 @@
:value="register_code" :value="register_code"
level="H" level="H"
render-as="svg" render-as="svg"
:size="160" :size="195"
/> />
</q-item-section> </q-item-section>
<q-item-section avatar> <q-item-section avatar>
@ -246,7 +237,7 @@
</div> </div>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item v-if="active_type == 'limit'"> <q-item v-if="register_type == 'online' && active_type == 'limit'">
<q-item-section avatar class="header_label"> <q-item-section avatar class="header_label">
{{ $t("active time") }} {{ $t("active time") }}
</q-item-section> </q-item-section>
@ -265,85 +256,8 @@
</q-input> </q-input>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-separator class="q-mt-md" />
<q-item>
<q-item-section avatar class="header_label">
{{ $t("product") }}
</q-item-section>
<q-item-section> <q-item v-if="register_type == 'online'">
<div class="row q-gutter-sm">
<q-radio
v-model="selected_product"
val=""
:label="$t('normal')"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
<q-radio
v-model="selected_product"
val="magic_wall"
:label="$t('magic wall')"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
<q-radio
v-model="selected_product"
val="fusion"
:label="$t('fusion')"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
</div>
</q-item-section>
</q-item>
<q-item v-if="selected_product == 'fusion'">
<q-item-section avatar class="header_label">
{{ $t("fusion") }}
</q-item-section>
<q-item-section>
<div class="row q-gutter-sm">
<q-radio
v-for="item of 5"
:key="item"
v-model="function_fusion_count"
:val="item"
:label="item.toString() + $t(' ') + $t('fusion out')"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
</div>
<div class="row q-gutter-sm">
<q-radio
v-for="item of 4"
:key="5 + item"
v-model="function_fusion_count"
:val="5 + item"
:label="
(5 + item).toString() + $t(' ') + $t('fusion out')
"
color="cyan"
class="offset-md-1 col"
:loading="loading"
:disable="loading"
/>
<div class="offset-md-1 col"></div>
</div>
</q-item-section>
<q-item-section avatar> </q-item-section>
</q-item>
<q-item>
<q-item-section avatar class="header_label"> <q-item-section avatar class="header_label">
{{ $t("function") }} {{ $t("function") }}
</q-item-section> </q-item-section>
@ -377,7 +291,7 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="register_type == 'online'">
<q-item-section avatar class="header_label"> </q-item-section> <q-item-section avatar class="header_label"> </q-item-section>
<q-item-section> <q-item-section>
<div class="row q-gutter-sm"> <div class="row q-gutter-sm">
@ -393,7 +307,7 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="register_type == 'online'">
<q-item-section avatar class="header_label"> <q-item-section avatar class="header_label">
{{ $t("language") }} {{ $t("language") }}
</q-item-section> </q-item-section>
@ -419,8 +333,8 @@
/> />
</div> </div>
</q-item-section> </q-item-section>
</q-item> </q-list </q-item>
></q-scroll-area> </q-list>
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
@ -469,16 +383,12 @@ import {
nextTick, nextTick,
} from "vue"; } from "vue";
import { useStore } from "src/store"; import { useStore } from "src/store";
import { useQuasar, copyToClipboard, Cookies } from "quasar"; import { useQuasar, copyToClipboard } from "quasar";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import GlobalData from "src/common/GlobalData"; import GlobalData from "src/common/GlobalData";
import QrcodeVue from "qrcode.vue"; import QrcodeVue from "qrcode.vue";
import { Protocol } from "src/entities/WSProtocol"; import { Protocol } from "src/entities/WSProtocol";
import { import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
EDeviceAttribute,
EDeviceAttributeHelper,
} from "src/entities/EDeviceAttribute";
import ValidationUtil from "src/common/ValidationUtil";
export default defineComponent({ export default defineComponent({
name: "ComponentRegisterDialog", name: "ComponentRegisterDialog",
@ -509,18 +419,6 @@ export default defineComponent({
const function_output_board = ref(false); const function_output_board = ref(false);
const function_mirroring_output = ref(false); const function_mirroring_output = ref(false);
const function_custom_ISV = ref(false); const function_custom_ISV = ref(false);
const function_magic_wall = ref(false);
const function_fusion = ref(false);
const function_fusion_count = ref(1);
const selected_product = ref("");
watch(
() => selected_product.value,
(newValue) => {
function_fusion.value = newValue == "fusion";
function_magic_wall.value = newValue == "magic_wall";
}
);
const trial_days = ref(0); const trial_days = ref(0);
const last_days = ref(0); const last_days = ref(0);
@ -538,14 +436,11 @@ export default defineComponent({
trial_days.value = 0; trial_days.value = 0;
register_date.value = ""; register_date.value = "";
last_days.value = 0; last_days.value = 0;
selected_product.value = "";
function_center_control.value = false; function_center_control.value = false;
function_output_board.value = false; function_output_board.value = false;
function_mirroring_output.value = false; function_mirroring_output.value = false;
function_custom_ISV.value = false; function_custom_ISV.value = false;
function_magic_wall.value = false;
function_fusion.value = false;
}; };
const showDialog = async () => { const showDialog = async () => {
@ -570,27 +465,18 @@ export default defineComponent({
show_dialog.value = false; show_dialog.value = false;
} }
function_custom_ISV.value = $store.state.custom_defines.is_custom_isv; const function_custom_ISV = ref(
function_center_control.value = $store.state.custom_defines.is_custom_isv
$store.state.custom_defines.function_center_control; );
function_output_board.value = const function_center_control = ref(
$store.state.custom_defines.function_output_board; $store.state.custom_defines.function_center_control
function_mirroring_output.value = );
$store.state.custom_defines.function_mirroring_output; const function_output_board = ref(
function_magic_wall.value = $store.state.custom_defines.function_output_board
$store.state.custom_defines.function_magic_wall; );
function_fusion.value = $store.state.custom_defines.function_fusion; const function_mirroring_output = ref(
function_fusion_count.value = $store.state.custom_defines.function_mirroring_output
EDeviceAttributeHelper.getProductFusionOutputCountDefault(
$store.state.device_attribute,
1
); );
if (function_magic_wall.value) {
selected_product.value = "magic_wall";
} else if (function_fusion.value) {
selected_product.value = "fusion";
}
}; };
return { return {
@ -612,12 +498,8 @@ export default defineComponent({
server_address, server_address,
function_output_board, function_output_board,
function_custom_ISV, function_custom_ISV,
function_magic_wall,
function_fusion,
function_fusion_count,
function_center_control, function_center_control,
function_mirroring_output, function_mirroring_output,
selected_product,
target_language, target_language,
copyToClipboard, copyToClipboard,
isShow() { isShow() {
@ -715,9 +597,22 @@ export default defineComponent({
} }
let success = false; let success = false;
const response = await GlobalData.getInstance()
.getCurrentClient()
?.registerDevice(
register_code.value,
active_code.value,
register_type.value == "online",
active_type.value == "forever",
secret_key.value,
parseInt(active_hour.value.toString())
);
if (response) {
success = response.success;
}
if (success) {
let attribute = EDeviceAttribute.None; let attribute = EDeviceAttribute.None;
{
if (function_center_control.value) { if (function_center_control.value) {
attribute |= EDeviceAttribute.CenterControl; attribute |= EDeviceAttribute.CenterControl;
} }
@ -731,37 +626,14 @@ export default defineComponent({
if (function_custom_ISV.value) { if (function_custom_ISV.value) {
attribute |= EDeviceAttribute.CustomISV; attribute |= EDeviceAttribute.CustomISV;
} }
if (function_magic_wall.value) {
attribute |= EDeviceAttribute.ProductMagicWall;
}
if (function_fusion.value) {
attribute |=
EDeviceAttributeHelper.getProdictFusionAttributeByIndex(
function_fusion_count.value
);
}
}
const response = await GlobalData.getInstance() GlobalData.getInstance()
.getCurrentClient() .getCurrentClient()
?.registerDevice( ?.setDeviceAttribute(attribute);
register_code.value,
active_code.value,
register_type.value == "online",
active_type.value == "forever",
attribute,
secret_key.value,
parseInt(active_hour.value.toString())
);
if (response) {
success = response.success;
}
if (success) {
GlobalData.getInstance() GlobalData.getInstance()
.getCurrentClient() .getCurrentClient()
?.setServerLanguage(target_language.value); ?.setServerLanguage(target_language.value);
Cookies.remove("language");
} }
$q.notify({ $q.notify({
@ -774,7 +646,7 @@ export default defineComponent({
position: "top", position: "top",
timeout: 1500, timeout: 1500,
}); });
show_dialog.value = !success; show_dialog.value = false;
} catch {} } catch {}
loading.value = false; loading.value = false;
}, },
@ -791,7 +663,12 @@ export default defineComponent({
} }
}, },
isIpAddress(str: string) { isIpAddress(str: string) {
return ValidationUtil.isIpAddress(str); return (
str == "localhost" ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
str
)
);
}, },
}; };
}, },

View File

@ -255,7 +255,7 @@ export default defineComponent({
(e) => e && e.uuid == options.data?.uuid (e) => e && e.uuid == options.data?.uuid
); );
if (signal_item_data_) { if (signal_item_data_) {
selected.value = signal_item_data_.parent_uuid; selected.value = signal_item_data_.uuid;
} else { } else {
selected.value = ""; selected.value = "";
} }

View File

@ -216,7 +216,6 @@ export default defineComponent({
const editor_config = reactive({ const editor_config = reactive({
plugins: [ plugins: [
"fullscreen", "fullscreen",
"wordcount",
/*'lists link image paste help wordcount'*/ /*'lists link image paste help wordcount'*/
], ],
mobile: { mobile: {
@ -224,9 +223,8 @@ export default defineComponent({
}, },
font_size_formats: get_font_size_formarts(), font_size_formats: get_font_size_formarts(),
skin: "tinymce-5", skin: "tinymce-5",
language: i18n.locale.value == "zh-CN" ? "zh-Hans" : "en_US", language: i18n.locale.value == "zh-CN" ? "zh_CN" : "en_US",
menubar: false, menubar: false,
content_style: "p {font-size:60pt;margin:0px;}", // (12px, editor.execCommand)
branding: false, branding: false,
toolbar_mode: "wrap", toolbar_mode: "wrap",
toolbar: toolbar:
@ -266,32 +264,6 @@ export default defineComponent({
loading.value = false; loading.value = false;
}, },
editorInited(event: any, editor: any) { editorInited(event: any, editor: any) {
// editor : https://www.tiny.cloud/docs/tinymce/6/apis/tinymce.editor/#execCommand
editor.focus();
{
// wordcount
const buttons = document.getElementsByClassName(
"tox-statusbar__wordcount"
);
if (buttons && buttons.length) {
for (let i = 0; i < buttons.length; ++i) {
const item = <any>buttons.item(i);
if (item && typeof item.click == "function") {
item.click();
}
}
}
}
//
const text = editor.getContent({ format: "text" });
try {
if (text && typeof text == "string" && text.trim().length != 0) {
return; //
}
} catch (e) {
console.log(e);
}
// // ( content_style)
editor.execCommand("FontSize", false, "60pt"); editor.execCommand("FontSize", false, "60pt");
}, },
onShow() { onShow() {

View File

@ -62,10 +62,9 @@
<q-tab <q-tab
v-if=" v-if="
$store.state.advanced_debug || $store.state.advanced_debug ||
/*!$store.state.custom_defines.is_custom_isv */ /*!$store.state.custom_defines.is_custom_isv */ (!$store.state
(!$store.state.custom_defines.function_output_board && .custom_defines.function_output_board &&
$store.state.isLedPlayer()) || $store.state.isLedPlayer())
$store.state.custom_defines.function_fusion
" "
name="graphics" name="graphics"
no-caps no-caps
@ -77,7 +76,6 @@
" "
:disable="loading" :disable="loading"
/> />
<q-tab <q-tab
name="timing_task" name="timing_task"
no-caps no-caps
@ -98,7 +96,6 @@
:label="$t('output board setting')" :label="$t('output board setting')"
:disable="loading" :disable="loading"
/> />
<q-tab <q-tab
name="other" name="other"
no-caps no-caps
@ -106,13 +103,6 @@
:label="$t('other setting')" :label="$t('other setting')"
:disable="loading" :disable="loading"
/> />
<q-tab
name="cloud_server"
no-caps
icon="cloud"
:label="$t('cloud server')"
:disable="loading"
/>
<q-tab <q-tab
name="user" name="user"
no-caps no-caps
@ -180,21 +170,21 @@
v-if="true || auto_ip != $t('enable')" v-if="true || auto_ip != $t('enable')"
> >
<q-item-section avatar class="width_5_1">{{ <q-item-section avatar class="width_5_1">{{
$t("netmask") + ":" $t("gateway") + ":"
}}</q-item-section> }}</q-item-section>
<q-item-section> <q-item-section>
<q-input <q-input
:loading="loading" :loading="loading"
:disable="auto_ip == $t('enable') || loading" :disable="auto_ip == $t('enable') || loading"
v-model="netmask" v-model="gateway"
maxlength="15" maxlength="15"
:rules="[ :rules="[
(val) => (val) =>
(val && val.length > 0) || (val && val.length > 0) ||
$t('Please type something'), $t('Please type something'),
(val) => (val) =>
isMaskAddress(val) || isIpAddress(val) ||
$t('Please input vaild netmask address'), $t('Please input vaild ip address'),
]" ]"
lazy-rules lazy-rules
/> />
@ -205,13 +195,13 @@
v-if="true || auto_ip != $t('enable')" v-if="true || auto_ip != $t('enable')"
> >
<q-item-section avatar class="width_5_1">{{ <q-item-section avatar class="width_5_1">{{
$t("gateway") + ":" $t("netmask") + ":"
}}</q-item-section> }}</q-item-section>
<q-item-section> <q-item-section>
<q-input <q-input
:loading="loading" :loading="loading"
:disable="auto_ip == $t('enable') || loading" :disable="auto_ip == $t('enable') || loading"
v-model="gateway" v-model="netmask"
maxlength="15" maxlength="15"
:rules="[ :rules="[
(val) => (val) =>
@ -418,10 +408,7 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="!$store.state.custom_defines.function_output_board"
!$store.state.custom_defines.function_output_board ||
$store.state.custom_defines.function_fusion
"
> >
<q-item-section avatar class="width_5_2_2" <q-item-section avatar class="width_5_2_2"
>{{ $t("output type") }}:</q-item-section >{{ $t("output type") }}:</q-item-section
@ -466,10 +453,8 @@
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="
(!$store.state.custom_defines.function_output_board && !$store.state.custom_defines.function_output_board &&
device_resolution_type.toUpperCase() == 'EDID') || device_resolution_type.toUpperCase() == 'EDID'
($store.state.custom_defines.function_fusion &&
device_resolution_type.toUpperCase() == 'EDID')
" "
> >
<q-item-section avatar class="width_5_2_2" <q-item-section avatar class="width_5_2_2"
@ -486,10 +471,8 @@
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="
(!$store.state.custom_defines.function_output_board && !$store.state.custom_defines.function_output_board &&
device_resolution_type.toUpperCase() == 'CVT') || device_resolution_type.toUpperCase() == 'CVT'
($store.state.custom_defines.function_fusion &&
device_resolution_type.toUpperCase() == 'CVT')
" "
> >
<q-item-section avatar class="width_5_2_2" <q-item-section avatar class="width_5_2_2"
@ -506,10 +489,8 @@
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="
(!$store.state.custom_defines.function_output_board && !$store.state.custom_defines.function_output_board &&
device_resolution_type.toUpperCase() == 'CUSTOM') || device_resolution_type.toUpperCase() == 'CUSTOM'
($store.state.custom_defines.function_fusion &&
device_resolution_type.toUpperCase() == 'CUSTOM')
" "
> >
<q-item-section avatar class="width_5_2_2" <q-item-section avatar class="width_5_2_2"
@ -823,8 +804,7 @@
class="_panel" class="_panel"
v-if=" v-if="
$store.state.custom_defines.function_output_board || $store.state.custom_defines.function_output_board ||
$store.state.advanced_debug || $store.state.advanced_debug
$store.state.custom_defines.function_fusion
" "
> >
<q-card class="fit"> <q-card class="fit">
@ -1043,103 +1023,6 @@
</q-card> </q-card>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="cloud_server" class="_panel">
<q-card class="fit">
<q-card-section>
<q-form ref="cloud_server_form" @submit="applyCloudServer">
<q-list>
<q-item class="q-pa-none">
<q-item-section avatar class="width_5_1">{{
$t("enable") + $t(" ") + $t("server") + ":"
}}</q-item-section>
<q-item-section>
<q-select
v-model="cloud_server_enable"
:options="[$t('enable'), $t('disable')]"
:loading="loading"
:disable="loading"
@update:model-value="autoIpChanged"
/>
</q-item-section>
</q-item>
<q-item
class="q-pa-none"
:disable="cloud_server_enable != $t('enable')"
>
<q-item-section avatar class="width_5_1">{{
$t("server address") + ":"
}}</q-item-section>
<q-item-section>
<q-input
v-model="cloud_server_address"
:loading="loading"
:disable="
cloud_server_enable != $t('enable') || loading
"
maxlength="15"
:rules="[
(val) =>
(val && val.length > 0) ||
$t('Please type something'),
(val) =>
isIpAddress(val) ||
$t('Please input vaild ip address'),
]"
lazy-rules
/>
</q-item-section>
</q-item>
<q-item
class="q-pa-none"
:disable="cloud_server_enable != $t('enable')"
>
<q-item-section avatar class="width_5_1">{{
$t("device verify key") + ":"
}}</q-item-section>
<q-item-section>
<q-input
:loading="loading"
:disable="
cloud_server_enable != $t('enable') || loading
"
v-model="cloud_server_verify_key"
maxlength="6"
:rules="[
(val) =>
(val && val.length > 0) ||
$t('Please type something'),
(val) =>
(val && val.length == 6) ||
$t('verify key length is 6'),
]"
lazy-rules
/>
</q-item-section>
</q-item>
<q-item
class="q-pa-none"
:disable="cloud_server_enable != $t('enable')"
>
<q-item-section avatar class="width_5_1">{{
$t("use wss") + ":"
}}</q-item-section>
<q-item-section>
<q-select
v-model="cloud_server_use_wss"
:options="[$t('enable'), $t('disable')]"
:loading="loading"
:disable="
cloud_server_enable != $t('enable') || loading
"
/>
</q-item-section>
</q-item>
</q-list>
</q-form>
</q-card-section>
</q-card>
</q-tab-panel>
<q-tab-panel name="user" class="_panel"> <q-tab-panel name="user" class="_panel">
<q-card class="fit"> <q-card class="fit">
<q-card-section> <q-card-section>
@ -1284,7 +1167,6 @@
<div <div
v-if=" v-if="
click_count >= target_click_count ||
click_count >= target_click_count || click_count >= target_click_count ||
$store.state.advanced_debug $store.state.advanced_debug
" "
@ -1467,7 +1349,7 @@ import TimingTaskDialog from "src/components/TimingTaskDialog.vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import GlobalData from "src/common/GlobalData"; import GlobalData from "src/common/GlobalData";
import ValidationUtil from "src/common/ValidationUtil"; import { HttpProtocol } from "src/entities/HttpProtocol";
import { date } from "quasar"; import { date } from "quasar";
import { Protocol } from "src/entities/WSProtocol"; import { Protocol } from "src/entities/WSProtocol";
import TimingTaskEntity, { import TimingTaskEntity, {
@ -1513,45 +1395,41 @@ import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resiz
export default defineComponent({ export default defineComponent({
name: "ComponentSystemSettingDialog", name: "ComponentSystemSettingDialog",
components: { components: { TimingTaskDialog, SystenSettingAdvancedNetworkDialog ,vue3ResizeDrag},
TimingTaskDialog,
SystenSettingAdvancedNetworkDialog,
vue3ResizeDrag,
},
setup() { setup() {
const $store = useStore(); let $store = useStore();
const $q = useQuasar(); let $q = useQuasar();
const $t = useI18n(); let $t = useI18n();
const show_dialog = ref(false); let show_dialog = ref(false);
const loading = ref(false); let loading = ref(false);
const timing_task_dialog: Ref<any> = ref(null); const timing_task_dialog: Ref<any> = ref(null);
const system_setting_advanced_network_dialog: Ref<any> = ref(null); const system_setting_advanced_network_dialog: Ref<any> = ref(null);
const tab = ref("network"); let tab = ref("network");
const auto_ip = ref($t.t("enable")); let auto_ip = ref($t.t("enable"));
const ip_address = ref("127.0.0.1"); let ip_address = ref("127.0.0.1");
const gateway = ref("127.0.0.1"); let gateway = ref("127.0.0.1");
const netmask = ref("127.0.0.1"); let netmask = ref("127.0.0.1");
const dns1 = ref(); let dns1 = ref();
const dns2 = ref(); let dns2 = ref();
const mac_address = ref("11:22:33:44:55:66"); let mac_address = ref("11:22:33:44:55:66");
let ip_address_list: AdvancedIpAddressEntity[] = []; let ip_address_list: AdvancedIpAddressEntity[] = [];
let host_name = "player"; let host_name = "player";
const brightness = ref(0); let brightness = ref(0);
const contrast = ref(0); let contrast = ref(0);
const hue = ref(0); let hue = ref(0);
const mirroring_output = ref(false); const mirroring_output = ref(false);
const device_resolution = ref(""); let device_resolution = ref("");
const device_resolution_options: Ref<string[]> = ref([]); let device_resolution_options: Ref<string[]> = ref([]);
const device_rotate = ref(0); let device_rotate = ref(0);
const device_rotate_options = ref([ let device_rotate_options = ref([
{ {
label: "0°", label: "0°",
value: 0, value: 0,
@ -1585,8 +1463,8 @@ export default defineComponent({
// value: 7, // value: 7,
// }, // },
]); ]);
const device_resolution_type = ref("EDID"); let device_resolution_type = ref("EDID");
const device_resolution_type_options = ref([ let device_resolution_type_options = ref([
{ label: "EDID", value: "EDID" }, { label: "EDID", value: "EDID" },
{ label: $t.t("force output") /*+ "(CVT)"*/, value: "CVT" }, { label: $t.t("force output") /*+ "(CVT)"*/, value: "CVT" },
{ {
@ -1594,67 +1472,61 @@ export default defineComponent({
value: "CUSTOM", value: "CUSTOM",
}, },
]); ]);
const device_resolution_timing = ref(""); let device_resolution_timing = ref("");
const output_board_resolution = ref(""); let output_board_resolution = ref("");
const output_board_resolution_options = ref(["1", "2", "3"]); let output_board_resolution_options = ref(["1", "2", "3"]);
const system_muted = ref($t.t("off")); let system_muted = ref($t.t("off"));
const system_volume = ref(100); let system_volume = ref(100);
const output_audio_card_options = ref([ let output_audio_card_options = ref([
{ label: $t.t("all"), value: "all" }, { label: $t.t("all"), value: "all" },
{ label: "3.5mm", value: "3.5mm" }, { label: "3.5mm", value: "3.5mm" },
{ label: "HDMI1", value: "HDMI1" }, { label: "HDMI1", value: "HDMI1" },
]); ]);
let old_output_audio_card = ""; let old_output_audio_card = "";
const output_audio_card = ref(output_audio_card_options.value[0].value); let output_audio_card = ref(output_audio_card_options.value[0].value);
const use_ntp = ref($t.t("enable")); let use_ntp = ref($t.t("enable"));
const ntp_server = ref(""); let ntp_server = ref("");
const ntp_sync_delay = ref(180); let ntp_sync_delay = ref(180);
const current_date = ref(""); let current_date = ref("");
const current_time = ref(""); let current_time = ref("");
const time_zone = ref(""); let time_zone = ref("");
const time_zone_options: Ref<string[]> = ref([]); let time_zone_options: Ref<string[]> = ref([]);
for (const item of _time_zones) { for (const item of _time_zones) {
time_zone_options.value.push($t.t(item)); time_zone_options.value.push($t.t(item));
} }
const network_form: Ref<any> = ref(null); let network_form: Ref<any> = ref(null);
const other_form: Ref<any> = ref(null); let other_form: Ref<any> = ref(null);
const graphics_form: Ref<any> = ref(null); let graphics_form: Ref<any> = ref(null);
const output_board_form: Ref<any> = ref(null); let output_board_form: Ref<any> = ref(null);
const user_form: Ref<any> = ref(null); const user_form: Ref<any> = ref(null);
const cloud_server_form: Ref<any> = ref(null);
const output_board_wall_row = ref(2); let output_board_wall_row = ref(2);
const output_board_wall_col = ref(2); let output_board_wall_col = ref(2);
const output_board_splicing = ref($t.t("on")); let output_board_splicing = ref($t.t("on"));
const output_board_vertical_blanking = ref(0); let output_board_vertical_blanking = ref(0);
const output_board_horizon_blanking = ref(0); let output_board_horizon_blanking = ref(0);
const output_board_rotate = ref(0); let output_board_rotate = ref(0);
const output_board_rotate_options = ref([ const output_board_rotate_options = ref([
{ label: "0°", value: 0 }, { label: "0°", value: 0 },
{ label: "180°", value: 1 }, { label: "180°", value: 1 },
]); ]);
const output_board_volume = ref(100); let output_board_volume = ref(100);
const output_board_mute = ref($t.t("on")); let output_board_mute = ref($t.t("on"));
const timing_tasks: Ref<TimingTaskEntity[]> = ref([]); const timing_tasks: Ref<TimingTaskEntity[]> = ref([]);
const click_count = ref(0); let click_count = ref(0);
const target_click_count = ref(20); const target_click_count = ref(20);
const client_version = ref(version); let client_version = ref(version);
const server_version = ref("unknow"); let server_version = ref("unknow");
const server_commit_hash = ref("unknow"); let server_commit_hash = ref("unknow");
const server_build_date = ref("unknow"); let server_build_date = ref("unknow");
const server_branch_name = ref("unknow"); let server_branch_name = ref("unknow");
const kernel_version = ref("unknow"); let kernel_version = ref("unknow");
const rootfs_version = ref("unknow"); let rootfs_version = ref("unknow");
const cloud_server_enable = ref($t.t("enable"));
const cloud_server_address = ref("");
const cloud_server_verify_key = ref("");
const cloud_server_use_wss = ref($t.t("enable"));
const refresh_network = () => { const refresh_network = () => {
const config = GlobalData.getInstance()?.applicationConfig; const config = GlobalData.getInstance()?.applicationConfig;
@ -1734,6 +1606,7 @@ export default defineComponent({
current_time.value = date.formatDate(timeStamp, "HH:mm:ss"); current_time.value = date.formatDate(timeStamp, "HH:mm:ss");
} }
}; };
const refresh_output_board = async () => { const refresh_output_board = async () => {
const settings = await GlobalData.getInstance() const settings = await GlobalData.getInstance()
.getCurrentClient() .getCurrentClient()
@ -1770,28 +1643,11 @@ export default defineComponent({
} }
}; };
const refresh_cloud_server = () => {
const config = GlobalData.getInstance()?.applicationConfig;
if (config) {
cloud_server_enable.value = parseInt(config.cloud_server_enable)
? $t.t("enable")
: $t.t("disable");
cloud_server_address.value =
config.cloud_server_address || "192.168.1.1";
cloud_server_verify_key.value =
config.cloud_server_verify_key || "123456";
cloud_server_use_wss.value = parseInt(config.cloud_server_use_wss)
? $t.t("enable")
: $t.t("disable");
}
};
const refresh_all = () => { const refresh_all = () => {
refresh_network(); refresh_network();
refresh_graphics(); refresh_graphics();
refresh_other(); refresh_other();
refresh_output_board(); refresh_output_board();
refresh_cloud_server();
}; };
const wait_for = async (delay_ms: number) => { const wait_for = async (delay_ms: number) => {
@ -2033,9 +1889,6 @@ export default defineComponent({
const applyOutputBoard = async () => { const applyOutputBoard = async () => {
loading.value = true; loading.value = true;
const request = new Protocol.SetOutputBoardSettingRequestEntity(); const request = new Protocol.SetOutputBoardSettingRequestEntity();
const response = await GlobalData.getInstance()
.getCurrentClient()
?.getMagicWallConfig();
request.wall_col = parseInt(output_board_wall_col.value.toString()); request.wall_col = parseInt(output_board_wall_col.value.toString());
request.wall_row = parseInt(output_board_wall_row.value.toString()); request.wall_row = parseInt(output_board_wall_row.value.toString());
request.splicing = output_board_splicing.value == $t.t("on"); request.splicing = output_board_splicing.value == $t.t("on");
@ -2049,24 +1902,13 @@ export default defineComponent({
request.volume = parseInt(output_board_volume.value.toString()); request.volume = parseInt(output_board_volume.value.toString());
request.mute = output_board_mute.value == $t.t("on"); request.mute = output_board_mute.value == $t.t("on");
request.output_board_resolution = output_board_resolution.value; request.output_board_resolution = output_board_resolution.value;
let success = false; let success = false;
try { try {
await GlobalData.getInstance() await GlobalData.getInstance()
.getCurrentClient() .getCurrentClient()
?.setOutputBoardSetting(request); ?.setOutputBoardSetting(request);
success = true; success = true;
if (
$store.state.custom_defines.function_magic_wall &&
response &&
success
) {
const output_length =
parseInt(output_board_wall_col.value.toString()) *
parseInt(output_board_wall_row.value.toString());
if (output_length != response.config.col * response.config.row) {
$store.commit("setShowMonitorList", []);
}
}
} catch {} } catch {}
$q.notify({ $q.notify({
color: success ? "positive" : "negative", color: success ? "positive" : "negative",
@ -2096,49 +1938,15 @@ export default defineComponent({
case "output_board": case "output_board":
output_board_form.value.submit(); output_board_form.value.submit();
break; break;
case "cloud_server":
cloud_server_form.value.submit();
break;
case "user": case "user":
user_form.value.submit(); user_form.value.submit();
break; break;
} }
}; };
const applyCloudServer = async () => {
loading.value = true;
let success = false;
try {
await GlobalData.getInstance()
.getCurrentClient()
?.setCloudServerSetting(
cloud_server_address.value,
cloud_server_verify_key.value,
cloud_server_use_wss.value == $t.t("enable"),
cloud_server_enable.value == $t.t("enable")
);
success = true;
} catch {}
$q.notify({
color: success ? "positive" : "negative",
icon: success ? "done" : "warning",
message:
$t.t("set cloud server setting") +
$t.t(" ") +
(success ? $t.t("success") : $t.t("fail")) +
"!",
position: "top",
timeout: 2500,
});
loading.value = false;
};
const applyUser = async () => { const applyUser = async () => {
loading.value = true; loading.value = true;
console.log("zzz");
const request = new Protocol.SetOutputBoardSettingRequestEntity(); const request = new Protocol.SetOutputBoardSettingRequestEntity();
request.wall_col = parseInt(output_board_wall_col.value.toString()); request.wall_col = parseInt(output_board_wall_col.value.toString());
request.wall_row = parseInt(output_board_wall_row.value.toString()); request.wall_row = parseInt(output_board_wall_row.value.toString());
@ -2309,7 +2117,6 @@ export default defineComponent({
other_form, other_form,
graphics_form, graphics_form,
output_board_form, output_board_form,
cloud_server_form,
user_form, user_form,
mirroring_output, mirroring_output,
click_count, click_count,
@ -2321,10 +2128,6 @@ export default defineComponent({
server_branch_name, server_branch_name,
kernel_version, kernel_version,
rootfs_version, rootfs_version,
cloud_server_enable,
cloud_server_address,
cloud_server_verify_key,
cloud_server_use_wss,
user_name, user_name,
old_password, old_password,
new_password, new_password,
@ -2337,7 +2140,6 @@ export default defineComponent({
applyGraphics, applyGraphics,
applyOther, applyOther,
applyOutputBoard, applyOutputBoard,
applyCloudServer,
applyUser, applyUser,
loga(a: any) { loga(a: any) {
console.log(a); console.log(a);
@ -2525,17 +2327,20 @@ export default defineComponent({
} }
}, },
isIpAddress(str: string) { isIpAddress(str: string) {
return ValidationUtil.isIpAddress(str); return (
str == "localhost" ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
str
)
);
}, },
isMacAddress(str: string) { isMacAddress(str: string) {
return ValidationUtil.isMacAddress(str); return /([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}/.test(str);
},
isMaskAddress(str: string) {
return ValidationUtil.isMaskAddress(str);
}, },
checkResolution(str: string) { checkResolution(str: string) {
const reg = /([0-9]{1,5})[x|X]([0-9]{1,5}@[0-9]{1,3}$)/;
return ( return (
ValidationUtil.isResolution(str) || reg.test(str) ||
$t.t("the resolution format is incorrect,") + $t.t("the resolution format is incorrect,") +
$t.t("for example: ") + $t.t("for example: ") +
"1920x1080@60" "1920x1080@60"

View File

@ -20,7 +20,14 @@
</div> </div>
<q-space /> <q-space />
<div> <div>
<q-btn flat round icon="close" color="red" v-close-popup> <q-btn
flat
round
icon="close"
:disable="loading"
color="red"
v-close-popup
>
<q-tooltip> <q-tooltip>
{{ $t("close") }} {{ $t("close") }}
</q-tooltip> </q-tooltip>
@ -167,7 +174,7 @@
<q-btn <q-btn
:disable="old_http_port == http_port" :disable="old_http_port == http_port"
no-caps no-caps
:label="$t('apply')" :label="$t('commit')"
@click="commitHttpPort" @click="commitHttpPort"
/> />
</q-item-section> </q-item-section>
@ -206,7 +213,7 @@
<q-btn <q-btn
:disable="old_websocket_port == websocket_port" :disable="old_websocket_port == websocket_port"
no-caps no-caps
:label="$t('apply')" :label="$t('commit')"
@click="commitWebsocketPort" @click="commitWebsocketPort"
/> />
</q-item-section> </q-item-section>
@ -287,7 +294,6 @@ import AdvancedIpAddressDialog from "src/components/AdvancedIpAddressDialog.vue"
import { AdvancedIpAddressEntity } from "src/entities/AdvancedIpAddressEntity"; import { AdvancedIpAddressEntity } from "src/entities/AdvancedIpAddressEntity";
import { api } from "src/boot/axios"; import { api } from "src/boot/axios";
import { HttpProtocol } from "src/entities/HttpProtocol"; import { HttpProtocol } from "src/entities/HttpProtocol";
import ValidationUtil from "src/common/ValidationUtil";
export default defineComponent({ export default defineComponent({
name: "ComponentSystenSettingAdvancedNetworkDialog", name: "ComponentSystenSettingAdvancedNetworkDialog",
@ -304,12 +310,12 @@ export default defineComponent({
const advance_ip_table_selected: Ref<AdvancedIpAddressEntity[]> = ref([]); const advance_ip_table_selected: Ref<AdvancedIpAddressEntity[]> = ref([]);
const host_name = ref("player"); const host_name = ref("player");
const http_port = ref(GlobalData.kDefaultHttpPort); const old_http_port = ref(80);
const old_http_port = ref(GlobalData.kDefaultHttpPort); const http_port = ref(80);
const real_http_port = ref(GlobalData.kDefaultHttpPort); const real_http_port = ref(80);
const websocket_port = ref(GlobalData.kDefaultWebsocektPort);
const old_websocket_port = ref(GlobalData.kDefaultWebsocektPort); const old_websocket_port = ref(GlobalData.kDefaultWebsocektPort);
const real_websocket_port = ref(GlobalData.kDefaultWebsocektPort); const websocket_port = ref(GlobalData.kDefaultWebsocektPort);
const real_websocket_port = ref(80);
const advance_ip_columns = [ const advance_ip_columns = [
{ {
@ -347,6 +353,15 @@ export default defineComponent({
const advance_ip_rows: Ref<AdvancedIpAddressEntity[]> = ref([]); const advance_ip_rows: Ref<AdvancedIpAddressEntity[]> = ref([]);
const isIpAddress = (str: string) => {
return (
str == "localhost" ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
str
)
);
};
let _resolove: any = null; let _resolove: any = null;
return { return {
@ -614,7 +629,7 @@ export default defineComponent({
}); });
}, },
isEnglishOrNum(str: string) { isEnglishOrNum(str: string) {
return ValidationUtil.isEnglishOrNum(str); return /^[0-9a-zA-Z_\-]+$/.test(str);
}, },
}; };
}, },

View File

@ -61,6 +61,7 @@
ref="uploader_software" ref="uploader_software"
:url="upload_url_software" :url="upload_url_software"
method="post" method="post"
:headers="generatorFileUploadHeaders"
:label="$t('select software upgrade file') + ':'" :label="$t('select software upgrade file') + ':'"
accept=".zip,.tar,.tar.gz" accept=".zip,.tar,.tar.gz"
:hide-upload-btn="true" :hide-upload-btn="true"
@ -75,6 +76,7 @@
ref="uploader_rootfs" ref="uploader_rootfs"
:url="upload_url_rootfs" :url="upload_url_rootfs"
method="post" method="post"
:headers="generatorFileUploadHeaders"
:label="$t('select rootfs upgrade file') + ':'" :label="$t('select rootfs upgrade file') + ':'"
accept=".img" accept=".img"
:hide-upload-btn="true" :hide-upload-btn="true"
@ -83,7 +85,6 @@
@added="(files) => files && (file_count += files.length)" @added="(files) => files && (file_count += files.length)"
@removed="(files) => files && (file_count -= files.length)" @removed="(files) => files && (file_count -= files.length)"
/> />
<!-- :headers="generatorFileUploadHeaders" -->
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
@ -91,9 +92,7 @@
<q-separator /> <q-separator />
<q-card-actions> <q-card-actions align="right">
<q-item-section>V: {{ server_version }}</q-item-section>
<q-space />
<q-btn <q-btn
:loading="loading" :loading="loading"
flat flat
@ -145,7 +144,7 @@ export default defineComponent({
let select_options = [$t.t("software"), $t.t("rootfs")]; let select_options = [$t.t("software"), $t.t("rootfs")];
let upgrade_type = ref($t.t("software")); let upgrade_type = ref($t.t("software"));
const server_version = ref("unknow");
return { return {
show_dialog, show_dialog,
loading, loading,
@ -156,27 +155,41 @@ export default defineComponent({
file_count, file_count,
upgrade_type, upgrade_type,
select_options, select_options,
server_version, generatorFileUploadHeaders(files: File[]) {
if (files.length > 0) {
return [
{
name: HttpProtocol.kHeaderXProductName,
value: HttpProtocol.getProductName($store),
},
{
name: HttpProtocol.kHeaderXFileLength,
value: files[0].size,
},
];
}
return [];
},
loga(a: any) { loga(a: any) {
console.log(a); console.log(a);
}, },
showDialog() { showDialog() {
show_dialog.value = true; show_dialog.value = true;
let url = GlobalData.getInstance().createCurrentRequestUrl();
if (url) {
url.pathname = "/upload_soft_file";
upload_url_software.value = url.toString();
url.pathname = "/upload_root_fs_file";
upload_url_rootfs.value = url.toString();
}
try {
let client = GlobalData.getInstance().getCurrentClient(); let client = GlobalData.getInstance().getCurrentClient();
client?.getBuildInfo()?.then((build_info) => { if (client) {
if (build_info) { let url = new URL(client.url);
server_version.value = build_info.version; url.port =
GlobalData.getInstance().applicationConfig?.httpserver_port ??
HttpProtocol.DefaultHttpPort.toString();
url.pathname = HttpProtocol.RequestUploadFile;
url.protocol = "http:";
url.searchParams.append("type", HttpProtocol.UploadTypeRootFS);
upload_url_rootfs.value = url.toString();
url.searchParams.set("type", HttpProtocol.UploadTypeSoftware);
upload_url_software.value = url.toString();
} }
});
} catch (error) {}
}, },
resetData() { resetData() {
loading.value = false; loading.value = false;
@ -202,15 +215,7 @@ export default defineComponent({
: uploader_rootfs.value; : uploader_rootfs.value;
$q.dialog({ $q.dialog({
title: $t.t("Confirm"), title: $t.t("Confirm"),
message: message: $t.t("use this file to upgrade") + "?",
$t.t("Confirm") +
$t.t(" ") +
$t.t("use this file to upgrade") +
"?" +
$t.t(" ") +
$t.t(
"after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)"
),
ok: { ok: {
label: $t.t("ok"), label: $t.t("ok"),
noCaps: true, noCaps: true,
@ -254,15 +259,6 @@ export default defineComponent({
position: "top", position: "top",
timeout: 1500, timeout: 1500,
}); });
$q.notify({
type: "positive",
icon: "done",
message: $t.t(
"after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)"
),
position: "top",
timeout: 3000,
});
setTimeout(() => { setTimeout(() => {
window.location.reload(); window.location.reload();
}, 2000); }, 2000);

View File

@ -45,7 +45,6 @@
</q-item> </q-item>
<q-item <q-item
clickable clickable
v-if="$store.state.isLedPlayer()"
v-close-popup v-close-popup
:disable="$props.disable" :disable="$props.disable"
@click="$emit('edit_rect', $props.window.window_id)" @click="$emit('edit_rect', $props.window.window_id)"

View File

@ -41,9 +41,4 @@ export default class ApplicationConfigEntity {
image_suffix_filter: string | null = ""; image_suffix_filter: string | null = "";
special_video_layout_rotation: string | undefined = "0"; special_video_layout_rotation: string | undefined = "0";
device_hdmi_rotation: number = 0; device_hdmi_rotation: number = 0;
cloud_server_address = "";
cloud_server_verify_key = "";
cloud_server_use_wss = "0";
cloud_server_enable = "0";
magic_list:any=[]
} }

View File

@ -1,7 +0,0 @@
export default class DensityCorrection {
control_point = 0;
x = 0;
y = 0;
def_x = 0;
def_y = 0;
}

View File

@ -1,7 +0,0 @@
export default class DensityCorrectionPoint {
control_point = 0;
x = 0;
y = 0;
def_x = 0;
def_y = 0;
}

View File

@ -1,145 +1,38 @@
export enum EDeviceAttribute { export enum EDeviceAttribute {
None = 0x0000000000000001, None_UnKNow = 0x0000,
OutputBoard = 0x0000000000000002,
CenterControl = 0x0000000000000004,
MirroringOutput = 0x0000000000000008,
CustomISV = 0x0000000000000010,
Reserve5 = 0x0000000000000020,
Reserve6 = 0x0000000000000040,
Reserve7 = 0x0000000000000080,
Reserve8 = 0x0000000000000100,
Reserve9 = 0x0000000000000200,
Reserve10 = 0x0000000000000400,
Reserve11 = 0x0000000000000800,
Reserve12 = 0x0000000000001000,
Reserve13 = 0x0000000000002000,
Reserve14 = 0x0000000000004000,
Reserve15 = 0x0000000000008000,
Reserve16 = 0x0000000000010000,
Reserve17 = 0x0000000000020000,
Reserve18 = 0x0000000000040000,
Reserve19 = 0x0000000000080000,
Reserve20 = 0x0000000000100000,
ProductMagicWall = 0x0000000000200000,
ProductFusion_1 = 0x0000000000400000,
ProductFusion_2 = 0x0000000000800000,
ProductFusion_3 = 0x0000000001000000,
ProductFusion_4 = 0x0000000002000000,
ProductFusion_5 = 0x0000000004000000,
ProductFusion_6 = 0x0000000008000000,
ProductFusion_7 = 0x0000000010000000,
ProductFusion_8 = 0x0000000020000000,
ProductFusion_9 = 0x0000000040000000,
Reserve31 = 0x0000000080000000,
Reserve32 = 0x0000000100000000,
Reserve33 = 0x0000000200000000,
Reserve34 = 0x0000000400000000,
Reserve35 = 0x0000000800000000,
Reserve36 = 0x0000001000000000,
Reserve37 = 0x0000002000000000,
Reserve38 = 0x0000004000000000,
Reserve39 = 0x0000008000000000,
Reserve40 = 0x0000010000000000,
Reserve41 = 0x0000020000000000,
Reserve42 = 0x0000040000000000,
Reserve43 = 0x0000080000000000,
Reserve44 = 0x0000100000000000,
Reserve45 = 0x0000200000000000,
Reserve46 = 0x0000400000000000,
Reserve47 = 0x0000800000000000,
Reserve48 = 0x0001000000000000,
Reserve49 = 0x0002000000000000,
Reserve50 = 0x0004000000000000,
Reserve51 = 0x0008000000000000,
Reserve52 = 0x0010000000000000,
Reserve53 = 0x0020000000000000,
Reserve54 = 0x0040000000000000,
Reserve55 = 0x0080000000000000,
Reserve56 = 0x0100000000000000,
Reserve57 = 0x0200000000000000,
Reserve58 = 0x0400000000000000,
Reserve59 = 0x0800000000000000,
Reserve60 = 0x1000000000000000,
Reserve61 = 0x2000000000000000,
Reserve62 = 0x4000000000000000,
Reserve63 = 0x8000000000000000,
StandMediaControl = OutputBoard | CenterControl, None = 0x00000001,
All = 0xffffffffffffffff, OutputBoard = 0x00000002,
} CenterControl = 0x00000004,
MirroringOutput = 0x00000008,
CustomISV = 0x00000010,
Reserve5 = 0x00000020,
Reserve6 = 0x00000040,
Reserve7 = 0x00000080,
Reserve8 = 0x00000100,
Reserve9 = 0x00000200,
Reserve10 = 0x00000400,
Reserve11 = 0x00000800,
Reserve12 = 0x00001000,
Reserve13 = 0x00002000,
Reserve14 = 0x00004000,
Reserve15 = 0x00008000,
Reserve16 = 0x00010000,
Reserve17 = 0x00020000,
Reserve18 = 0x00040000,
Reserve19 = 0x00080000,
Reserve20 = 0x00100000,
Reserve21 = 0x00200000,
Reserve22 = 0x00400000,
Reserve23 = 0x00800000,
Reserve24 = 0x01000000,
Reserve25 = 0x02000000,
Reserve26 = 0x04000000,
Reserve27 = 0x08000000,
Reserve28 = 0x10000000,
Reserve29 = 0x20000000,
Reserve30 = 0x40000000,
Reserve31 = 0x80000000,
export class EDeviceAttributeHelper { All = 0xffffffff,
public static isProductFusion(attribute: number) {
return (
(attribute & EDeviceAttribute.ProductFusion_1) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_2) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_3) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_4) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_5) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_6) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_7) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_8) != 0 ||
(attribute & EDeviceAttribute.ProductFusion_9) != 0
);
}
public static getProductFusionOutputCount(attribute: number) {
if (attribute & EDeviceAttribute.ProductFusion_1) {
return 1;
} else if (attribute & EDeviceAttribute.ProductFusion_2) {
return 2;
} else if (attribute & EDeviceAttribute.ProductFusion_3) {
return 3;
} else if (attribute & EDeviceAttribute.ProductFusion_4) {
return 4;
} else if (attribute & EDeviceAttribute.ProductFusion_5) {
return 5;
} else if (attribute & EDeviceAttribute.ProductFusion_6) {
return 6;
} else if (attribute & EDeviceAttribute.ProductFusion_7) {
return 7;
} else if (attribute & EDeviceAttribute.ProductFusion_8) {
return 8;
} else if (attribute & EDeviceAttribute.ProductFusion_9) {
return 9;
} else {
return 0;
}
}
public static getProductFusionOutputCountDefault(
attribute: number,
default_Value: number
) {
const ret = EDeviceAttributeHelper.getProductFusionOutputCount(attribute);
if (ret == 0) {
return default_Value;
}
return ret;
}
public static getProdictFusionAttributeByIndex(index: number) {
switch (index) {
case 1:
return EDeviceAttribute.ProductFusion_1;
case 2:
return EDeviceAttribute.ProductFusion_2;
case 3:
return EDeviceAttribute.ProductFusion_3;
case 4:
return EDeviceAttribute.ProductFusion_4;
case 5:
return EDeviceAttribute.ProductFusion_5;
case 6:
return EDeviceAttribute.ProductFusion_6;
case 7:
return EDeviceAttribute.ProductFusion_7;
case 8:
return EDeviceAttribute.ProductFusion_8;
case 9:
return EDeviceAttribute.ProductFusion_9;
default:
return 0;
}
}
} }

View File

@ -1,8 +1,8 @@
export namespace HttpProtocol { export namespace HttpProtocol {
export const DefaultHttpPort = 80; export const DefaultHttpPort = 80;
export const RequestUploadFile = "/upload_file"; export const RequestUploadFile = "/upload_file";
export const RequestPathUpdateDBBackupFile = "/update_db_backup_file"; export const RequestPathUpdateDBBackupFile = "/common/update_db_backup_file";
export const RequestPathDBBackup = "/download_db_backup_file"; export const RequestPathDBBackup = "/db_backup";
export const RequestPathListFile = "/list_file"; export const RequestPathListFile = "/list_file";
export const RequestPathCreateDirectory = "/create_directory"; export const RequestPathCreateDirectory = "/create_directory";
export const RequestPathCheckFileSupport = "/check_file_support"; export const RequestPathCheckFileSupport = "/check_file_support";

View File

@ -1,8 +1,8 @@
import RotatedRectF, { RotatedRectFWithIndex } from "./RectF"; import RotatedRectF from "./RectF";
export default class MagicWallConfig { export default class MagicWallConfig {
magic_wall_enable = false; magic_wall_enable = false;
row = 0; row = 0;
col = 0; col = 0;
windows: RotatedRectFWithIndex[] = []; windows: RotatedRectF[] = [];
} }

View File

@ -32,11 +32,3 @@ export class RotatedRectF extends RectF {
this.angle = angle; this.angle = angle;
} }
} }
export class RotatedRectFWithIndex extends RotatedRectF{
index:number=0;
percenter:number=0;
initial_h:number=0;
initial_w:number=0;
background_h:number=0;
background_w:number=0;
}

View File

@ -486,13 +486,6 @@ export namespace Protocol {
return Commands.PROTOCOL_PREFIX + "RpcGetMagicWallConfig"; return Commands.PROTOCOL_PREFIX + "RpcGetMagicWallConfig";
} }
public static get kRpcGetMagicWallGridState() {
return Commands.PROTOCOL_PREFIX + "RpcGetMagicWallGridState";
}
public static get kRpcSetMagicWallGridState() {
return Commands.PROTOCOL_PREFIX + "RpcSetMagicWallGridState";
}
public static get kRpcTestA() { public static get kRpcTestA() {
return Commands.PROTOCOL_PREFIX + "RpcTestA"; return Commands.PROTOCOL_PREFIX + "RpcTestA";
} }
@ -521,58 +514,7 @@ export namespace Protocol {
public static get kSaveBlendingConfig() { public static get kSaveBlendingConfig() {
return Commands.PROTOCOL_PREFIX + "SaveBlendingConfig"; return Commands.PROTOCOL_PREFIX + "SaveBlendingConfig";
} }
public static get kSetBlendingHorDensity() {
return Commands.PROTOCOL_PREFIX + "SetBlendingHorDensity";
}
public static get kSetBlendingVerDensity() {
return Commands.PROTOCOL_PREFIX + "SetBlendingVerDensity";
}
public static get kResetBlending() {
return Commands.PROTOCOL_PREFIX + "ResetBlending";
}
public static get kSetBlendingOption() {
return Commands.PROTOCOL_PREFIX + "SetBlendingOption";
}
public static get kEnumBlendingScene() {
return Commands.PROTOCOL_PREFIX + "EnumBlendingScene";
}
public static get kApplyBlendingScene() {
return Commands.PROTOCOL_PREFIX + "ApplyBlendingScene";
}
public static get kDeleteBlendingScene() {
return Commands.PROTOCOL_PREFIX + "DeleteBlendingScene";
}
public static get kAddBlendingCtrlPoint() {
return Commands.PROTOCOL_PREFIX + "AddBlendingCtrlPoint";
}
public static get kDelBlendingCtrlPoint() {
return Commands.PROTOCOL_PREFIX + "DelBlendingCtrlPoint";
}
public static get kSetProjectorResolution() {
return Commands.PROTOCOL_PREFIX + "SetProjectorResolution";
}
public static get kSetProjectorLayout() {
return Commands.PROTOCOL_PREFIX + "SetProjectorLayout";
}
public static get kRpcFileManagerGetFileList() {
return Commands.PROTOCOL_PREFIX + "RpcFileManagerGetFileList";
}
public static get kRpcFileManagerRename() {
return Commands.PROTOCOL_PREFIX + "RpcFileManagerRename";
}
public static get kRpcFileManagerDelete() {
return Commands.PROTOCOL_PREFIX + "RpcFileManagerDelete";
}
public static get kRpcFileManagerCreateDirectory() {
return Commands.PROTOCOL_PREFIX + "RpcFileManagerCreateDirectory";
}
public static get kRpcCheckModeIndex() {
return Commands.PROTOCOL_PREFIX + "RpcCheckModeIndex";
}
public static get kRpcGetHttpInterfaceVersion() {
return Commands.PROTOCOL_PREFIX + "RpcGetHttpInterfaceVersion";
}
static _all_commands = new Set([ static _all_commands = new Set([
Commands.kUnKnowCommand, Commands.kUnKnowCommand,
Commands.kSearchDevice, Commands.kSearchDevice,
@ -701,25 +643,6 @@ export namespace Protocol {
Commands.kSetBlendingOverlap, Commands.kSetBlendingOverlap,
Commands.kGetBlendingConfig, Commands.kGetBlendingConfig,
Commands.kSaveBlendingConfig, Commands.kSaveBlendingConfig,
Commands.kSetBlendingHorDensity,
Commands.kSetBlendingVerDensity,
Commands.kResetBlending,
Commands.kSetBlendingOption,
Commands.kEnumBlendingScene,
Commands.kApplyBlendingScene,
Commands.kDeleteBlendingScene,
Commands.kAddBlendingCtrlPoint,
Commands.kDelBlendingCtrlPoint,
Commands.kSetProjectorResolution,
Commands.kSetProjectorLayout,
Commands.kRpcSetMagicWallGridState,
Commands.kRpcGetMagicWallGridState,
Commands.kRpcFileManagerGetFileList,
Commands.kRpcFileManagerRename,
Commands.kRpcFileManagerDelete,
Commands.kRpcFileManagerCreateDirectory,
Commands.kRpcCheckModeIndex,
Commands.kRpcGetHttpInterfaceVersion,
]); ]);
public static get AllCommands() { public static get AllCommands() {
return this._all_commands; return this._all_commands;
@ -1828,14 +1751,11 @@ export namespace Protocol {
online: boolean = false; online: boolean = false;
active_forever: boolean = false; active_forever: boolean = false;
hour: number = 0; hour: number = 0;
attribute: number = 0;
constructor( constructor(
register_code: string, register_code: string,
active_code: string, active_code: string,
online: boolean, online: boolean,
active_forever: boolean, active_forever: boolean,
attribute: number,
secret_key?: string, secret_key?: string,
hour?: number, hour?: number,
rcp_id?: number rcp_id?: number
@ -1850,7 +1770,6 @@ export namespace Protocol {
this.online = online; this.online = online;
this.active_forever = active_forever; this.active_forever = active_forever;
this.secret_key = secret_key ?? ""; this.secret_key = secret_key ?? "";
this.attribute = attribute ?? 0;
if (active_forever) { if (active_forever) {
this.hour = 0; this.hour = 0;
} else { } else {
@ -3236,52 +3155,6 @@ export namespace Protocol {
success = false; success = false;
} }
export class RpcSetMagicWallGridStateRequestEntity extends PacketEntity {
constructor(show_grid: boolean, rpc_id = 0) {
super();
super.command = Commands.kRpcSetMagicWallGridState;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.show_grid = show_grid;
}
show_grid = false;
}
export class RpcSetMagicWallGridStateResponseEntity extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
success = false;
}
export class RpcGetMagicWallGridStateRequestEntity extends PacketEntity {
constructor(rpc_id = 0) {
super();
super.command = Commands.kRpcGetMagicWallGridState;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
}
timestamp = 0;
}
export class RpcGetMagicWallGridStateResponseEntity extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
grid_showing = false;
}
export class MagicWallGridStateNotifyEntity extends PacketEntity {
grid_showing = false;
constructor() {
super();
this.command = Commands.kRpcSetMagicWallGridState;
super.flag = PacketEntity.FLAG_NOTIFY;
}
}
export class RpcTestARequestEntity extends PacketEntity { export class RpcTestARequestEntity extends PacketEntity {
constructor( constructor(
x: number, x: number,
@ -3326,22 +3199,12 @@ export namespace Protocol {
lb_l = 0; lb_l = 0;
} }
export class RpcBlendingResponseEntity extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
success = false;
}
/** */ /** */
export class SetBlendingCorrectionRequestEntity extends PacketEntity { export class SetBlendingCorrectionRequestEntity extends PacketEntity {
constructor( constructor(
row: number, row: number,
column: number, column: number,
correction_type: number, correction_type: number,
control_point_count: number,
control_point: number, control_point: number,
x: number, x: number,
y: number, y: number,
@ -3357,13 +3220,11 @@ export namespace Protocol {
this.row = row ?? 0; this.row = row ?? 0;
this.column = column ?? 0; this.column = column ?? 0;
this.correction_type = correction_type ?? 0; this.correction_type = correction_type ?? 0;
this.control_point_count = control_point_count ?? 0;
this.control_point = control_point ?? 0; this.control_point = control_point ?? 0;
} }
row = 0; row = 0;
column = 0; column = 0;
correction_type = 0; //4四点校正9曲面校正 correction_type = 0; //4四点校正9曲面校正
control_point_count = 0;
control_point = 0; //控制点编号1开始从上到下从左到右 control_point = 0; //控制点编号1开始从上到下从左到右
x = 0; x = 0;
y = 0; y = 0;
@ -3442,7 +3303,10 @@ export namespace Protocol {
} }
export class EnableBlendingRequestEntity extends PacketEntity { export class EnableBlendingRequestEntity extends PacketEntity {
constructor(enable: boolean, rpc_id = 0) { constructor(
enable: boolean,
rpc_id = 0
) {
super(); super();
super.command = Commands.kEnableBlending; super.command = Commands.kEnableBlending;
super.flag = PacketEntity.FLAG_REQUEST; super.flag = PacketEntity.FLAG_REQUEST;
@ -3460,7 +3324,6 @@ export namespace Protocol {
location: number, location: number,
enable: boolean, enable: boolean,
width: number, width: number,
auto_sync:boolean,
rpc_id = 0 rpc_id = 0
) { ) {
super(); super();
@ -3473,15 +3336,12 @@ export namespace Protocol {
this.location = location ?? 0; this.location = location ?? 0;
this.enable = enable ?? false; this.enable = enable ?? false;
this.width = width ?? 0; this.width = width ?? 0;
this.auto_sync = auto_sync ?? false;
} }
row = 0; row = 0;
column = 0; column = 0;
location = 0; //0左融合带1上融合带2右融合带3下融合带 location = 0; //0左融合带1上融合带2右融合带3下融合带
enable = false; enable = false;
width = 0; width = 0;
auto_sync=false;
} }
export class GetBlendingConfigResponseEntity extends PacketEntity { export class GetBlendingConfigResponseEntity extends PacketEntity {
@ -3494,9 +3354,12 @@ export namespace Protocol {
} }
export class GetBlendingConfigRequestEntity extends PacketEntity { export class GetBlendingConfigRequestEntity extends PacketEntity {
constructor(name: string, rpc_id = 0) { constructor(
name: string,
rpc_id = 0
) {
super(); super();
super.command = Commands.kGetBlendingConfig; super.command = Commands.kGetBlendingConfig
super.flag = PacketEntity.FLAG_REQUEST; super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id; super.rpc_id = rpc_id;
@ -3515,7 +3378,10 @@ export namespace Protocol {
} }
export class SaveBlendingConfigRequestEntity extends PacketEntity { export class SaveBlendingConfigRequestEntity extends PacketEntity {
constructor(name: string, rpc_id = 0) { constructor(
name: string,
rpc_id = 0
) {
super(); super();
super.command = Commands.kSaveBlendingConfig; super.command = Commands.kSaveBlendingConfig;
super.flag = PacketEntity.FLAG_REQUEST; super.flag = PacketEntity.FLAG_REQUEST;
@ -3525,326 +3391,4 @@ export namespace Protocol {
} }
name = ""; name = "";
} }
export class SetBlendingHorDensityRequestEntity extends PacketEntity {
constructor(
row: number,
column: number,
control_point_count: number,
control_point: number,
value: number,
rpc_id = 0
) {
super();
super.command = Commands.kSetBlendingHorDensity;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.row = row ?? 0;
this.column = column ?? 0;
this.control_point_count = control_point_count ?? 0;
this.control_point = control_point ?? 0;
this.value = value ?? 0;
}
row = 0;
column = 0;
control_point_count = 0;
control_point = 0; //控制点编号1开始从上到下从左到右
value = 0;
}
export class SetBlendingVerDensityRequestEntity extends PacketEntity {
constructor(
row: number,
column: number,
control_point_count: number,
control_point: number,
value: number,
rpc_id = 0
) {
super();
super.command = Commands.kSetBlendingVerDensity;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.row = row ?? 0;
this.column = column ?? 0;
this.control_point_count = control_point_count ?? 0;
this.control_point = control_point ?? 0;
this.value = value ?? 0;
}
row = 0;
column = 0;
control_point_count = 0;
control_point = 0; //控制点编号1开始从上到下从左到右
value = 0;
}
export class ResetBlendingConfigRequestEntity extends PacketEntity {
constructor(rpc_id = 0) {
super();
super.command = Commands.kResetBlending;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
}
}
export class SetBlendingOptionRequestEntity extends PacketEntity {
constructor(id: string, value: string, rpc_id = 0) {
super();
super.command = Commands.kSetBlendingOption;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.id = id ?? "";
this.value = value ?? "";
}
id;
value;
}
export class EnumBlendingSceneResponseEntity extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
scenes = [];
}
export class EnumBlendingSceneRequestEntity extends PacketEntity {
constructor(rpc_id = 0) {
super();
super.command = Commands.kEnumBlendingScene;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
}
}
export class ApplyBlendingSceneRequestEntity extends PacketEntity {
constructor(name: string, rpc_id = 0) {
super();
super.command = Commands.kApplyBlendingScene;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.name = name ?? "";
}
name;
}
export class DeleteBlendingSceneRequestEntity extends PacketEntity {
constructor(name: string, rpc_id = 0) {
super();
super.command = Commands.kDeleteBlendingScene;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.name = name ?? "";
}
name;
}
export class AddBlendingCtrlPointRequestEntity extends PacketEntity {
constructor(
type: string,
row: number,
column: number,
count: number,
rpc_id = 0
) {
super();
super.command = Commands.kAddBlendingCtrlPoint;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.type = type ?? "";
this.row = row ?? 0;
this.column = column ?? 0;
this.count = count ?? 0;
}
type; //ver_density:垂直疏密hor_density:水平疏密9曲面
row = 0;
column = 0;
count = 0; //控制点数量
}
export class DelBlendingCtrlPointRequestEntity extends PacketEntity {
constructor(
type: string,
row: number,
column: number,
count: number,
rpc_id = 0
) {
super();
super.command = Commands.kDelBlendingCtrlPoint;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.type = type ?? "";
this.row = row ?? 0;
this.column = column ?? 0;
this.count = count ?? 0;
}
type; //ver_density:垂直疏密hor_density:水平疏密9曲面
row = 0;
column = 0;
count = 0; //控制点数量
}
export class SetProjectorResolutionRequestEntity extends PacketEntity {
constructor(width: number, height: number, rpc_id = 0) {
super();
super.command = Commands.kSetProjectorResolution;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.width = width ?? 0;
this.height = height ?? 0;
}
width = 0;
height = 0;
}
export class SetProjectorLayoutRequestEntity extends PacketEntity {
constructor(row: number, column: number, rpc_id = 0) {
super();
super.command = Commands.kSetProjectorLayout;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.row = row ?? 0;
this.column = column ?? 0;
}
row = 0;
column = 0;
}
export class RpcFileManagerGetFileListRequest extends PacketEntity {
dir_path: string = "";
constructor(dir_path: string, rpc_id = 0) {
super();
super.command = Commands.kRpcFileManagerGetFileList;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.dir_path = dir_path;
}
}
export class RpcFileManagerGetFileListResponse extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
error_code = 0;
success = false;
error_message = "";
free = 0;
files: FileEntry[] = [];
}
export class RpcFileManagerRenameRequest extends PacketEntity {
constructor(
base_dir: string,
file_name: string,
new_file_name: string,
rpc_id = 0
) {
super();
super.command = Commands.kRpcFileManagerRename;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.base_dir = base_dir;
this.file_name = file_name;
this.new_file_name = new_file_name;
}
base_dir = "";
file_name = "";
new_file_name = "";
}
export class RpcFileManagerRenameResponse extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
success = false;
error_code = 0;
error_message = "";
}
export class RpcFileManagerDeleteRequest extends PacketEntity {
constructor(base_dir: string, file_name: string, rpc_id = 0) {
super();
super.command = Commands.kRpcFileManagerDelete;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.base_dir = base_dir;
this.file_name = file_name;
}
base_dir = "";
file_name = "";
}
export class RpcFileManagerDeleteResponse extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
success = false;
delete_count = "";
error_code = 0;
error_message = "";
}
export class RpcFileManagerCreateDirectoryRequest extends PacketEntity {
constructor(base_dir: string, dir_name: string, rpc_id = 0) {
super();
super.command = Commands.kRpcFileManagerCreateDirectory;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.base_dir = base_dir;
this.dir_name = dir_name;
}
base_dir = "";
dir_name = "";
}
export class RpcFileManagerCreateDirectoryResponse extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
success = false;
error_message = "";
error_code = 0;
}
export class RpcCheckModeIndexRequestEntity extends PacketEntity {
constructor(mode_index: number, rpc_id = 0) {
super();
super.command = Commands.kRpcCheckModeIndex;
super.flag = PacketEntity.FLAG_REQUEST;
this.mode_index = mode_index;
}
mode_index = 0;
}
export class RpcCheckModeIndexResponseEntity extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
success = false;
}
export class RpcGetHttpInterfaceVersionRequestEntity extends PacketEntity {
constructor(rpc_id = 0) {
super();
super.command = Commands.kRpcGetHttpInterfaceVersion;
super.flag = PacketEntity.FLAG_REQUEST;
}
timestamp = 0;
}
export class RpcGetHttpInterfaceVersionResponseEntity extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
version = 0;
}
} }

View File

@ -57,10 +57,6 @@ export default {
Accept: "Accept", Accept: "Accept",
"move speed": "Move Speed", "move speed": "Move Speed",
"y offset": "Y Offset", "y offset": "Y Offset",
"the number must be greater than 0": "The Number Must Be Greater Than 0",
"the number must be less than 2160":"The Number Must Be Less Than 2160",
"the number must be less than 3840":"The Number Must Be Less Than 3840",
"the number must be greater than 360":"The Number Must Be Less Than 360",
"pos x": "X Position", "pos x": "X Position",
"pos y": "Y Position", "pos y": "Y Position",
width: "Width", width: "Width",
@ -166,14 +162,13 @@ export default {
"timing task": " Timing Task", "timing task": " Timing Task",
other: "Other", other: "Other",
"auto ip": "Auto IP", "auto ip": "Auto IP",
"ip address": "IP Address", "ip address": "Ip Address",
gateway: "Gateway", gateway: "Gateway",
netmask: "Netmask", netmask: "Netmask",
"mac address": "MAC Address", "mac address": "MAC Address",
advanced: "Advanced", advanced: "Advanced",
"revert and exit": "Revert And Exit", "revert and exit": "Revert And Exit",
apply: "Apply", apply: "Apply",
load: "Load",
"current real resolution": "Current Real Resolution", "current real resolution": "Current Real Resolution",
"output type": "Output Type", "output type": "Output Type",
"target resolution": "Target Resolution", "target resolution": "Target Resolution",
@ -189,7 +184,7 @@ export default {
"task type": "Task Type", "task type": "Task Type",
time: "Time", time: "Time",
loop: "Loop", loop: "Loop",
"timing cycle": "Timing Execute", "timing cycle": "Timing Exexute",
monday: "Monday", monday: "Monday",
tuesday: "Turesday", tuesday: "Turesday",
wednesday: "Wednesday", wednesday: "Wednesday",
@ -298,7 +293,6 @@ export default {
"open left tool bar": "Open Left Tool Bar", "open left tool bar": "Open Left Tool Bar",
"open right tool bar": "Open Right Tool Bar", "open right tool bar": "Open Right Tool Bar",
fail: " Fail", fail: " Fail",
finish: "Finish",
"edit group": "Edit Group", "edit group": "Edit Group",
"open window": "Open Window", "open window": "Open Window",
"close all windows": "Close All Windows", "close all windows": "Close All Windows",
@ -384,8 +378,7 @@ export default {
"please select window rotation": "Please Select Window Rotation", "please select window rotation": "Please Select Window Rotation",
"hdmi internal": "HDMI Internal", "hdmi internal": "HDMI Internal",
set: "Set", set: "Set",
"hdmi audio frequency acquisition device": "hdmi audio frequency acquisition device":"HDMI Audio Frequency Acquisition Device",
"HDMI Audio Frequency Acquisition Device",
"send command": "Send Command", "send command": "Send Command",
"please check connection config": "Please Check Connection Config", "please check connection config": "Please Check Connection Config",
"connection setting": "Connection Setting", "connection setting": "Connection Setting",
@ -411,16 +404,15 @@ export default {
"Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080": "Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080":
"Please Input Vaild Host. Example: 192.168.1.1 or 192.168.1.1:8080", "Please Input Vaild Host. Example: 192.168.1.1 or 192.168.1.1:8080",
"equipment data": "Equipment Data", "equipment data": "Equipment Data",
fusion: "Fusion", "fusion settings":"fusion settings",
"fusion settings": "Fusion Settings", "FusionLocale":"Fusion Locale",
FusionLocale: "Fusion Locale", "FourPointCalibration":"Four Pint Calibration",
FourPointCalibration: "Four Pint Calibration", "SurfaceCorrection":"Surface Correction",
SurfaceCorrection: "Surface Correction", "DensityCorrection":"Density Correction",
DensityCorrection: "Density Correction", "GridSettings":"Grid Settings",
GridSettings: "Auxiliary Settings", "point":"dot",
point: "dot", "reset":"reset",
reset: "reset", "upper fusion zone parameters":"upper fusion zone parameters",
"upper fusion zone parameters": "Upper Fusion Zone Parameters",
"Left fusion Band Parameters":"Left Fusion Band Parameters", "Left fusion Band Parameters":"Left Fusion Band Parameters",
"Lower fusion Zone Parameters":"Lower Fusion Zone Parameters", "Lower fusion Zone Parameters":"Lower Fusion Zone Parameters",
"Right fusion Band Parameters":"Right Fusion Band Parameters", "Right fusion Band Parameters":"Right Fusion Band Parameters",
@ -428,90 +420,8 @@ export default {
"Please enter a number":"Please enter a number", "Please enter a number":"Please enter a number",
"Please enter 0-100":"Please enter 0-your differentiation rate", "Please enter 0-100":"Please enter 0-your differentiation rate",
"Set Fusion Band Parameters":"Set Fusion Band Parameters", "Set Fusion Band Parameters":"Set Fusion Band Parameters",
Projector: "Projector", "Projector":"Projector",
resetall: "reset all",
"save config": "Save Config",
"Whether to enable integration": "Enable projection mode",
"Whether to hide the desktop": "Whether to hide the desktop",
"resetall config": "resetall config",
"disable blending params": "Dsable blending params",
"show blending grids": "Show Grids",
"line color": "Line Color",
"center line color": "center line color",
"center circle color": "center circle color",
"Whether to operate synchronously": "synchronous operation",
"Select saved configuration": "Configuration list",
"read saved configuration": "Configuration list",
"please choose": "please choose",
save: "Save",
"Whether to save the configuration": "Whether to save the configuration",
"New Please enter a name": "New Please enter a name",
"Please select an override": "Please select an override",
"confirm delete": "confirm delete",
"delete or not": "delete or not",
debugging: "Debugging",
disable_blending: "disable blending",
disable_clip: "disable clip",
show_mask: "hide desktop",
save_bmp: "save bmp",
disable_blending_params: "disable blending params",
"Please enter a value within the range":
"Please enter a value within the range",
"vertical correction": "vertical correction",
"horizontal correction": "horizontal correction",
"line width": "line width",
level: "level",
vertical: "vertical",
"auxiliary lines": "auxiliary lines",
"level point": "level point amount",
"vertical point ": "vertical point amount",
"point amount": "point amount",
"add control points": "add control points",
"reduce control points": "delete control points",
"OK to delete you will lose the data you adjusted now":
"OK to delete you will lose the data you adjusted now",
"Please enter the points you need to add":
"Please enter the points you need to add",
"Whether to add control points": "Whether to add control points",
"Reset all program control points": "Reset all program control points",
"Reset the current program control point":
"Reset the current program control point",
"device verify key": "Device Verify Key",
"use wss": "Use Wss",
"server address": "Server Address",
"cloud server": "Cloud Server",
"verify key length is 6": "Verify Key Length Is 6",
server: "Server",
"set cloud server setting": "Set Cloud Server Setting",
"set magic wall": "Set Magic wall",
"update magic wall": "Update Magic Wall",
"magic wall": "Magic Wall",
angle: "Angle",
"topology diagram": "Topology Diagram",
"physical central location": "Central Location",
"monitors list": "Monitors List",
resize: "Resize",
"export magic": "Export",
"raster graph": "Raster Graph",
"the folder name cannot start with a '.'":
"The Folder Name Cannot Start With a '.'",
"change resolution": "change resolution",
"Loading please wait": "Loading please wait",
product: "Product",
normal: "Normal",
"fusion out": "Out",
"Please enter the square number": "Please enter the square number",
"Change projector layout": "Change projector layout",
"resetall":"reset all", "resetall":"reset all",
"Do you confirm the modification": "Do you confirm the modification", "save config":"save config",
"Whether to modify the resolution to": "Whether to modify the resolution to", "Whether to enable mixing":"Whether to enable mixing"
"Whether to change the projector layout to":
"Whether to change the projector layout to",
"after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)":
"After Upgrade, Please Clear Browser Cache Or Refresh Hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)",
"fusion zone":"fusion zone",
"up":"up",
"left":"left",
"right":"right",
"down":"down"
}; };

View File

@ -5,7 +5,6 @@ export default {
" ": "", " ": "",
title: "MediaPlayerWebApp", title: "MediaPlayerWebApp",
failed: "失败", failed: "失败",
finish: "完成",
fail: "失败", fail: "失败",
error: "错误", error: "错误",
Confirm: "确认", Confirm: "确认",
@ -124,7 +123,6 @@ export default {
"local disk": "本地磁盘", "local disk": "本地磁盘",
usb: "U盘", usb: "U盘",
"Please input vaild ip address": "请输入合法的IP地址", "Please input vaild ip address": "请输入合法的IP地址",
"Please input vaild netmask address": "请输入合法的掩码地址",
"Please input vaild mac address": "请输入合法的MAC地址", "Please input vaild mac address": "请输入合法的MAC地址",
"server ip address": "服务器地址", "server ip address": "服务器地址",
"please input server ip address": "请输入服务器地址", "please input server ip address": "请输入服务器地址",
@ -218,7 +216,6 @@ export default {
disable: "禁用", disable: "禁用",
enable: "启用", enable: "启用",
apply: "应用", apply: "应用",
load: "加载",
"apply and exit": "应用并退出", "apply and exit": "应用并退出",
revert: "恢复", revert: "恢复",
"revert and exit": "不保存退出", "revert and exit": "不保存退出",
@ -489,11 +486,7 @@ export default {
"full screen window": "全屏", "full screen window": "全屏",
"restore window size": "恢复", "restore window size": "恢复",
"the number must be greater than 0": "数字必须大于0", "the number must be greater than 0": "数字必须大于0",
"the number must be less than 2160":"数字必须小于等于2160",
"the number must be less than 3840":"数字必须小于等于3840",
"the number must be greater than 1": "数字必须大于1", "the number must be greater than 1": "数字必须大于1",
"the number must be greater than 360":"数字必须小于等于360",
X: "X坐标", X: "X坐标",
Y: "Y坐标", Y: "Y坐标",
"edit window rect": "窗口大小调整", "edit window rect": "窗口大小调整",
@ -506,7 +499,7 @@ export default {
Warning: "警告", Warning: "警告",
function: "功能", function: "功能",
commit: "提交", commit: "提交",
"set device function": "设置设备功能", "set device function": "设置设备功能成功",
operator_play_signal_source: "信号源", operator_play_signal_source: "信号源",
"toolbar edit window rect": "窗口大小", "toolbar edit window rect": "窗口大小",
exit: "退出", exit: "退出",
@ -680,15 +673,14 @@ export default {
"Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080": "Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080":
"请输入合法地址. 例: 192.168.1.1 或 192.168.1.1:8080", "请输入合法地址. 例: 192.168.1.1 或 192.168.1.1:8080",
"equipment data": "联动设备", "equipment data": "联动设备",
fusion: "融合",
"fusion settings":"融合设置", "fusion settings":"融合设置",
FusionLocale: "融合区域设置", "FusionLocale":"融合区域设置",
FourPointCalibration: "四点校正", "FourPointCalibration":"四点校正",
SurfaceCorrection: "曲面校正", "SurfaceCorrection":"曲面校正",
DensityCorrection: "疏密校正", "DensityCorrection":"疏密校正",
GridSettings: "辅助设置", "GridSettings":"网格设置",
point: "点", "point":"点",
reset: "重置", "reset":"重置",
"upper fusion zone parameters":"上融合带参数", "upper fusion zone parameters":"上融合带参数",
"Left fusion Band Parameters":"左融合带参数", "Left fusion Band Parameters":"左融合带参数",
"Lower fusion Zone Parameters":"下融合带参数", "Lower fusion Zone Parameters":"下融合带参数",
@ -697,88 +689,8 @@ export default {
"Please enter a number":"请输入数字", "Please enter a number":"请输入数字",
"Please enter 0-100":"请输入 0-你的分辨率", "Please enter 0-100":"请输入 0-你的分辨率",
"Set Fusion Band Parameters":"设置融合带参数", "Set Fusion Band Parameters":"设置融合带参数",
Projector: "投影机", "Projector":"投影机",
resetall: "重置所有",
"save config": "保存配置",
"Enable projection mode": "启用投影模式",
"Whether to hide the desktop": "是否隐藏桌面",
"resetall config": "重置所有配置",
"disable blending params": "禁用融合参数",
"show blending grids": "显示网格",
"line color": "线条颜色",
"center line color": "中心线颜色",
"center circle color": "中心圆颜色",
"Whether to operate synchronously": "是否同步操作",
"Select saved configuration": "配置列表",
"read saved configuration": "融合配置列表",
"please choose": "请选择",
save: "保存",
"Whether to save the configuration": "是否保存配置",
"New Please enter a name": "新建 请输入名称",
"Please select an override": "请选择覆盖",
"confirm delete": "确定删除",
"Whether to delete": "是否删除",
debugging: "调试",
disable_blending: "禁用混合",
disable_clip: "禁用裁剪",
show_mask: "隐藏桌面",
save_bmp: "保存BMP",
disable_blending_params: "禁用融合参数",
"Please enter a value within the range": "请输入范围内的值",
"vertical correction": "垂直校正",
"horizontal correction": "水平校正",
"line width": "线宽",
level: "水平",
vertical: "垂直",
"auxiliary lines": "辅助线",
"level point": "水平点数量",
"vertical point": "垂直点数量",
"point amount": "点数量",
"add control points": "增加",
"reduce control points": "删除",
"OK to delete you will lose the data you adjusted now":
"确定删除你将失去现在调整的数据",
"Please enter the points you need to add": "请输入你所需要添加的点数",
"Whether to add control points": "是否添加控制点",
"Reset all program control points": "重置全部方案控制点",
"Reset the current program control point": "重置当前方案控制点",
"device verify key": "设备校验码",
"use wss": "使用Wss",
"server address": "服务器地址",
"cloud server": "云服务器",
"verify key length is 6": "校验码长度必须为6",
server: "服务",
"set cloud server setting": "设置云服务器",
"set magic wall": "设置魔墙",
"update magic wall": "更新魔墙",
"magic wall": "魔墙",
angle: "角度",
"topology diagram": "拓扑图",
"physical central location": "物理中心位置",
"monitors list": "显示器",
resize: "缩放",
"export magic": "导出",
"raster graph": "栅格图",
"the folder name cannot start with a '.'": "文件夹名称不能以“.” 开头",
"change resolution": "更改分辨率",
"Loading please wait": "加载中 请稍等",
"Version Mismatch !": "版本不匹配!",
"Version Mismatch ! Please Upgrade The Software Again ! Otherwise, The File Function Cannot Be Used !":
"版本不匹配!请重新升级软件!否则文件功能无法正常使用!",
product: "产品",
normal: "普通",
"fusion out": "出",
"Please enter the square number": "请输入平方数",
"Change projector layout": "更改投影机布局",
"resetall":"重置所有", "resetall":"重置所有",
"Do you confirm the modification": "是否确认修改", "save config":"保存配置",
"Whether to modify the resolution to": "是否将分辨率修改到", "Whether to enable mixing":"是否启用混合"
"Whether to change the projector layout to": "是否更改投影机布局为",
"after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)":
"升级完成后请清空浏览器缓存或者进行硬刷新(Ctrl/Shift + F5 或者 CTRL + SHIFT + R)",
"fusion zone":"融合带",
"up":"上",
"left":"左",
"right":"右",
"down":"下"
}; };

View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title></title> <title><%= productName %></title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />

View File

@ -68,7 +68,11 @@
(val && val.length > 0) || (val && val.length > 0) ||
$t('Please type something'), $t('Please type something'),
(val) => (val) =>
isHost(val) || $t('Please input vaild ip address'), val == 'localhost' ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
val
) ||
$t('Please input vaild ip address'),
]" ]"
@keydown=" @keydown="
(evt) => { (evt) => {
@ -359,7 +363,6 @@ import Initializer from "src/common/Initializer";
import { api } from "src/boot/axios"; import { api } from "src/boot/axios";
import { HttpProtocol } from "src/entities/HttpProtocol"; import { HttpProtocol } from "src/entities/HttpProtocol";
import { Plugins as CapacitorPlugins } from "@capacitor/core"; import { Plugins as CapacitorPlugins } from "@capacitor/core";
import ValidationUtil from "src/common/ValidationUtil";
class _Data { class _Data {
user_name: string | null = null; user_name: string | null = null;
@ -696,9 +699,6 @@ export default defineComponent({
} }
} }
}, },
isHost(str: string) {
return ValidationUtil.isHost(str);
},
}; };
}, },
}); });

View File

@ -135,7 +135,6 @@
<q-btn <q-btn
stretch stretch
:disable="!$store.state.power_state" :disable="!$store.state.power_state"
v-if="$store.state.isLedPlayer()"
flat flat
stack stack
no-caps no-caps
@ -193,24 +192,6 @@
{{ $t("background image setting") }} {{ $t("background image setting") }}
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item
clickable
v-close-popup
@click="
$refs.fusion_settings_dialog.showDialog();
getconfig();
"
v-if="$store.state.custom_defines.function_fusion"
>
<q-item-section avatar>
<q-icon style="color: #63bab4;" name="open_with" />
</q-item-section>
<q-item-section>
{{ $t("fusion settings") }}
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="switchLanguage"> <q-item clickable v-close-popup @click="switchLanguage">
<q-item-section avatar> <q-item-section avatar>
<q-icon name="img:pad/toolbar/cn_en.png" /> <q-icon name="img:pad/toolbar/cn_en.png" />
@ -253,9 +234,6 @@
<advanced-debug-dialog ref="advanced_debug_dialog" /> <advanced-debug-dialog ref="advanced_debug_dialog" />
<window-rect-edit-dialog ref="window_rect_edit_dialog" /> <window-rect-edit-dialog ref="window_rect_edit_dialog" />
<system-setting-dialog ref="system_setting_dialog" /> <system-setting-dialog ref="system_setting_dialog" />
<fusion-settings-dialog ref="fusion_settings_dialog" />
</template> </template>
<script lang="ts"> <script lang="ts">
@ -263,9 +241,6 @@ import { defineComponent, Ref, ref, computed, watch } from "vue";
import { Cookies, SessionStorage, useQuasar } from "quasar"; import { Cookies, SessionStorage, useQuasar } from "quasar";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useStore } from "src/store"; import { useStore } from "src/store";
import FusionSettingsDialog from "src/components/FusionSettingsDialog.vue";
import BackgroundImageDialog from "src/components/BackgroundImageDialog.vue"; import BackgroundImageDialog from "src/components/BackgroundImageDialog.vue";
import FileManageDialog from "src/components/FileManageDialog.vue"; import FileManageDialog from "src/components/FileManageDialog.vue";
import SubtitleDialog from "src/components/SubtitleDialog.vue"; import SubtitleDialog from "src/components/SubtitleDialog.vue";
@ -289,13 +264,12 @@ export default defineComponent({
AdvancedDebugDialog, AdvancedDebugDialog,
WindowRectEditDialog, WindowRectEditDialog,
SystemSettingDialog, SystemSettingDialog,
FusionSettingsDialog
}, },
setup() { setup() {
const $store = useStore(); const $store = useStore();
const $q = useQuasar(); const $q = useQuasar();
const $t = useI18n(); const $t = useI18n();
let set = GlobalData.getInstance().getCurrentClient();
const window_rect_edit_dialog: Ref<any> = ref(null); const window_rect_edit_dialog: Ref<any> = ref(null);
const plan_running = computed( const plan_running = computed(
@ -313,19 +287,7 @@ export default defineComponent({
} }
} }
); );
const getconfig = () => {
set?.SetBlendingOption("blending_grids_select_ui", '4')
set?.SetBlendingOption('blending_grids_select_projector',"0-0");
set?.SetBlendingOption("blending_grids_select_point", `4:1`)
set?.SetBlendingOption("blending_grids_show", "1");
try {
set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : "");
$store.commit("setEnablefusion", tmp.enable);
$store.commit("setfusion_configuration", res?.config);
});
} catch (error) {}
};
return { return {
plan_running, plan_running,
window_rect_edit_dialog, window_rect_edit_dialog,

View File

@ -1,5 +1,5 @@
<template> <template>
<q-page class="row items-center justify-evenly" :style-fn="wujie_height"> <q-page class="row items-center justify-evenly">
<wall-page /> <wall-page />
<media-control-page /> <media-control-page />
</q-page> </q-page>
@ -70,11 +70,7 @@ export default defineComponent({
new Initializer(options).initialize(); new Initializer(options).initialize();
}); });
return { return {};
wujie_height(offset:any){
return { minHeight: offset ? `calc(100vh - ${offset}px)` : '100vh' }
}
};
}, },
}); });
</script> </script>

View File

@ -37,7 +37,11 @@
(val && val.length > 0) || (val && val.length > 0) ||
$t('Please type something'), $t('Please type something'),
(val) => (val) =>
isHost(val) || $t('Please input vaild ip address'), val == 'localhost' ||
/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
val
) ||
$t('Please input vaild ip address'),
]" ]"
@keydown=" @keydown="
(evt) => { (evt) => {
@ -207,7 +211,6 @@ import { Md5 } from "ts-md5";
import Initializer from "src/common/Initializer"; import Initializer from "src/common/Initializer";
import { api } from "src/boot/axios"; import { api } from "src/boot/axios";
import { HttpProtocol } from "src/entities/HttpProtocol"; import { HttpProtocol } from "src/entities/HttpProtocol";
import ValidationUtil from "src/common/ValidationUtil";
class _Data { class _Data {
user_name: string | null = null; user_name: string | null = null;
@ -473,9 +476,6 @@ export default defineComponent({
data.password = null; data.password = null;
remember_password.value = false; remember_password.value = false;
}, },
isHost(str: string) {
return ValidationUtil.isHost(str);
},
}; };
}, },
}); });

View File

@ -1,10 +1,6 @@
<template> <template>
<div> <div>
<q-toolbar <q-toolbar style="background-color: #3e9acd" class="shadow-2 text-white" @dragstart.prevent>
style="background-color: #3e9acd"
class="shadow-2 text-white"
@dragstart.prevent
>
<q-btn-dropdown <q-btn-dropdown
v-if="false" v-if="false"
v-touch-hold:10000.mouse="handleHold" v-touch-hold:10000.mouse="handleHold"
@ -33,7 +29,7 @@
</q-btn-dropdown> </q-btn-dropdown>
<q-btn-dropdown <q-btn-dropdown
v-if="show_device_list && !$store.state.$wujie" v-if="show_device_list"
stretch stretch
no-caps no-caps
flat flat
@ -76,11 +72,7 @@
</q-list> </q-list>
</q-btn-dropdown> </q-btn-dropdown>
<q-separator <q-separator vertical inset />
vertical
inset
v-if="show_device_list && !$store.state.$wujie"
/>
<q-btn <q-btn
stretch stretch
@ -195,7 +187,6 @@
:disable="plan_running || !$store.state.power_state" :disable="plan_running || !$store.state.power_state"
:icon="/*vertical_align_bottom*/ 'img:new_icon/edit_window_rect.png'" :icon="/*vertical_align_bottom*/ 'img:new_icon/edit_window_rect.png'"
:label="$t('toolbar edit window rect')" :label="$t('toolbar edit window rect')"
v-if="$store.state.isLedPlayer()"
class="q-mr-sm" class="q-mr-sm"
@click="editRect" @click="editRect"
/> />
@ -297,34 +288,11 @@
:label="$t('other setting')" :label="$t('other setting')"
class="q-mr-sm" class="q-mr-sm"
> >
<q-list <q-list style="background-color: #3e9acd" class="shadow-2 text-white" @dragstart.prevent>
style="background-color: #3e9acd"
class="shadow-2 text-white"
@dragstart.prevent
>
<q-item
clickable
v-close-popup
@click="
$refs.fusion_settings_dialog.showDialog();
getconfig();
"
v-if="$store.state.custom_defines.function_fusion"
>
<q-item-section avatar>
<q-icon name="open_with" />
</q-item-section>
<q-item-section>
{{ $t("fusion settings") }}
</q-item-section>
</q-item>
<q-item <q-item
clickable clickable
:disable="!$store.state.power_state" :disable="!$store.state.power_state"
v-if=" v-if="$store.state.isLedPlayer()"
$store.state.isLedPlayer() &&
!$store.state.custom_defines.function_magic_wall
"
v-close-popup v-close-popup
@click=" @click="
($store.state.isSpecialVideo() ($store.state.isSpecialVideo()
@ -341,21 +309,6 @@
{{ $t("grid setting") }} {{ $t("grid setting") }}
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item
clickable
:disable="!$store.state.power_state"
v-close-popup
@click="$refs.control_panel_dialog.showDialog()"
v-if="$store.state.custom_defines.function_magic_wall"
>
<q-item-section avatar>
<!-- <q-icon name="image" /> -->
<q-icon name="web" />
</q-item-section>
<q-item-section>
{{ $t("magic wall") }}
</q-item-section>
</q-item>
<q-item <q-item
clickable clickable
@ -373,7 +326,6 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item
v-if="!iswujie"
clickable clickable
v-close-popup v-close-popup
@click="$refs.background_image_dialog.showDialog()" @click="$refs.background_image_dialog.showDialog()"
@ -387,7 +339,6 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item
v-if="!iswujie"
clickable clickable
v-close-popup v-close-popup
@click="$refs.recovery_database_dialog.showDialog()" @click="$refs.recovery_database_dialog.showDialog()"
@ -423,7 +374,6 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item
v-if="!iswujie"
clickable clickable
v-close-popup v-close-popup
@click="$refs.upgrade_dialog.showDialog()" @click="$refs.upgrade_dialog.showDialog()"
@ -459,7 +409,19 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item
clickable
v-close-popup
@click="$refs.fusion_settings_dialog.showDialog()"
>
<q-item-section avatar>
<!-- <q-icon name="devices" /> -->
<q-icon name="open_with" />
</q-item-section>
<q-item-section>
{{ $t("fusion settings") }}
</q-item-section>
</q-item>
<q-item <q-item
clickable clickable
@ -491,29 +453,16 @@
<q-separator vertical inset /> <q-separator vertical inset />
<q-item v-if="!iswujie"> <q-item>
<q-item-section avatar style="margin-right: 0px; padding-right: 0px"> <q-item-section avatar style="margin-right: 0px; padding-right: 0px">
<!-- <q-icon class="text-white rotate" name="img:svgs/fan.svg" /> --> <!-- <q-icon class="text-white rotate" name="img:svgs/fan.svg" /> -->
<!-- <q-icon class="text-white rotate" name="img:new_icon/fan.png" /> --> <!-- <q-icon class="text-white rotate" name="img:new_icon/fan.png" /> -->
<q-icon <q-icon class="text-white" :style="{'animation':fan}" name="img:new_icon/fan.png" />
class="text-white"
:style="{ animation: fan }"
name="img:new_icon/fan.png"
/>
</q-item-section> </q-item-section>
<q-item-section style="margin-left: -25px"> <q-item-section style="margin-left: -25px">
{{ $store.state.fan_temp.toFixed(1) }} {{ $store.state.fan_temp.toFixed(1) }}
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item v-else>
<q-item-section avatar style="margin-right: 0px; padding-right: 0px">
<q-btn
flat
@click="isfullbtn()"
:icon="isfull ? 'fullscreen_exit' : 'fullscreen'"
/>
</q-item-section>
</q-item>
</q-toolbar> </q-toolbar>
</div> </div>
<grid-setting-dialog <grid-setting-dialog
@ -524,7 +473,6 @@
v-if="$store.state.isSpecialVideo()" v-if="$store.state.isSpecialVideo()"
ref="special_video_grid_setting_dialog" ref="special_video_grid_setting_dialog"
/> />
<control-panel-dialog ref="control_panel_dialog" />
<background-image-dialog ref="background_image_dialog" /> <background-image-dialog ref="background_image_dialog" />
<subtitle-dialog ref="subtitle_dialog" /> <subtitle-dialog ref="subtitle_dialog" />
<recovery-database-dialog ref="recovery_database_dialog" /> <recovery-database-dialog ref="recovery_database_dialog" />
@ -561,14 +509,11 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, ref, Ref, computed, watch, onMounted } from "vue"; import { defineComponent, ref, Ref, computed, watch, onMounted } from "vue";
import { IWuJieInterface, useStore } from "src/store"; import { useStore } from "src/store";
import FusionSettingsDialog from "src/components/FusionSettingsDialog.vue"; import FusionSettingsDialog from "src/components/FusionSettingsDialog.vue";
import GridSettingDialog from "src/components/GridSettingDialog.vue"; import GridSettingDialog from "src/components/GridSettingDialog.vue";
import SpecialVideoGridSettingDialog from "src/components/SpecialVideoGridSettingDialog.vue"; import SpecialVideoGridSettingDialog from "src/components/SpecialVideoGridSettingDialog.vue";
import ControlPanelDialog from "src/components/ControlPanelDialog.vue";
import BackgroundImageDialog from "src/components/BackgroundImageDialog.vue"; import BackgroundImageDialog from "src/components/BackgroundImageDialog.vue";
import RecoveryDatabaseDialog from "src/components/RecoveryDatabaseDialog.vue"; import RecoveryDatabaseDialog from "src/components/RecoveryDatabaseDialog.vue";
import UpgradeDialog from "src/components/UpgradeDialog.vue"; import UpgradeDialog from "src/components/UpgradeDialog.vue";
@ -600,9 +545,6 @@ export default defineComponent({
components: { components: {
GridSettingDialog, GridSettingDialog,
SpecialVideoGridSettingDialog, SpecialVideoGridSettingDialog,
ControlPanelDialog,
BackgroundImageDialog, BackgroundImageDialog,
RecoveryDatabaseDialog, RecoveryDatabaseDialog,
UpgradeDialog, UpgradeDialog,
@ -624,14 +566,12 @@ export default defineComponent({
let $q = useQuasar(); let $q = useQuasar();
let $t = useI18n(); let $t = useI18n();
let set = GlobalData.getInstance().getCurrentClient();
let show_advanced_menu = ref(true); let show_advanced_menu = ref(true);
const edge_blending_dialog: Ref<any> = ref(null); const edge_blending_dialog: Ref<any> = ref(null);
const register_dialog: Ref<any> = ref(null); const register_dialog: Ref<any> = ref(null);
const window_rect_edit_dialog: Ref<any> = ref(null); const window_rect_edit_dialog: Ref<any> = ref(null);
let isfull = ref(false);
const power_flag = ref(false); const power_flag = ref(false);
watch( watch(
() => power_flag.value, () => power_flag.value,
@ -647,25 +587,13 @@ export default defineComponent({
const plan_running = computed( const plan_running = computed(
() => $store.state.current_running_plan.trim() != "" () => $store.state.current_running_plan.trim() != ""
); );
const fan = computed(() => { const fan = computed(
let wendu: any = $store.state.fan_temp.toFixed(1); () => {
let sulv: any = 1 - wendu / 150; let wendu:any=($store.state.fan_temp).toFixed(1)
return "rotate " + sulv + "s linear infinite"; let sulv:any=(1-(wendu/150))
}); return 'rotate '+sulv+'s linear infinite'
const getconfig = () => { }
set?.SetBlendingOption("blending_grids_select_ui", '4') );
set?.SetBlendingOption('blending_grids_select_projector',"0-0");
set?.SetBlendingOption("blending_grids_select_point", `4:1`)
set?.SetBlendingOption("blending_grids_show", "1");
try {
set?.GetBlendingConfig("").then((res) => {});
set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : "");
$store.commit("setEnablefusion", tmp.enable);
$store.commit("setfusion_configuration", res?.config);
});
} catch (error) {}
};
const checkRegistered = () => { const checkRegistered = () => {
if ( if (
GlobalData.getInstance().getCurrentClient()?.is_connected && GlobalData.getInstance().getCurrentClient()?.is_connected &&
@ -730,12 +658,8 @@ export default defineComponent({
show_device_list.value = show_device_list.value =
typeof (<any>window).user_search?.hide_device_list == "undefined"; typeof (<any>window).user_search?.hide_device_list == "undefined";
}); });
let iswujie = ref(false);
if ((window as any).$wujie) {
iswujie.value = true;
}
return { return {
getconfig,
show_advanced_menu, show_advanced_menu,
plan_running, plan_running,
edge_blending_dialog, edge_blending_dialog,
@ -744,8 +668,6 @@ export default defineComponent({
show_device_list, show_device_list,
power_flag, power_flag,
fan, fan,
isfull,
iswujie,
async backupDB() { async backupDB() {
let client = GlobalData.getInstance().getCurrentClient(); let client = GlobalData.getInstance().getCurrentClient();
if (client) { if (client) {
@ -758,11 +680,8 @@ export default defineComponent({
console.log(url.toString()); console.log(url.toString());
let response = await api.get(url.toString()); let response = await api.get(url.toString());
if (response.status == 200 && response && response.data) { if (response.status == 200 && response && response.data) {
console.log(response.data); url.pathname =
HttpProtocol.RequestPathDBBackup + "/" + response.data;
url.pathname = HttpProtocol.RequestPathDBBackup;
url.searchParams.append("name", response.data);
console.log(url);
openURL(url.toString()); openURL(url.toString());
} else { } else {
$q.notify({ $q.notify({
@ -838,12 +757,9 @@ export default defineComponent({
}, },
logout() { logout() {
const w = window as any; const w = window as any;
console.log(w);
if (w.controlLogout && typeof w.controlLogout == "function") { if (w.controlLogout && typeof w.controlLogout == "function") {
console.log(1);
w.controlLogout(); w.controlLogout();
} else { } else {
console.log(2);
Cookies.remove("auto_login"); Cookies.remove("auto_login");
SessionStorage.clear(); SessionStorage.clear();
try { try {
@ -1014,13 +930,6 @@ export default defineComponent({
?.windowFullScreen(window.window_id, false); ?.windowFullScreen(window.window_id, false);
} }
}, },
isfullbtn() {
isfull.value = !isfull.value;
if ((window as any).$wujie) {
const $wujie = (window as any).$wujie as IWuJieInterface;
$wujie?.bus.$emit("isfull", isfull.value);
}
},
}; };
}, },
}); });

View File

@ -28,9 +28,7 @@
item.y * ($refs.wall?.offsetHeight ?? 0) item.y * ($refs.wall?.offsetHeight ?? 0)
" "
:zIndex=" :zIndex="
$store.state.windows_sort.findIndex( $store.state.windows_sort.findIndex((element) => element == item.uuid)
(element) => element == item.uuid
) + 1
" "
:isActive="item.uuid == $store.state.selected_window" :isActive="item.uuid == $store.state.selected_window"
:resizeIconSize="14" :resizeIconSize="14"
@ -69,76 +67,11 @@
</window> </window>
</vue3-resize-drag> </vue3-resize-drag>
</div> </div>
<div
id="magic_wall_grids"
ref="magic_wall_grids"
@click="onWallGridsClick"
v-if="
$store.state.power_state &&
$store.state.custom_defines.function_magic_wall
"
>
<div class="row magic_wall_grids" style="height: 31.05vw; width: 55.2vw">
<vue3-resize-drag
v-for="(item, index) of $store.state.show_monitor_list"
:w="item.w * $refs.wall?.clientWidth"
:h="item.h * $refs.wall?.clientHeight"
:x="item.currentx * $refs.wall?.clientWidth"
:y="item.currenty * $refs.wall?.clientHeight"
:rotate="parseInt(item.angle.toString())"
:is-resizable="false"
:isGuide="false"
class="magic_wall"
@dragenter="magic_select(index, item, $event)"
style="text-align: center"
>
{{ item.id + 1 }}
<q-popup-proxy
context-menu
@show="
{
last_context_menu_pos_x = $event.layerX;
last_context_menu_pos_y = $event.layerY;
}
"
>
<q-list>
<q-item
:disable="plan_running || !$store.state.power_state"
clickable
v-close-popup
@click="openWindowByLocalFile(index, $event)"
>
<q-item-section avatar>
<q-icon name="open_in_browser" />
</q-item-section>
<q-item-section> {{ $t("open window") }} </q-item-section>
</q-item>
<q-item
:disable="plan_running || !$store.state.power_state"
clickable
v-close-popup
@click="closeAllWindows"
>
<q-item-section avatar>
<q-icon name="close" color="red" />
</q-item-section>
<q-item-section> {{ $t("close all windows") }} </q-item-section>
</q-item>
</q-list>
</q-popup-proxy>
</vue3-resize-drag>
</div>
</div>
<div <div
id="wall_grids" id="wall_grids"
ref="wall_grids" ref="wall_grids"
@click="onWallGridsClick" @click="onWallGridsClick"
v-if=" v-if="$store.state.power_state"
$store.state.power_state &&
!$store.state.custom_defines.function_magic_wall
"
> >
<div <div
v-for="row of wall_rows" v-for="row of wall_rows"
@ -174,7 +107,7 @@
:disable="plan_running || !$store.state.power_state" :disable="plan_running || !$store.state.power_state"
clickable clickable
v-close-popup v-close-popup
@click="openWindowByLocalFile(-1, $event)" @click="openWindowByLocalFile($event)"
> >
<q-item-section avatar> <q-item-section avatar>
<q-icon name="open_in_browser" /> <q-icon name="open_in_browser" />
@ -243,16 +176,6 @@
background: #aacceec2; background: #aacceec2;
border: 1px solid #0069bee7; border: 1px solid #0069bee7;
} }
.magic_wall {
border: 1px solid black;
background-color: rgb(50, 130, 246);
position: absolute;
}
.magic_wall_select {
border: 1px dashed black;
}
.magic_wall_grids {
}
</style> </style>
<script lang="ts"> <script lang="ts">
@ -268,7 +191,7 @@ import { NullSignalSource, useStore } from "src/store";
import EventBus, { EventNamesDefine } from "src/common/EventBus"; import EventBus, { EventNamesDefine } from "src/common/EventBus";
import { WindowOpenNotifyEntity } from "src/entities/MultimediaWindowEntity"; import { WindowOpenNotifyEntity } from "src/entities/MultimediaWindowEntity";
import WindowOtherStateChangeNotifyEntity from "src/entities/WindowOtherStateChangeNotifyEntity"; import WindowOtherStateChangeNotifyEntity from "src/entities/WindowOtherStateChangeNotifyEntity";
import { extend, useQuasar } from "quasar"; import { useQuasar } from "quasar";
import { NotifyMessage } from "src/common/ClientConnection"; import { NotifyMessage } from "src/common/ClientConnection";
import EditVolumeDialog from "src/components/EditVolumeDialog.vue"; import EditVolumeDialog from "src/components/EditVolumeDialog.vue";
@ -281,6 +204,7 @@ import FileEntity from "src/entities/FileEntity";
import { SignalSourceEntity } from "src/entities/SignalSourceEntity"; import { SignalSourceEntity } from "src/entities/SignalSourceEntity";
import FileSuffixHelper from "src/common/FileSuffixHelper"; import FileSuffixHelper from "src/common/FileSuffixHelper";
import { SpecialVideoHelper } from "src/common/SpecialVideoHelper"; import { SpecialVideoHelper } from "src/common/SpecialVideoHelper";
class Rect { class Rect {
start_x = 0; start_x = 0;
start_y = 0; start_y = 0;
@ -294,29 +218,10 @@ class Rect {
this.end_y = 0; this.end_y = 0;
} }
} }
class test_monitor {
w = 0.0;
h = 0.0;
currentx = 0.0;
currenty = 0.0;
centerx = 0.0;
centery = 0.0;
angle = 0;
id = 0;
constructor(id: number, w: number, h: number) {
this.currentx = 0.0;
this.currenty = 0.0;
this.angle = 0;
this.centerx = 0;
this.centery = 0;
this.id = id;
this.w = w;
this.h = h;
}
}
export default defineComponent({ export default defineComponent({
name: "PageWall", name: "PageWall",
components: { components: {
vue3ResizeDrag, vue3ResizeDrag,
Window, Window,
@ -336,7 +241,7 @@ export default defineComponent({
const window_rect_edit_dialog: Ref<any> = ref(null); const window_rect_edit_dialog: Ref<any> = ref(null);
const show_windows_flag = ref(true); // window const show_windows_flag = ref(true); // window
const refresh_windows_pos = async () => { const refresh_windows_pos = () => {
// , // ,
show_windows_flag.value = false; show_windows_flag.value = false;
setTimeout(() => { setTimeout(() => {
@ -353,6 +258,7 @@ export default defineComponent({
const last_context_menu_pos_x = ref(0); const last_context_menu_pos_x = ref(0);
const last_context_menu_pos_y = ref(0); const last_context_menu_pos_y = ref(0);
const plan_running = computed( const plan_running = computed(
() => $store.state.current_running_plan.trim() != "" () => $store.state.current_running_plan.trim() != ""
); );
@ -376,179 +282,10 @@ export default defineComponent({
const area_open_window_flag = ref(false); const area_open_window_flag = ref(false);
const area_open_window_rect = ref(new Rect()); const area_open_window_rect = ref(new Rect());
let item_witdh = ref(0); let item_witdh = ref(0);
const item_height = ref(0); const item_height = ref(0);
const radians = (index:number) => {
const test_monitor_list: any = clacMonitor();
if (test_monitor_list) {
const item = test_monitor_list[index];
return /*a*/ (item.angle * Math.PI) / 180;
}
};
const calculateCoordinates = (
index:number,
px: number,
py: number,
cx: number,
cy: number
) => {
const x =
cx +
(px - cx) * Math.cos(Number(radians(index))) -
(py - cy) * Math.sin(Number(radians(index)));
const y =
cy +
(px - cx) * Math.sin(Number(radians(index))) +
(py - cy) * Math.cos(Number(radians(index)));
return { x, y };
};
let current_index = ref(0);
const clacMonitor = () => {
let test_monitor_list: any = [];
$store.state.show_monitor_list.forEach((element) => {
let item: test_monitor = new test_monitor(0, 0, 0);
const wall_dom = wall.value;
if (wall_dom) {
item.h = element.h * wall_dom.clientHeight;
item.w = element.w * wall_dom.clientWidth;
item.currentx = element.currentx * wall_dom.clientWidth;
item.currenty = element.currenty * wall_dom.clientHeight;
item.centerx = item.currentx + item.w * 0.5;
item.centery = item.currenty + item.h * 0.5;
item.angle = element.angle;
item.id = element.id;
test_monitor_list.push(item);
}
});
return test_monitor_list;
};
const four_point = (index:number) => {
const test_monitor_list: any = clacMonitor();
if (test_monitor_list) {
const item = test_monitor_list[index];
item.centerx = parseInt(item.centerx.toString());
item.centery = parseInt(item.centery.toString());
const x2: number = item.currentx + item.w;
const y2: number = item.currenty + item.h;
if (item.angle != 0) {
const point_left_top = calculateCoordinates(
index,
item.currentx,
item.currenty,
item.centerx,
item.centery
);
const point_left_bootom = calculateCoordinates(
index,
item.currentx,
y2,
item.centerx,
item.centery
);
const point_right_top = calculateCoordinates(
index,
x2,
item.currenty,
item.centerx,
item.centery
);
const point_right_bottom = calculateCoordinates(
index,
x2,
y2,
item.centerx,
item.centery
);
const point_list = [
point_left_top,
point_left_bootom,
point_right_top,
point_right_bottom,
];
return point_list;
}
}
};
const select_x = (index:number) => {
const point_list = four_point(index);
const item = $store.state.show_monitor_list[index];
if (item.angle != 0) {
if (point_list) {
let minx = 100000;
point_list.forEach((element) => {
if (minx > element.x) {
minx = element.x;
}
});
return minx;
}
} else {
if (wall.value) return item.currentx * wall.value?.clientWidth;
}
};
const select_y = (index:number) => {
const point_list = four_point(index);
let miny = 100000;
if (point_list) {
point_list.forEach((element) => {
if (miny > element.y) {
miny = element.y;
}
});
}
const item = $store.state.show_monitor_list[index];
if (item.angle != 0) {
return miny;
} else {
if (wall.value) return item.currenty * wall.value?.clientHeight;
}
};
const select_height = (index:number) => {
const point_list = four_point(index);
let maxy = 0;
let miny = 100000;
if (point_list) {
point_list.forEach((element) => {
if (miny > element.y) {
miny = element.y;
}
if (maxy < element.y) {
maxy = element.y;
}
});
}
const item = $store.state.show_monitor_list[index];
if (item.angle != 0) {
return maxy - miny;
} else {
if (wall.value) return item.h * wall.value?.clientHeight;
}
};
const select_width = (index:number) => {
const point_list = four_point(index);
let maxx = 0;
let minx = 100000;
if (point_list) {
point_list.forEach((element) => {
if (minx > element.x) {
minx = element.x;
}
if (maxx < element.x) {
maxx = element.x;
}
});
}
const item = $store.state.show_monitor_list[index];
if (item.angle != 0) {
return maxx - minx;
} else {
if (wall.value) return item.w * wall.value?.clientWidth;
}
};
const calcWallItemWH = () => { const calcWallItemWH = () => {
item_witdh.value = Math.floor( item_witdh.value = Math.floor(
(wall?.value?.parentElement?.offsetWidth ?? 0) / wall_cols.value (wall?.value?.parentElement?.offsetWidth ?? 0) / wall_cols.value
@ -678,7 +415,6 @@ export default defineComponent({
); );
} }
} }
//
} }
} }
area_open_window_flag.value = false; area_open_window_flag.value = false;
@ -714,48 +450,6 @@ export default defineComponent({
} }
}; };
const show_magic_wall = async () => {
// $store.state.windows_sort.findIndex((element) => element == item.uuid)
let client = GlobalData.getInstance().getCurrentClient();
if (client) {
const response = await client.getMagicWallConfig();
const settings = await GlobalData.getInstance()
.getCurrentClient()
?.getOutputBoardSetting();
if (response && settings) {
const a = response?.config.windows;
const wall_dom = wall.value;
let monitorList: any = [];
if (a && wall_dom) {
a.forEach((element) => {
let item: test_monitor = new test_monitor(0, 0, 0);
item.h = element.h;
item.w = element.w;
item.currentx = element.lt.x;
item.currenty = element.lt.y;
item.angle = element.angle;
item.id = element.index;
if ($store.state.show_monitor_list.length == 0) {
monitorList.push(item);
$store.commit("setShowMonitorList", monitorList);
} else {
let flag = false;
$store.state.show_monitor_list.forEach((ele: any) => {
if (element.index == ele.id) {
flag = true;
}
});
if (!flag) {
monitorList.push(item);
$store.commit("setShowMonitorList", monitorList);
}
}
});
}
}
}
};
EventBus.getInstance().on(EventNamesDefine.WindowMouseDown, wallMouseDown); EventBus.getInstance().on(EventNamesDefine.WindowMouseDown, wallMouseDown);
EventBus.getInstance().on(EventNamesDefine.WindowMouseMove, wallMouseMove); EventBus.getInstance().on(EventNamesDefine.WindowMouseMove, wallMouseMove);
EventBus.getInstance().on(EventNamesDefine.WindowMouseUp, wallMouseUp); EventBus.getInstance().on(EventNamesDefine.WindowMouseUp, wallMouseUp);
@ -991,10 +685,6 @@ export default defineComponent({
elementResizeDetectorMaker().listenTo( elementResizeDetectorMaker().listenTo(
wall.value, wall.value,
(element: HTMLElement) => { (element: HTMLElement) => {
if ($store.state.custom_defines.function_magic_wall) {
show_magic_wall();
refresh_windows_pos();
}
if (element) { if (element) {
calcWallItemWH(); calcWallItemWH();
} }
@ -1239,18 +929,6 @@ export default defineComponent({
.getCurrentClient() .getCurrentClient()
?.replaceWindow2(find_window, uuid, true); ?.replaceWindow2(find_window, uuid, true);
} else { } else {
if ($store.state.custom_defines.function_magic_wall) {
const item =
$store.state.show_monitor_list[current_index.value];
if (wall.value) {
x = Number(select_x(current_index.value)) / wall.value.clientWidth;
y = Number(select_y(current_index.value)) / wall.value.clientHeight;
width =
Number(select_width(current_index.value)) / wall.value.clientWidth;
height =
Number(select_height(current_index.value)) / wall.value.clientHeight;
}
}
const open_polling_request = const open_polling_request =
new Protocol.OpenPollingRequestEntity( new Protocol.OpenPollingRequestEntity(
uuid, uuid,
@ -1279,21 +957,6 @@ export default defineComponent({
.getCurrentClient() .getCurrentClient()
?.replaceWindow2(find_window, uuid); ?.replaceWindow2(find_window, uuid);
} else { } else {
if (
$store.state.custom_defines.function_magic_wall
) {
if (wall.value) {
x = Number(select_x(current_index.value)) / wall.value.clientWidth;
y =
Number(select_y(current_index.value)) / wall.value.clientHeight;
width =
Number(select_width(current_index.value)) /
wall.value.clientWidth;
height =
Number(select_height(current_index.value)) /
wall.value.clientHeight;
}
}
const open_window_request = const open_window_request =
new Protocol.OpenWindowRequestEntity( new Protocol.OpenWindowRequestEntity(
uuid, uuid,
@ -1336,14 +999,6 @@ export default defineComponent({
target?.classList.add("drag-enter"); target?.classList.add("drag-enter");
} }
}, },
magic_select(index: number, item: test_monitor, e: DragEvent) {
current_index.value = index;
e.stopPropagation();
let target: HTMLElement | null = e.target as HTMLElement;
if (target) {
target?.classList.add("drag-enter");
}
},
onDragLeave(e: DragEvent) { onDragLeave(e: DragEvent) {
let target: HTMLElement = e.target as HTMLElement; let target: HTMLElement = e.target as HTMLElement;
@ -1489,7 +1144,7 @@ export default defineComponent({
} }
} }
}, },
async openWindowByLocalFile(index: number, event: MouseEvent) { async openWindowByLocalFile(event: MouseEvent) {
if (!wall.value) { if (!wall.value) {
return; return;
} }
@ -1529,8 +1184,8 @@ export default defineComponent({
.getCurrentClient() .getCurrentClient()
?.addSignalSource(signal_source); ?.addSignalSource(signal_source);
if (wall.value && response && response.success) { if (wall.value && response && response.success) {
let cell_width = 1.0 / $store.state.wall_col; const cell_width = 1.0 / $store.state.wall_col;
let cell_height = 1.0 / $store.state.wall_row; const cell_height = 1.0 / $store.state.wall_row;
const col = Math.floor( const col = Math.floor(
last_context_menu_pos_x.value / last_context_menu_pos_x.value /
@ -1543,17 +1198,9 @@ export default defineComponent({
cell_height cell_height
); );
let x = col * cell_width; const x = col * cell_width;
let y = row * cell_height; const y = row * cell_height;
if ($store.state.custom_defines.function_magic_wall&&index!=-1) {
if (wall.value) {
x = Number(select_x(index)) / wall.value.clientWidth;
y = Number(select_y(index)) / wall.value.clientHeight;
cell_width = Number(select_width(index)) / wall.value.clientWidth;
cell_height =
Number(select_height(index)) / wall.value.clientHeight;
}
}
if (!isNaN(x) && !isNaN(y)) { if (!isNaN(x) && !isNaN(y)) {
const open_window_request = const open_window_request =
new Protocol.OpenWindowRequestEntity( new Protocol.OpenWindowRequestEntity(

View File

@ -138,7 +138,6 @@
:disable="plan_running || !$store.state.power_state" :disable="plan_running || !$store.state.power_state"
:icon="/*vertical_align_bottom*/ 'img:new_icon/edit_window_rect.png'" :icon="/*vertical_align_bottom*/ 'img:new_icon/edit_window_rect.png'"
:label="$t('toolbar edit window rect')" :label="$t('toolbar edit window rect')"
v-if="$store.state.isLedPlayer()"
class="q-mr-sm" class="q-mr-sm"
@click="editRect" @click="editRect"
/> />

View File

@ -38,14 +38,6 @@ export default route<StateInterface>(function (/* { store, ssrContext } */) {
}); });
Router.beforeEach((to, from, next) => { Router.beforeEach((to, from, next) => {
if ((<any>window).$wujie) {
if (to.path.endsWith("login")) {
next("/");
} else {
next();
}
return;
}
if ( if (
to.meta && to.meta &&
(to.meta.permission_level != null || (to.meta.permission_level != null ||
@ -55,10 +47,10 @@ export default route<StateInterface>(function (/* { store, ssrContext } */) {
if (auth_obj) { if (auth_obj) {
const auth = parseInt(auth_obj); const auth = parseInt(auth_obj);
const target_auth = parseInt(<string>to.meta.permission_level); const target_auth = parseInt(<string>to.meta.permission_level);
if (isNaN(target_auth)) { if (target_auth == NaN) {
next(); next();
return; return;
} else { } else if (auth != NaN) {
if (auth > target_auth) { if (auth > target_auth) {
next(); next();
return; return;

View File

@ -2,37 +2,26 @@ import { RouteRecordRaw } from "vue-router";
import PermissionLevel from "src/entities/PermissionLevel"; import PermissionLevel from "src/entities/PermissionLevel";
import RedirectPage from "src/RedirectPage.vue";
import Login from "pages/Login.vue";
import MainLayout from "layouts/MainLayout.vue";
import Index from "pages/Index.vue";
import PadLogin from "src/pad/Login.vue";
import PadMainLayout from "src/pad/MainLayout.vue";
import PadIndex from "src/pad/Index.vue";
import Error404 from "pages/Error404.vue";
const routes: RouteRecordRaw[] = [ const routes: RouteRecordRaw[] = [
{ {
path: "/", path: "/",
meta: {}, meta: {},
component: RedirectPage, component: () => import("src/RedirectPage.vue"),
}, },
{ {
path: "/pc/login", path: "/pc/login",
component: Login, component: () => import("pages/Login.vue"),
}, },
{ {
path: "/pc", path: "/pc",
meta: { meta: {
permission_level: PermissionLevel.User, permission_level: PermissionLevel.User,
}, },
component: MainLayout, component: () => import("layouts/MainLayout.vue"),
children: [ children: [
{ {
path: "", path: "",
component: Index, component: () => import("pages/Index.vue"),
meta: { meta: {
permission_level: PermissionLevel.User, permission_level: PermissionLevel.User,
}, },
@ -41,18 +30,18 @@ const routes: RouteRecordRaw[] = [
}, },
{ {
path: "/pad/login", path: "/pad/login",
component: PadLogin, component: () => import("src/pad/Login.vue"),
}, },
{ {
path: "/pad", path: "/pad",
meta: { meta: {
permission_level: PermissionLevel.User, permission_level: PermissionLevel.User,
}, },
component: PadMainLayout, component: () => import("src/pad/MainLayout.vue"),
children: [ children: [
{ {
path: "", path: "",
component: PadIndex, component: () => import("src/pad/Index.vue"),
meta: { meta: {
permission_level: PermissionLevel.User, permission_level: PermissionLevel.User,
}, },
@ -64,7 +53,7 @@ const routes: RouteRecordRaw[] = [
// but you can also remove it // but you can also remove it
{ {
path: "/:catchAll(.*)*", path: "/:catchAll(.*)*",
component: Error404, component: () => import("pages/Error404.vue"),
}, },
]; ];

View File

@ -1,4 +1,3 @@
import { EDeviceAttributeHelper } from "./../entities/EDeviceAttribute";
import { ConnectTableEntity } from "src/entities/ConnectTableEntity"; import { ConnectTableEntity } from "src/entities/ConnectTableEntity";
import { import {
PollingEntity, PollingEntity,
@ -38,44 +37,8 @@ export class CustomDefines {
function_output_board = false; function_output_board = false;
function_center_control = false; function_center_control = false;
function_mirroring_output = false; function_mirroring_output = false;
function_magic_wall = false;
function_fusion = false;
} }
export interface IWuJieEventBus {
$on(event: string, fn: Function): IWuJieEventBus;
/** 任何$emit都会导致监听函数触发第一个参数为事件名后续的参数为$emit的参数 */
$onAll(fn: (event: string, ...args: Array<any>) => any): IWuJieEventBus;
$once(event: string, fn: Function): void;
$off(event: string, fn: Function): IWuJieEventBus;
$offAll(fn: Function): IWuJieEventBus;
$emit(event: string, ...args: Array<any>): IWuJieEventBus;
$clear(): IWuJieEventBus;
}
export interface IWuJieInterface {
props: any;
bus: IWuJieEventBus;
}
class test_monitor {
w = 0.0;
h = 0.0;
currentx = 0.0;
currenty = 0.0;
centerx = 0.0;
centery = 0.0;
angle = 0;
id = 0;
constructor(id: number, w: number, h: number) {
this.currentx = 0.0;
this.currenty = 0.0;
this.angle = 0;
this.centerx = 0;
this.centery = 0;
this.id = id;
this.w = w;
this.h = h;
}
}
export interface StateInterface { export interface StateInterface {
// Define your own store structure, using submodules if needed // Define your own store structure, using submodules if needed
// example: ExampleStateInterface; // example: ExampleStateInterface;
@ -113,16 +76,12 @@ export interface StateInterface {
device_attribute: number; device_attribute: number;
power_state: boolean; power_state: boolean;
product_name: string; product_name: string;
show_monitor_list: test_monitor[];
custom_defines: CustomDefines; custom_defines: CustomDefines;
fusion_configuration:string; fusion_configuration:string;
isLedPlayer: () => boolean; isLedPlayer: () => boolean;
isSpecialVideo: () => boolean; isSpecialVideo: () => boolean;
$wujie: IWuJieInterface | null;
//
selected_projector: string; selected_projector: string;
enablefusion: boolean; enablefusion:boolean
} }
// provide typings for `this.$store` // provide typings for `this.$store`
@ -382,7 +341,7 @@ export default store(function (/* { ssrContext } */) {
power_state: false, power_state: false,
fusion_configuration:"", fusion_configuration:"",
product_name: EProductNames.LED_PLAYER, product_name: EProductNames.LED_PLAYER,
show_monitor_list: [],
custom_defines: new CustomDefines(), custom_defines: new CustomDefines(),
selected_projector: "0/0", selected_projector: "0/0",
enablefusion:false, enablefusion:false,
@ -395,17 +354,12 @@ export default store(function (/* { ssrContext } */) {
isSpecialVideo: () => { isSpecialVideo: () => {
return Store.state.product_name == EProductNames.SPECIAL_VIDEO; return Store.state.product_name == EProductNames.SPECIAL_VIDEO;
}, },
$wujie: null,
}, },
mutations: { mutations: {
setInitialized(state: StateInterface, playload?: any) { setInitialized(state: StateInterface, playload?: any) {
state.initialized = true; state.initialized = true;
}, },
setShowMonitorList(state: StateInterface, playload?: any) {
state.show_monitor_list = playload;
},
updateLandspace(state: StateInterface, playload?: any) { updateLandspace(state: StateInterface, playload?: any) {
if (typeof playload == "boolean") { if (typeof playload == "boolean") {
state.landspace = playload; state.landspace = playload;
@ -438,10 +392,6 @@ export default store(function (/* { ssrContext } */) {
(state.device_attribute & EDeviceAttribute.CenterControl) != 0; (state.device_attribute & EDeviceAttribute.CenterControl) != 0;
state.custom_defines.function_mirroring_output = state.custom_defines.function_mirroring_output =
(state.device_attribute & EDeviceAttribute.MirroringOutput) != 0; (state.device_attribute & EDeviceAttribute.MirroringOutput) != 0;
state.custom_defines.function_magic_wall =
(state.device_attribute & EDeviceAttribute.ProductMagicWall) != 0;
state.custom_defines.function_fusion =
EDeviceAttributeHelper.isProductFusion(state.device_attribute);
} }
}, },
setAvancedDebug(state: StateInterface, playload?: any) { setAvancedDebug(state: StateInterface, playload?: any) {
@ -611,31 +561,31 @@ export default store(function (/* { ssrContext } */) {
}, },
setWallCol(state: StateInterface, playload?: any) { setWallCol(state: StateInterface, playload?: any) {
const num = parseInt(playload); const num = parseInt(playload);
if (!isNaN(num) && num > 0) { if (num != NaN && num > 0) {
state.wall_col = num; state.wall_col = num;
} }
}, },
setWallRow(state: StateInterface, playload?: any) { setWallRow(state: StateInterface, playload?: any) {
const num = parseInt(playload); const num = parseInt(playload);
if (!isNaN(num) && num > 0) { if (num != NaN && num > 0) {
state.wall_row = num; state.wall_row = num;
} }
}, },
setDeviceScreenWidth(state: StateInterface, playload?: any) { setDeviceScreenWidth(state: StateInterface, playload?: any) {
const num = parseInt(playload); const num = parseInt(playload);
if (!isNaN(num) && num > 0) { if (num != NaN && num > 0) {
state.device_screen_width = num; state.device_screen_width = num;
} }
}, },
setDeviceScreenHeight(state: StateInterface, playload?: any) { setDeviceScreenHeight(state: StateInterface, playload?: any) {
const num = parseInt(playload); const num = parseInt(playload);
if (!isNaN(num) && num > 0) { if (num != NaN && num > 0) {
state.device_screen_height = num; state.device_screen_height = num;
} }
}, },
setDeviceScreenRefreshRate(state: StateInterface, playload?: any) { setDeviceScreenRefreshRate(state: StateInterface, playload?: any) {
const num = parseInt(playload); const num = parseInt(playload);
if (!isNaN(num) && num > 0) { if (num != NaN && num > 0) {
state.device_screen_refresh_rate = num; state.device_screen_refresh_rate = num;
} }
}, },
@ -1048,18 +998,15 @@ export default store(function (/* { ssrContext } */) {
state.connect_list.slice(index, 1); state.connect_list.slice(index, 1);
} }
}, },
setWuJie(state: StateInterface, playload?: any) {
state.$wujie = playload;
},
setfusion_configuration(state: StateInterface, playload?: any){ setfusion_configuration(state: StateInterface, playload?: any){
state.fusion_configuration = playload; state.fusion_configuration=playload
}, }
}, },
getters:{ getters:{
GetTheCurrentlySelectedCamera(state){ GetTheCurrentlySelectedCamera(state){
let arr = state.selected_projector.split("/"); let arr = state.selected_projector.split('/');
return [Number(arr[0]),Number(arr[1])]; return [Number(arr[0]),Number(arr[1])];
}, }
}, },
// enable strict mode (adds overhead!) // enable strict mode (adds overhead!)
// for dev mode and --debug builds only // for dev mode and --debug builds only

View File

@ -1,5 +1,5 @@
{ {
"extends": "@quasar/app-webpack/tsconfig-preset", "extends": "@quasar/app/tsconfig-preset",
"compilerOptions": { "compilerOptions": {
"baseUrl": "." "baseUrl": "."
} }