From 7237cc4e960da05317a1c85a919f0721052c235c Mon Sep 17 00:00:00 2001 From: fangxiang Date: Wed, 20 Apr 2022 10:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E9=A2=84=E6=A1=88=EF=BC=8C=E8=BD=AE=E8=AF=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=82=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B1=8F=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/pad/mode_icon.png | Bin 1065 -> 1861 bytes public/pad/plan_icon.png | Bin 1132 -> 1915 bytes public/pad/polling_icon.png | Bin 1737 -> 2178 bytes .../hdmi_in.png} | Bin .../image.png} | Bin .../media.png} | Bin .../web.png} | Bin .../{stop_plan_polling.png => stop_plan.png} | Bin src/i18n/zh-CN/index.ts | 1 + src/pad/BottomBar.vue | 148 +++++-- src/pad/ContentWall.vue | 376 +++++++++++------- src/pad/TopToolbar.vue | 85 ++-- src/third_lib/vuedraggable/vuedraggable.js | 3 +- 13 files changed, 411 insertions(+), 202 deletions(-) rename public/pad/{hdmi_in_source_icon.png => source_icon/hdmi_in.png} (100%) rename public/pad/{image_in_source_icon.png => source_icon/image.png} (100%) rename public/pad/{video_in_source_icon.png => source_icon/media.png} (100%) rename public/pad/{web_in_source_icon.png => source_icon/web.png} (100%) rename public/pad/toolbar/{stop_plan_polling.png => stop_plan.png} (100%) diff --git a/public/pad/mode_icon.png b/public/pad/mode_icon.png index ce699f9827cc49a8135e360feae81053c50619de..e21ec274a868babeaab9f3c4904f44a091bf35b4 100644 GIT binary patch literal 1861 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 P00000NkvXXu0mjfM@|Ur diff --git a/public/pad/plan_icon.png b/public/pad/plan_icon.png index 35abf1cd14d7faab8483cef01a7c19470f55aefc..042f27d1b2dd1fe4a88497e8e39aad32bf617e2c 100644 GIT binary patch literal 1915 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 delta 1722 zcmV;r21WUT5y=gZBYy^vNklYRHm>I{;7vtxB@80je z`yTJUKRn)dXXcwZ|2Z@Bopa`N+O%mCZ3Pp2SD?H8{S~eIzJIO8ZWW>?_%6WFzzM*S zz`?-2K#yG0e*hu78h9UA2`rA*eOqgpYDUxq-${vG0-OizQe{^{eg*J2@MN^^ms-fz zVxlJa&cMaMjqp9H+8v!5sV74QgfHE=Aj zd$g_r7zW%It$&l{y_?oK;6Y$bu8$poalmIL_?u1e-Kv$fDvg@pMSy9*rP4=I^&9Yn z5?mRr+p2RD{F%VuXx)uX^ey{&I50vcCs!?dd3dz$ouV=qCTfB|6qo}XkQDzeS^}m< z>%J@VzD!K_Xx(pR+I3S+PXP8xsx|=EM(Z9ZB6lI8CV%+Tfai2cWta<$iPo(vGH`)0 zw+C+3CEO*cny%wkM4)1#CioM9g+Ny=5-pC7*3GJhKv9_Bj{#=uXDWkik;^I}TjVg3 z)ADb9UJo4CRwM<{I{C&90NzZBWgp*D$@@i@uAH(j1LsETmQ*8fOJRbSPt!NR4oO#| z%I(=gpMRHV-BO?*Q25lV6{2;20E2YGGfdN^-6Yz~)-}N&1;}AGD_Zwe4f+#%dAUx! z;8Wm;Xx*=++PBDHC?J#=3ay~j!oKMV}d`h)cb8kv^DXNE@6SJoJk#$sDFM#$0bDKeZfRwQAsVd{^Yq1}==8L{BWYByAbB2?R%}7k z1mD91@AK=sj<7NjwV#H0wkE0{-^(??RdT~aC-3K)wDFSTN*_Pn-Uj<%W9j$w>;BXUxQ-N=F-)=^Jw$>y>B~V=xqWniT%74FF z_1DZetMsH@k_O51L}m8Q*5`r1Q>`snYam*8LB88O(G|(_5ZWnB@Q15HWUI}N)@>*! zY2E}}mh2&8g74GbsG8tU*Kq5dKmg|HrB}1qf~cNQOOqnoI^wnnV{$7|41`4{_+6Xp zw3M6nSn}-Jq0PH}i84tec+CXAcYjkal_EMvk7mI>dYfGjI7H4E6Z`?CWZjBrwC>NG z**8h=JL&;))3)3MKcEtgqC_*lu6JS@)&pd(E-}FmE=x38_oG@E8OE2IrFINS^O`C}6bi z6ZJ{6yTy}%?@aIm+eXfsK$1fm%Z59nbx#A6lOnM~rkLPsb}Lp8jRo63FWat2vc^nJ zhshw?KEG0@xTVmG-{}QoSzZ#lWE&O-=>|a3BxS-W8?Nf~ro|Fv0Hx+yz{f({3iv zOTa6@ThY4J$$LXJ7x22ItcM!ra;i)HK_!ML{Q)-$r0A{ppvL%V)8*cEi)%qn - - singal_pollingsingal_pollingsingal_pollingsingal_polling + + + + + + - - modemodemodemodemode + + + + + + - - planplanplanplanplanplanplan + + + + + + @@ -262,6 +331,26 @@ export default defineComponent({ } ); + const emit_drop_events = (evt: any, type: string) => { + if ( + evt.data && + evt.event && + evt.event.changedTouches && + evt.event.changedTouches.length + ) { + const touchX = evt.event.changedTouches[0].pageX; + const touchY = evt.event.changedTouches[0].pageY; + EventBus.getInstance().emit(EventNamesDefine.DropToWall, { + type, + data: evt.data, + pos: { + x: touchX, + y: touchY, + }, + }); + } + }; + return { tab, signal_sources, @@ -277,26 +366,37 @@ export default defineComponent({ console.log(a); }, getItemIcon(item_type: string) { - return Common.getSignalSourceIcon(item_type); + let icon_map = new Map([ + ["EwindowType::Normal", "img:pad/source_icon/media.png"], + ["EwindowType::Multimedia", "img:pad/source_icon/media.png"], + ["EwindowType::Web", "img:pad/source_icon/web.png"], + ["EwindowType::Image", "img:pad/source_icon/image.png"], + ["EwindowType::Pdf", "img:pad/source_icon/pdf.png"], + ["EwindowType::Ppt", "img:pad/source_icon/ppt.png"], + ["EwindowType::Rtsp", "img:pad/source_icon/rtsp.png"], + ["EwindowType::Subtitles", "img:pad/source_icon/subtitles.png"], + ["EwindowType::Clock", "img:pad/source_icon/clock.png"], + ["EwindowType::Weather", "img:pad/source_icon/weather.png"], + ["EwindowType::HdmiIn", "img:pad/source_icon/hdmi_in.png"], + ]); + + if (icon_map.has(item_type)) { + return icon_map.get(item_type); + } else { + return "img:pad/source_icon/media.png"; + } }, onSignalSourceDrop(evt: any) { - if ( - evt.data && - evt.event && - evt.event.changedTouches && - evt.event.changedTouches.length - ) { - const touchX = evt.event.changedTouches[0].pageX; - const touchY = evt.event.changedTouches[0].pageY; - EventBus.getInstance().emit(EventNamesDefine.DropToWall, { - data: evt.data, - type: "signal_source", - pos: { - x: touchX, - y: touchY, - }, - }); - } + emit_drop_events(evt, "signal_source"); + }, + onPollingDrop(evt: any) { + emit_drop_events(evt, "polling"); + }, + onModeDrop(evt: any) { + emit_drop_events(evt, "mode"); + }, + onPlanDrop(evt: any) { + emit_drop_events(evt, "plan"); }, volumeUp(evt: MouseEvent) { evt.stopPropagation(); diff --git a/src/pad/ContentWall.vue b/src/pad/ContentWall.vue index 4fd7107..277bb2f 100644 --- a/src/pad/ContentWall.vue +++ b/src/pad/ContentWall.vue @@ -23,7 +23,8 @@ :y=" $refs.wall?.parentElement?.offsetTop + $refs.wall_content?.offsetTop + - item.y * wall_content_client_height + item.y * wall_content_client_height + + $store.state.wall_row / ($store.state.landspace ? 2 : 1) " :zIndex=" 1 + @@ -145,7 +146,7 @@