From b6babe9fd083d06e7b01d86bcd95840aa1eb078f Mon Sep 17 00:00:00 2001 From: snltty <1069410172@qq.com> Date: Sun, 31 Dec 2023 17:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmonitor.libs/IShareMemory.cs | 5 +- cmonitor.libs/ShareMemory.cs | 32 ++++++ cmonitor.libs/ShareMemoryLinux.cs | 9 ++ cmonitor.libs/ShareMemoryMacOS.cs | 7 ++ cmonitor.libs/ShareMemoryWindows.cs | 10 ++ {llock.win => cmonitor.llock.win}/Hook.cs | 2 +- .../MainForm.Designer.cs | 2 +- {llock.win => cmonitor.llock.win}/MainForm.cs | 2 +- .../MainForm.resx | 0 {llock.win => cmonitor.llock.win}/Program.cs | 2 +- .../app.manifest | 0 .../cmonitor.llock.win.csproj | 0 .../cmonitor.llock.win.csproj.user | 0 {llock.win => cmonitor.llock.win}/favicon.ico | Bin .../MainForm.Designer.cs | 2 +- .../MainForm.cs | 2 +- .../MainForm.resx | 0 .../Program.cs | 2 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Resources.resx | 0 .../Resources/gif.gif | Bin .../app.manifest | 0 .../cmonitor.message.win.csproj | 0 .../cmonitor.message.win.csproj.user | 0 .../favicon.ico | Bin .../MainForm.Designer.cs | 2 +- .../MainForm.cs | 2 +- .../MainForm.resx | 0 .../Program.cs | 2 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Resources.resx | 0 .../Resources/0.gif | Bin .../Resources/1.gif | Bin .../Resources/2.gif | Bin .../Resources/3.gif | Bin .../Resources/4.gif | Bin .../Resources/5.gif | Bin .../Resources/notify.gif | Bin .../Resources/star1.png | Bin .../Resources/star2.png | Bin .../app.manifest | 0 .../cmonitor.notify.win.csproj | 0 .../cmonitor.notify.win.csproj.user | 0 .../favicon.ico | Bin cmonitor.sln | 8 +- .../Hook.cs | 2 +- .../MainForm.Designer.cs | 2 +- .../MainForm.cs | 2 +- .../MainForm.resx | 0 .../MainFormSetParent.cs | 2 +- .../Program.cs | 2 +- .../app.manifest | 0 .../bg.jpg | Bin .../cmonitor.wallpaper.win.csproj | 0 .../cmonitor.wallpaper.win.csproj.user | 0 .../favicon.ico | Bin .../device/plugins/message/ChooseDig.vue | 2 +- .../device/plugins/share/snatch/index.js | 2 +- .../device/plugins/share/snatch/use/Info.vue | 23 +++- .../device/plugins/share/snatch/use/Item.vue | 22 +++- cmonitor/Program.cs | 1 + cmonitor/client/reports/llock/LLockWindows.cs | 2 +- .../client/reports/notify/NotifyWindows.cs | 2 +- cmonitor/client/reports/screen/IScreen.cs | 3 - cmonitor/client/reports/screen/ScreenLinux.cs | 6 - cmonitor/client/reports/screen/ScreenMacOS.cs | 6 - .../client/reports/screen/ScreenReport.cs | 17 +-- cmonitor/client/reports/screen/ScreenShare.cs | 108 ++++++++++++++++++ .../client/reports/screen/ScreenWindows.cs | 25 ---- .../reports/wallpaper/WallpaperWindows.cs | 2 +- .../messengers/screen/ScreenMessenger.cs | 20 +++- 71 files changed, 253 insertions(+), 97 deletions(-) rename {llock.win => cmonitor.llock.win}/Hook.cs (99%) rename {llock.win => cmonitor.llock.win}/MainForm.Designer.cs (99%) rename {llock.win => cmonitor.llock.win}/MainForm.cs (99%) rename {llock.win => cmonitor.llock.win}/MainForm.resx (100%) rename {llock.win => cmonitor.llock.win}/Program.cs (97%) rename {llock.win => cmonitor.llock.win}/app.manifest (100%) rename llock.win/llock.win.csproj => cmonitor.llock.win/cmonitor.llock.win.csproj (100%) rename llock.win/llock.win.csproj.user => cmonitor.llock.win/cmonitor.llock.win.csproj.user (100%) rename {llock.win => cmonitor.llock.win}/favicon.ico (100%) rename {message.win => cmonitor.message.win}/MainForm.Designer.cs (99%) rename {message.win => cmonitor.message.win}/MainForm.cs (98%) rename {message.win => cmonitor.message.win}/MainForm.resx (100%) rename {message.win => cmonitor.message.win}/Program.cs (97%) rename {message.win => cmonitor.message.win}/Properties/Resources.Designer.cs (94%) rename {message.win => cmonitor.message.win}/Properties/Resources.resx (100%) rename {message.win => cmonitor.message.win}/Resources/gif.gif (100%) rename {message.win => cmonitor.message.win}/app.manifest (100%) rename message.win/message.win.csproj => cmonitor.message.win/cmonitor.message.win.csproj (100%) rename message.win/message.win.csproj.user => cmonitor.message.win/cmonitor.message.win.csproj.user (100%) rename {message.win => cmonitor.message.win}/favicon.ico (100%) rename {notify.win => cmonitor.notify.win}/MainForm.Designer.cs (99%) rename {notify.win => cmonitor.notify.win}/MainForm.cs (99%) rename {notify.win => cmonitor.notify.win}/MainForm.resx (100%) rename {notify.win => cmonitor.notify.win}/Program.cs (96%) rename {notify.win => cmonitor.notify.win}/Properties/Resources.Designer.cs (97%) rename {notify.win => cmonitor.notify.win}/Properties/Resources.resx (100%) rename {notify.win => cmonitor.notify.win}/Resources/0.gif (100%) rename {notify.win => cmonitor.notify.win}/Resources/1.gif (100%) rename {notify.win => cmonitor.notify.win}/Resources/2.gif (100%) rename {notify.win => cmonitor.notify.win}/Resources/3.gif (100%) rename {notify.win => cmonitor.notify.win}/Resources/4.gif (100%) rename {notify.win => cmonitor.notify.win}/Resources/5.gif (100%) rename {notify.win => cmonitor.notify.win}/Resources/notify.gif (100%) rename {notify.win => cmonitor.notify.win}/Resources/star1.png (100%) rename {notify.win => cmonitor.notify.win}/Resources/star2.png (100%) rename {notify.win => cmonitor.notify.win}/app.manifest (100%) rename notify.win/notify.win.csproj => cmonitor.notify.win/cmonitor.notify.win.csproj (100%) rename notify.win/notify.win.csproj.user => cmonitor.notify.win/cmonitor.notify.win.csproj.user (100%) rename {notify.win => cmonitor.notify.win}/favicon.ico (100%) rename {wallpaper.win => cmonitor.wallpaper.win}/Hook.cs (98%) rename {wallpaper.win => cmonitor.wallpaper.win}/MainForm.Designer.cs (98%) rename {wallpaper.win => cmonitor.wallpaper.win}/MainForm.cs (99%) rename {wallpaper.win => cmonitor.wallpaper.win}/MainForm.resx (100%) rename {wallpaper.win => cmonitor.wallpaper.win}/MainFormSetParent.cs (99%) rename {wallpaper.win => cmonitor.wallpaper.win}/Program.cs (97%) rename {wallpaper.win => cmonitor.wallpaper.win}/app.manifest (100%) rename {wallpaper.win => cmonitor.wallpaper.win}/bg.jpg (100%) rename wallpaper.win/wallpaper.win.csproj => cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj (100%) rename wallpaper.win/wallpaper.win.csproj.user => cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj.user (100%) rename {wallpaper.win => cmonitor.wallpaper.win}/favicon.ico (100%) create mode 100644 cmonitor/client/reports/screen/ScreenShare.cs diff --git a/cmonitor.libs/IShareMemory.cs b/cmonitor.libs/IShareMemory.cs index 93e4e45c..37ce7d9b 100644 --- a/cmonitor.libs/IShareMemory.cs +++ b/cmonitor.libs/IShareMemory.cs @@ -1,4 +1,6 @@ -namespace cmonitor.libs +using System; + +namespace cmonitor.libs { internal interface IShareMemory { @@ -14,5 +16,6 @@ public void ReadArray(int position, byte[] bytes, int offset, int length); public void WriteArray(int position, byte[] data, int offset, int length); + public void WritSpan(int position, Span span); } } diff --git a/cmonitor.libs/ShareMemory.cs b/cmonitor.libs/ShareMemory.cs index 8a6a906c..9be30803 100644 --- a/cmonitor.libs/ShareMemory.cs +++ b/cmonitor.libs/ShareMemory.cs @@ -404,6 +404,38 @@ namespace cmonitor.libs return false; } + public bool Update(int index, Span span, ShareMemoryAttribute addAttri = ShareMemoryAttribute.None, + ShareMemoryAttribute removeAttri = ShareMemoryAttribute.None) + { + if (accessorLocal == null && accessorGlobal == null) return false; + if (span.Length > shareMemoryHeadSize + itemSize) return false; + + lock (lockObj) + { + int valIndex = index * itemSize + 8 + shareMemoryHeadSize; + if (accessorLocal != null) + { + accessorLocal.WriteInt(valIndex, span.Length); + accessorLocal.WritSpan(valIndex+4, span); + } + if (accessorGlobal != null) + { + accessorGlobal.WriteInt(valIndex, span.Length); + accessorGlobal.WritSpan(valIndex, span); + } + IncrementVersion(index); + if (removeAttri > 0) + { + RemoveAttribute(index, removeAttri); + } + if (addAttri > 0) + { + AddAttribute(index, addAttri); + } + } + return true; + } + private ShareMemoryAttribute ReadAttribute(IShareMemory accessor, int index) { if (accessor == null || index >= length) return ShareMemoryAttribute.None; diff --git a/cmonitor.libs/ShareMemoryLinux.cs b/cmonitor.libs/ShareMemoryLinux.cs index 53c6f8bc..5f6c1301 100644 --- a/cmonitor.libs/ShareMemoryLinux.cs +++ b/cmonitor.libs/ShareMemoryLinux.cs @@ -60,6 +60,13 @@ namespace cmonitor.libs Marshal.Copy(bytes, offset, shmPtr + position, length); } } + public unsafe void WritSpan(int position, Span span) + { + if (shmPtr != IntPtr.Zero) + { + span.CopyTo(new Span((void*)(shmPtr + position), span.Length)); + } + } public byte ReadByte(int position) { @@ -131,5 +138,7 @@ namespace cmonitor.libs [DllImport(LIBC_LIBRARY, EntryPoint = "shm_unlink", SetLastError = true)] public static extern int ShmUnlink(string name); + + } } diff --git a/cmonitor.libs/ShareMemoryMacOS.cs b/cmonitor.libs/ShareMemoryMacOS.cs index 4db3dd19..430e3856 100644 --- a/cmonitor.libs/ShareMemoryMacOS.cs +++ b/cmonitor.libs/ShareMemoryMacOS.cs @@ -60,6 +60,13 @@ namespace cmonitor.libs Marshal.Copy(bytes, offset, shmPtr + position, length); } } + public unsafe void WritSpan(int position, Span span) + { + if (shmPtr != IntPtr.Zero) + { + span.CopyTo(new Span((void*)(shmPtr + position), span.Length)); + } + } public byte ReadByte(int position) { diff --git a/cmonitor.libs/ShareMemoryWindows.cs b/cmonitor.libs/ShareMemoryWindows.cs index d0e85322..0c9ab521 100644 --- a/cmonitor.libs/ShareMemoryWindows.cs +++ b/cmonitor.libs/ShareMemoryWindows.cs @@ -2,6 +2,7 @@ using System.IO; using System.IO.MemoryMappedFiles; using System.Runtime.InteropServices; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace cmonitor.libs { @@ -57,6 +58,13 @@ namespace cmonitor.libs accessorLocal.WriteArray(position, data, offset, length); } } + public void WritSpan(int position, Span span) + { + if (accessorLocal != null) + { + accessorLocal.SafeMemoryMappedViewHandle.WriteSpan((ulong)position, span); + } + } public byte ReadByte(int position) { @@ -106,6 +114,8 @@ namespace cmonitor.libs accessorLocal.Write(position, value); } } + + } } diff --git a/llock.win/Hook.cs b/cmonitor.llock.win/Hook.cs similarity index 99% rename from llock.win/Hook.cs rename to cmonitor.llock.win/Hook.cs index b4e05e97..fed51672 100644 --- a/llock.win/Hook.cs +++ b/cmonitor.llock.win/Hook.cs @@ -2,7 +2,7 @@ using Microsoft.Win32; using System.Runtime.InteropServices; -namespace llock.win +namespace cmonitor.llock.win { internal class Hook : IDisposable { diff --git a/llock.win/MainForm.Designer.cs b/cmonitor.llock.win/MainForm.Designer.cs similarity index 99% rename from llock.win/MainForm.Designer.cs rename to cmonitor.llock.win/MainForm.Designer.cs index 97f3fc55..a3899269 100644 --- a/llock.win/MainForm.Designer.cs +++ b/cmonitor.llock.win/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace llock.win +namespace cmonitor.llock.win { partial class MainForm { diff --git a/llock.win/MainForm.cs b/cmonitor.llock.win/MainForm.cs similarity index 99% rename from llock.win/MainForm.cs rename to cmonitor.llock.win/MainForm.cs index bf5e172c..d53cfa73 100644 --- a/llock.win/MainForm.cs +++ b/cmonitor.llock.win/MainForm.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; -namespace llock.win +namespace cmonitor.llock.win { public partial class MainForm : Form { diff --git a/llock.win/MainForm.resx b/cmonitor.llock.win/MainForm.resx similarity index 100% rename from llock.win/MainForm.resx rename to cmonitor.llock.win/MainForm.resx diff --git a/llock.win/Program.cs b/cmonitor.llock.win/Program.cs similarity index 97% rename from llock.win/Program.cs rename to cmonitor.llock.win/Program.cs index 4e722790..248140eb 100644 --- a/llock.win/Program.cs +++ b/cmonitor.llock.win/Program.cs @@ -1,4 +1,4 @@ -namespace llock.win +namespace cmonitor.llock.win { internal static class Program { diff --git a/llock.win/app.manifest b/cmonitor.llock.win/app.manifest similarity index 100% rename from llock.win/app.manifest rename to cmonitor.llock.win/app.manifest diff --git a/llock.win/llock.win.csproj b/cmonitor.llock.win/cmonitor.llock.win.csproj similarity index 100% rename from llock.win/llock.win.csproj rename to cmonitor.llock.win/cmonitor.llock.win.csproj diff --git a/llock.win/llock.win.csproj.user b/cmonitor.llock.win/cmonitor.llock.win.csproj.user similarity index 100% rename from llock.win/llock.win.csproj.user rename to cmonitor.llock.win/cmonitor.llock.win.csproj.user diff --git a/llock.win/favicon.ico b/cmonitor.llock.win/favicon.ico similarity index 100% rename from llock.win/favicon.ico rename to cmonitor.llock.win/favicon.ico diff --git a/message.win/MainForm.Designer.cs b/cmonitor.message.win/MainForm.Designer.cs similarity index 99% rename from message.win/MainForm.Designer.cs rename to cmonitor.message.win/MainForm.Designer.cs index 623834f3..7343b310 100644 --- a/message.win/MainForm.Designer.cs +++ b/cmonitor.message.win/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace message.win +namespace cmonitor.message.win { partial class MainForm { diff --git a/message.win/MainForm.cs b/cmonitor.message.win/MainForm.cs similarity index 98% rename from message.win/MainForm.cs rename to cmonitor.message.win/MainForm.cs index 0424ea46..87831fd6 100644 --- a/message.win/MainForm.cs +++ b/cmonitor.message.win/MainForm.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace message.win +namespace cmonitor.message.win { public partial class MainForm : Form { diff --git a/message.win/MainForm.resx b/cmonitor.message.win/MainForm.resx similarity index 100% rename from message.win/MainForm.resx rename to cmonitor.message.win/MainForm.resx diff --git a/message.win/Program.cs b/cmonitor.message.win/Program.cs similarity index 97% rename from message.win/Program.cs rename to cmonitor.message.win/Program.cs index d3d572ca..b0dad5df 100644 --- a/message.win/Program.cs +++ b/cmonitor.message.win/Program.cs @@ -1,4 +1,4 @@ -namespace message.win +namespace cmonitor.message.win { internal static class Program { diff --git a/message.win/Properties/Resources.Designer.cs b/cmonitor.message.win/Properties/Resources.Designer.cs similarity index 94% rename from message.win/Properties/Resources.Designer.cs rename to cmonitor.message.win/Properties/Resources.Designer.cs index 21ef5844..b1bb37cf 100644 --- a/message.win/Properties/Resources.Designer.cs +++ b/cmonitor.message.win/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace message.win.Properties { +namespace cmonitor.message.win.Properties { using System; @@ -39,7 +39,7 @@ namespace message.win.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("message.win.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("cmonitor.message.win.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/message.win/Properties/Resources.resx b/cmonitor.message.win/Properties/Resources.resx similarity index 100% rename from message.win/Properties/Resources.resx rename to cmonitor.message.win/Properties/Resources.resx diff --git a/message.win/Resources/gif.gif b/cmonitor.message.win/Resources/gif.gif similarity index 100% rename from message.win/Resources/gif.gif rename to cmonitor.message.win/Resources/gif.gif diff --git a/message.win/app.manifest b/cmonitor.message.win/app.manifest similarity index 100% rename from message.win/app.manifest rename to cmonitor.message.win/app.manifest diff --git a/message.win/message.win.csproj b/cmonitor.message.win/cmonitor.message.win.csproj similarity index 100% rename from message.win/message.win.csproj rename to cmonitor.message.win/cmonitor.message.win.csproj diff --git a/message.win/message.win.csproj.user b/cmonitor.message.win/cmonitor.message.win.csproj.user similarity index 100% rename from message.win/message.win.csproj.user rename to cmonitor.message.win/cmonitor.message.win.csproj.user diff --git a/message.win/favicon.ico b/cmonitor.message.win/favicon.ico similarity index 100% rename from message.win/favicon.ico rename to cmonitor.message.win/favicon.ico diff --git a/notify.win/MainForm.Designer.cs b/cmonitor.notify.win/MainForm.Designer.cs similarity index 99% rename from notify.win/MainForm.Designer.cs rename to cmonitor.notify.win/MainForm.Designer.cs index 9d4a6a17..e5812525 100644 --- a/notify.win/MainForm.Designer.cs +++ b/cmonitor.notify.win/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace notify.win +namespace cmonitor.notify.win { partial class MainForm { diff --git a/notify.win/MainForm.cs b/cmonitor.notify.win/MainForm.cs similarity index 99% rename from notify.win/MainForm.cs rename to cmonitor.notify.win/MainForm.cs index 3ec4978e..d6bcbcd3 100644 --- a/notify.win/MainForm.cs +++ b/cmonitor.notify.win/MainForm.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; -namespace notify.win +namespace cmonitor.notify.win { public partial class MainForm : Form { diff --git a/notify.win/MainForm.resx b/cmonitor.notify.win/MainForm.resx similarity index 100% rename from notify.win/MainForm.resx rename to cmonitor.notify.win/MainForm.resx diff --git a/notify.win/Program.cs b/cmonitor.notify.win/Program.cs similarity index 96% rename from notify.win/Program.cs rename to cmonitor.notify.win/Program.cs index dbd33820..c07e485e 100644 --- a/notify.win/Program.cs +++ b/cmonitor.notify.win/Program.cs @@ -1,4 +1,4 @@ -namespace notify.win +namespace cmonitor.notify.win { internal static class Program { diff --git a/notify.win/Properties/Resources.Designer.cs b/cmonitor.notify.win/Properties/Resources.Designer.cs similarity index 97% rename from notify.win/Properties/Resources.Designer.cs rename to cmonitor.notify.win/Properties/Resources.Designer.cs index a9832e02..332c2c44 100644 --- a/notify.win/Properties/Resources.Designer.cs +++ b/cmonitor.notify.win/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace notify.win.Properties { +namespace cmonitor.notify.win.Properties { using System; @@ -39,7 +39,7 @@ namespace notify.win.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("notify.win.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("cmonitor.notify.win.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/notify.win/Properties/Resources.resx b/cmonitor.notify.win/Properties/Resources.resx similarity index 100% rename from notify.win/Properties/Resources.resx rename to cmonitor.notify.win/Properties/Resources.resx diff --git a/notify.win/Resources/0.gif b/cmonitor.notify.win/Resources/0.gif similarity index 100% rename from notify.win/Resources/0.gif rename to cmonitor.notify.win/Resources/0.gif diff --git a/notify.win/Resources/1.gif b/cmonitor.notify.win/Resources/1.gif similarity index 100% rename from notify.win/Resources/1.gif rename to cmonitor.notify.win/Resources/1.gif diff --git a/notify.win/Resources/2.gif b/cmonitor.notify.win/Resources/2.gif similarity index 100% rename from notify.win/Resources/2.gif rename to cmonitor.notify.win/Resources/2.gif diff --git a/notify.win/Resources/3.gif b/cmonitor.notify.win/Resources/3.gif similarity index 100% rename from notify.win/Resources/3.gif rename to cmonitor.notify.win/Resources/3.gif diff --git a/notify.win/Resources/4.gif b/cmonitor.notify.win/Resources/4.gif similarity index 100% rename from notify.win/Resources/4.gif rename to cmonitor.notify.win/Resources/4.gif diff --git a/notify.win/Resources/5.gif b/cmonitor.notify.win/Resources/5.gif similarity index 100% rename from notify.win/Resources/5.gif rename to cmonitor.notify.win/Resources/5.gif diff --git a/notify.win/Resources/notify.gif b/cmonitor.notify.win/Resources/notify.gif similarity index 100% rename from notify.win/Resources/notify.gif rename to cmonitor.notify.win/Resources/notify.gif diff --git a/notify.win/Resources/star1.png b/cmonitor.notify.win/Resources/star1.png similarity index 100% rename from notify.win/Resources/star1.png rename to cmonitor.notify.win/Resources/star1.png diff --git a/notify.win/Resources/star2.png b/cmonitor.notify.win/Resources/star2.png similarity index 100% rename from notify.win/Resources/star2.png rename to cmonitor.notify.win/Resources/star2.png diff --git a/notify.win/app.manifest b/cmonitor.notify.win/app.manifest similarity index 100% rename from notify.win/app.manifest rename to cmonitor.notify.win/app.manifest diff --git a/notify.win/notify.win.csproj b/cmonitor.notify.win/cmonitor.notify.win.csproj similarity index 100% rename from notify.win/notify.win.csproj rename to cmonitor.notify.win/cmonitor.notify.win.csproj diff --git a/notify.win/notify.win.csproj.user b/cmonitor.notify.win/cmonitor.notify.win.csproj.user similarity index 100% rename from notify.win/notify.win.csproj.user rename to cmonitor.notify.win/cmonitor.notify.win.csproj.user diff --git a/notify.win/favicon.ico b/cmonitor.notify.win/favicon.ico similarity index 100% rename from notify.win/favicon.ico rename to cmonitor.notify.win/favicon.ico diff --git a/cmonitor.sln b/cmonitor.sln index 34f77aed..31a990de 100644 --- a/cmonitor.sln +++ b/cmonitor.sln @@ -13,13 +13,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.libs", "cmonitor.l EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.install.win", "cmonitor.install.win\cmonitor.install.win.csproj", "{4EB9FFB0-B05C-4C4E-BD44-796715E47585}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "llock.win", "llock.win\llock.win.csproj", "{6F2602B3-221D-475D-B643-D54987605644}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.llock.win", "cmonitor.llock.win\cmonitor.llock.win.csproj", "{6F2602B3-221D-475D-B643-D54987605644}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wallpaper.win", "wallpaper.win\wallpaper.win.csproj", "{41C61263-4F73-4C62-BD78-8C3612C8F98B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.wallpaper.win", "cmonitor.wallpaper.win\cmonitor.wallpaper.win.csproj", "{41C61263-4F73-4C62-BD78-8C3612C8F98B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "notify.win", "notify.win\notify.win.csproj", "{886D781B-9A41-4DD1-8B94-490AE6476E67}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.notify.win", "cmonitor.notify.win\cmonitor.notify.win.csproj", "{886D781B-9A41-4DD1-8B94-490AE6476E67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "message.win", "message.win\message.win.csproj", "{BCA983E7-928F-4353-BF98-4ACCBB1B173E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.message.win", "cmonitor.message.win\cmonitor.message.win.csproj", "{BCA983E7-928F-4353-BF98-4ACCBB1B173E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.snatch.win", "cmonitor.snatch.win\cmonitor.snatch.win.csproj", "{5267B401-6818-407C-8323-E6C8A3CC01D6}" EndProject diff --git a/wallpaper.win/Hook.cs b/cmonitor.wallpaper.win/Hook.cs similarity index 98% rename from wallpaper.win/Hook.cs rename to cmonitor.wallpaper.win/Hook.cs index 596c44b3..53c52b74 100644 --- a/wallpaper.win/Hook.cs +++ b/cmonitor.wallpaper.win/Hook.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace wallpaper.win +namespace cmonitor.wallpaper.win { internal sealed class Hook : IDisposable { diff --git a/wallpaper.win/MainForm.Designer.cs b/cmonitor.wallpaper.win/MainForm.Designer.cs similarity index 98% rename from wallpaper.win/MainForm.Designer.cs rename to cmonitor.wallpaper.win/MainForm.Designer.cs index 9973a9f6..9ed176d8 100644 --- a/wallpaper.win/MainForm.Designer.cs +++ b/cmonitor.wallpaper.win/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace wallpaper.win +namespace cmonitor.wallpaper.win { partial class MainForm { diff --git a/wallpaper.win/MainForm.cs b/cmonitor.wallpaper.win/MainForm.cs similarity index 99% rename from wallpaper.win/MainForm.cs rename to cmonitor.wallpaper.win/MainForm.cs index a5b3a941..f390f54e 100644 --- a/wallpaper.win/MainForm.cs +++ b/cmonitor.wallpaper.win/MainForm.cs @@ -2,7 +2,7 @@ using cmonitor.libs; using System.Diagnostics; using System.Text; -namespace wallpaper.win +namespace cmonitor.wallpaper.win { public partial class MainForm : Form { diff --git a/wallpaper.win/MainForm.resx b/cmonitor.wallpaper.win/MainForm.resx similarity index 100% rename from wallpaper.win/MainForm.resx rename to cmonitor.wallpaper.win/MainForm.resx diff --git a/wallpaper.win/MainFormSetParent.cs b/cmonitor.wallpaper.win/MainFormSetParent.cs similarity index 99% rename from wallpaper.win/MainFormSetParent.cs rename to cmonitor.wallpaper.win/MainFormSetParent.cs index 1ce93264..d9ccd23f 100644 --- a/wallpaper.win/MainFormSetParent.cs +++ b/cmonitor.wallpaper.win/MainFormSetParent.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; -namespace wallpaper.win +namespace cmonitor.wallpaper.win { internal sealed class MainFormSetParent { diff --git a/wallpaper.win/Program.cs b/cmonitor.wallpaper.win/Program.cs similarity index 97% rename from wallpaper.win/Program.cs rename to cmonitor.wallpaper.win/Program.cs index 88f05c33..0d47ea01 100644 --- a/wallpaper.win/Program.cs +++ b/cmonitor.wallpaper.win/Program.cs @@ -1,4 +1,4 @@ -namespace wallpaper.win +namespace cmonitor.wallpaper.win { internal static class Program { diff --git a/wallpaper.win/app.manifest b/cmonitor.wallpaper.win/app.manifest similarity index 100% rename from wallpaper.win/app.manifest rename to cmonitor.wallpaper.win/app.manifest diff --git a/wallpaper.win/bg.jpg b/cmonitor.wallpaper.win/bg.jpg similarity index 100% rename from wallpaper.win/bg.jpg rename to cmonitor.wallpaper.win/bg.jpg diff --git a/wallpaper.win/wallpaper.win.csproj b/cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj similarity index 100% rename from wallpaper.win/wallpaper.win.csproj rename to cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj diff --git a/wallpaper.win/wallpaper.win.csproj.user b/cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj.user similarity index 100% rename from wallpaper.win/wallpaper.win.csproj.user rename to cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj.user diff --git a/wallpaper.win/favicon.ico b/cmonitor.wallpaper.win/favicon.ico similarity index 100% rename from wallpaper.win/favicon.ico rename to cmonitor.wallpaper.win/favicon.ico diff --git a/cmonitor.web/src/views/device/plugins/message/ChooseDig.vue b/cmonitor.web/src/views/device/plugins/message/ChooseDig.vue index 2551ae34..9d3124ff 100644 --- a/cmonitor.web/src/views/device/plugins/message/ChooseDig.vue +++ b/cmonitor.web/src/views/device/plugins/message/ChooseDig.vue @@ -115,7 +115,7 @@ export default { }).then(() => { state.loading = true; const names = _devices.map(c => c.MachineName); - const fn = state.recoedData ? play(names, state.recoedData) : exec(names, [`start message.win.exe "${state.prev}" ${state.sec}`]); + const fn = state.recoedData ? play(names, state.recoedData) : exec(names, [`start cmonitor.message.win.exe "${state.prev}" ${state.sec}`]); fn.then((res) => { if (res) { ElMessage.success('操作成功'); diff --git a/cmonitor.web/src/views/device/plugins/share/snatch/index.js b/cmonitor.web/src/views/device/plugins/share/snatch/index.js index 55d0b655..8daaa9e1 100644 --- a/cmonitor.web/src/views/device/plugins/share/snatch/index.js +++ b/cmonitor.web/src/views/device/plugins/share/snatch/index.js @@ -6,7 +6,7 @@ export default { state: { shareSnatch: { showTemplate: false, - showUse: true, + showUse: false, answers: [] } }, diff --git a/cmonitor.web/src/views/device/plugins/share/snatch/use/Info.vue b/cmonitor.web/src/views/device/plugins/share/snatch/use/Info.vue index a8af2d33..10c683dd 100644 --- a/cmonitor.web/src/views/device/plugins/share/snatch/use/Info.vue +++ b/cmonitor.web/src/views/device/plugins/share/snatch/use/Info.vue @@ -1,7 +1,7 @@