diff --git a/quasar.conf.js b/quasar.conf.js index 6c637f7..1a04b15 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -73,11 +73,6 @@ module.exports = configure(function (ctx) { https: false, port: 8080, open: true, // opens browser window automatically - proxy: { - "/get_websocket_port": "http://192.168.2.102", - "/media_control_client_product.js": "http://192.168.2.102", - "/media_control_client_language.js": "http://192.168.2.102", - }, }, // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework diff --git a/src/App.vue b/src/App.vue index 70f955c..7ff6ab6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -119,7 +119,7 @@ export default defineComponent({ console.log(e); } - EventBus.getInstance().on(EventNamesDefine.CheckDebug2, () => { + EventBus.getInstance().on(EventNamesDefine.CheckDebug, () => { const to_normal_url = () => { const p1 = window.location.href.indexOf("?debug"); const p2 = window.location.href.indexOf("#"); diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index c675c29..6e4fa17 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -1457,8 +1457,7 @@ export default class ClientConnection { column: number, location: number, enable: boolean, - width: number, - auto_sync: boolean, + width: number ) { return await this.doRpc( new Protocol.SetBlendingOverlapRequestEntity( @@ -1466,8 +1465,7 @@ export default class ClientConnection { column, location, enable, - width, - auto_sync + width ) ); } diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue index 6ace18f..c4861e5 100644 --- a/src/components/ControlPanelDialog.vue +++ b/src/components/ControlPanelDialog.vue @@ -77,7 +77,7 @@
-
+
{{ $t("magic wall") }}
@@ -107,12 +107,12 @@ -
{{ $t("angle") }}
+
{{ $t("angle") }}

-
- - +
+ + angle: @@ -162,17 +162,17 @@

-
+
{{ $t("physical central location") }}

-
- - +
+ + X: - +
-
- - +
+ + Y: - + { - ele.cmw = Math.round(ele.w / lcm.value); - ele.cmh = Math.round(ele.h / lcm.value); + ele.cmw = 1214; + ele.cmh = 684; + ele.w = wall_dom.offsetWidth * 0.5; + ele.h = wall_dom.offsetHeight * 0.5; }); } }; @@ -995,7 +998,13 @@ export default defineComponent({ } }; const close_magic_switch = () => { + let client = GlobalData.getInstance().getCurrentClient(); magic_switch.value = false; + if(client){ + client.setMagicWallList( + JSON.parse(JSON.stringify(test_monitor_list.value)) + ); + } upload_magic_switch(); }; const radians = (item: test_monitor) => { @@ -1100,7 +1109,7 @@ export default defineComponent({ const wall_dom = wall.value; if (wall_dom) { const point_list = four_point(item); - if (item.angle != 0 && point_list) { + if (item && item.angle != 0 && point_list) { let minx = 0; point_list.forEach((element) => { if (minx > element.x) { @@ -1357,7 +1366,7 @@ export default defineComponent({ test_monitor_list.value[index].isactive = true; }; let test_delete_flag = false; - const refresh_all = () => { + const back_all = () => { refresh_resize(2); current_index.value = -1; monitor_list_current_index.value = -1; @@ -1365,7 +1374,14 @@ export default defineComponent({ multiple_select.value = []; multiple.value = false; loading.value = false; - test_monitor_list.value = JSON.parse(list_magic); + if (list_magic) { + JSON.parse(list_magic).forEach((element:any,index:number) => { + if(test_monitor_list.value[index].uuid==element.uuid){ + test_monitor_list.value[index].cmw=element.cmw + test_monitor_list.value[index].cmh=element.cmh + } + });; + } realtime_upload(last_wall.value, last_percenter.value, 2); }; let sort_index: any = ref([]); @@ -1461,8 +1477,8 @@ export default defineComponent({ }); } test_monitor_list.value.forEach((ele) => { - ele.isHide = false; - }); + ele.isHide = false; + }); const wall_dom = wall.value; if (a && wall_dom) { test_monitor_wall.value = []; @@ -1500,9 +1516,6 @@ export default defineComponent({ }); } if (a.length == 0) { - test_monitor_list.value.forEach((ele) => { - ele.isHide = false; - }); test_monitor_wall.value = []; } }; @@ -1642,11 +1655,9 @@ export default defineComponent({ realtime_upload(); }; let list_magic: any = []; - const detect=(list:any)=>{ - list.forEach((ele:any)=>{ - - }) - } + const detect = (list: any) => { + list.forEach((ele: any) => {}); + }; EventBus.getInstance().on( EventNamesDefine.NotifyMessage, (notify: NotifyMessage) => { @@ -1689,7 +1700,7 @@ export default defineComponent({ upload_magic_switch, magic_switch, magic_isbutton, - refresh_all, + back_all, getpx, lcm, model, @@ -1742,18 +1753,14 @@ export default defineComponent({ const SetMagicWallGridState = await client.setMagicWallGridState( magic_switch.value ); - list_magic = (await client.getApplicationSettins())?.config - ?.magic_list; - if (list_magic) { - test_monitor_list.value = JSON.parse(list_magic); - } + if (wall_dom) { offsetHeight.value = wall_dom.offsetHeight; offsetWidth.value = wall_dom.offsetWidth; getpx(); } test_monitor_list.value.forEach((element) => { - element.isHide = false; + element.isHide = false; }); if (response && settings) { const a = response?.config.windows; @@ -1772,6 +1779,14 @@ export default defineComponent({ } getpx(); } + list_magic = (await client.getApplicationSettins())?.config + ?.magic_list; + if (list_magic) { + test_monitor_list.value = JSON.parse(list_magic); + } + test_monitor_list.value.forEach((element) => { + element.isHide = false; + }); if ( output_length.value != response.config.col * response.config.row @@ -1786,7 +1801,7 @@ export default defineComponent({ $store.commit("setShowMonitorList", []); loading.value = false; - } else if (a && wall_dom) { + } else if (a && wall_dom) { a.forEach((element) => { let item: test_monitor = new test_monitor(0, "0", 0, 0, 0); extend(true, item, test_monitor_list.value[element.index]); @@ -1995,6 +2010,16 @@ export default defineComponent({ const wall_dom = wall.value; item.isShow = true; if (wall_dom) { + if(item.cmw==1214){ + item.w=wall_dom.offsetWidth*0.5 + }else{ + item.w=(item.cmw/1214) *(wall_dom.offsetWidth*0.5) + } + if(item.cmh==684){ + item.h=wall_dom.offsetHeight*0.5 + }else{ + item.h=(item.cmh/684) *(wall_dom.offsetHeight*0.5) + } item.InitialH = item.h; item.InitialW = item.w; item.resizew = item.w / wall_dom.offsetWidth; @@ -2037,7 +2062,6 @@ export default defineComponent({ } } }, - onDragEnter(e: DragEvent, index: string) { e.stopPropagation(); let target: HTMLElement | null = e.target as HTMLElement; @@ -2208,12 +2232,22 @@ export default defineComponent({ }, changewidth() { + const wall_dom = wall.value; let item = test_monitor_list.value[monitor_list_current_index.value]; - item.w = Number(item.cmw) * lcm.value; + // if (wall_dom) { + // if(item.cmw==1214){ + // item.w = 0.5 * wall_dom.offsetWidth; + // } + // } }, changeHeight() { + const wall_dom = wall.value; let item = test_monitor_list.value[monitor_list_current_index.value]; - item.h = item.cmh * lcm.value; + // if (wall_dom) { + // if(item.cmh==684){ + // item.h = 0.5 * wall_dom?.offsetHeight; + // } + // } }, alignTop() { let item = test_monitor_wall.value[multiple_select.value[0]]; @@ -2223,7 +2257,7 @@ export default defineComponent({ tep_item.currenty = item.currenty; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, alignBottom() { @@ -2234,7 +2268,7 @@ export default defineComponent({ tep_item.currenty = item.currenty + item.h - tep_item.h; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, alignRight() { @@ -2245,7 +2279,7 @@ export default defineComponent({ tep_item.currentx = item.currentx + item.w - tep_item.w; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, alignLeft() { @@ -2256,7 +2290,7 @@ export default defineComponent({ tep_item.currentx = item.currentx; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, testLog(a: any) { diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue index 2d3896c..6660458 100644 --- a/src/components/FusionSettings/GridSettings.vue +++ b/src/components/FusionSettings/GridSettings.vue @@ -4,8 +4,8 @@
-
-
+
@@ -13,8 +13,8 @@
-
-
+
@@ -22,16 +22,16 @@
-
-
+
-
-
+
+
{{ $t("line color") }} @@ -51,11 +51,33 @@
-
-
-
+
+
+ + + {{ $t("background color") }} + + + + + + + +
+
+
+
+
+
+
{{ $t("center circle color") }} diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts index 37d5c33..6957679 100644 --- a/src/entities/WSProtocol.ts +++ b/src/entities/WSProtocol.ts @@ -3460,7 +3460,6 @@ export namespace Protocol { location: number, enable: boolean, width: number, - auto_sync:boolean, rpc_id = 0 ) { super(); @@ -3473,15 +3472,12 @@ export namespace Protocol { this.location = location ?? 0; this.enable = enable ?? false; this.width = width ?? 0; - this.auto_sync = auto_sync ?? false; - } row = 0; column = 0; location = 0; //0：左融合带，1：上融合带，2：右融合带，3：下融合带 enable = false; width = 0; - auto_sync=false; } export class GetBlendingConfigResponseEntity extends PacketEntity { diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index 60d5d27..d59a7ff 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -417,7 +417,7 @@ export default { FourPointCalibration: "Four Pint Calibration", SurfaceCorrection: "Surface Correction", DensityCorrection: "Density Correction", - GridSettings: "Auxiliary Settings", + GridSettings: "Grid Settings", point: "dot", reset: "reset", "upper fusion zone parameters": "Upper Fusion Zone Parameters", @@ -509,9 +509,5 @@ export default { "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" + "fusion zone":"fusion zone" }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index 2de153c..d7e0bcf 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -686,7 +686,7 @@ export default { FourPointCalibration: "四点校正", SurfaceCorrection: "曲面校正", DensityCorrection: "疏密校正", - GridSettings: "辅助设置", + GridSettings: "网格设置", point: "点", reset: "重置", "upper fusion zone parameters": "上融合带参数", @@ -776,9 +776,5 @@ export default { "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":"下" + "fusion zone":"融合带" }; diff --git a/src/pad/TopToolbar.vue b/src/pad/TopToolbar.vue index 58c2bc8..eb714f7 100644 --- a/src/pad/TopToolbar.vue +++ b/src/pad/TopToolbar.vue @@ -314,10 +314,6 @@ 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 : ""); diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index c29ae8a..c36afba 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -653,10 +653,6 @@ export default defineComponent({ 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) => {