Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-出货标签管理/UAS_出货标签管理.cs

@@ -738,26 +738,22 @@ namespace UAS_LabelMachine
                 {
                     DataGridViewCell cell = null;
                     string Matchstr = "";
-                    string field = "";
                     switch (kind.ToString().ToUpper())
                     {
                         case "DATECODE":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_datecode"];
-                            field = "pib_datecode";
                             Matchstr = MatchStr(data[j], "DATECODE");
                             setdata.Remove("DATECODE");
                             length--;
                             break;
                         case "LOTNO":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_lotno"];
-                            field = "pib_lotno";
                             Matchstr = MatchStr(data[j], "LOTNO");
                             setdata.Remove("LOTNO");
                             length--;
                             break;
                         case "MPN":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pr_vendprodcode"];
-                            field = "pr_vendprodcode";
                             Matchstr = MatchStr(data[j], "MPN");
                             //采集的供应商号不匹配的话
                             if (cell.Value.ToString() != Matchstr)
@@ -783,7 +779,6 @@ namespace UAS_LabelMachine
                             break;
                         case "QTY":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_qty"];
-                            field = "pib_qty";
                             Matchstr = MatchStr(data[j], "QTY");
                             //如果采集的数量不相等的话
                             if (cell.Value.ToString() != Matchstr)
@@ -818,7 +813,7 @@ namespace UAS_LabelMachine
                         if (kind != "MPN" && kind != "QTY")
                         {
                             DataTable dt = (DataTable)MidSource.DataSource;
-                            dt.Rows[cell.RowIndex][field] = Matchstr;
+                            cell.Value = Matchstr;
                             MatchResult = "成功";
                         }
                         else

UAS_DeviceMonitor/Main.Designer.cs

@@ -31,19 +31,34 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
             this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
             this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
-            this.DeviceList = new DevExpress.XtraBars.BarButtonItem();
-            this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
+            this.ButtonDeviceList = new DevExpress.XtraBars.BarButtonItem();
+            this.ButtonDeviceKind = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonGroup1 = new DevExpress.XtraBars.BarButtonGroup();
-            this.barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
+            this.ButtonDeviceStatus = new DevExpress.XtraBars.BarButtonItem();
+            this.ButtonCommandSet = new DevExpress.XtraBars.BarButtonItem();
+            this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
             this.DeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.RibDeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.DeviceCommandSetting = new DevExpress.XtraBars.Ribbon.RibbonPage();
+            this.RibDeviceCommand = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPage2 = new DevExpress.XtraBars.Ribbon.RibbonPage();
+            this.RibDeviceBadInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonStatusBar = new DevExpress.XtraBars.Ribbon.RibbonStatusBar();
             this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.MainTabControl = new DevExpress.XtraTab.XtraTabControl();
+            this.PageDeviceList = new DevExpress.XtraTab.XtraTabPage();
+            this.PageCommandSet = new DevExpress.XtraTab.XtraTabPage();
+            this.PageDeviceKind = new DevExpress.XtraTab.XtraTabPage();
+            this.PageDeviceStatus = new DevExpress.XtraTab.XtraTabPage();
+            this.GridDeviceList = new DevExpress.XtraGrid.GridControl();
+            this.GridViewDeviceList = new DevExpress.XtraGrid.Views.Grid.GridView();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
+            this.MainTabControl.SuspendLayout();
+            this.PageDeviceList.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.GridDeviceList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceList)).BeginInit();
             this.SuspendLayout();
             // 
             // ribbon
@@ -54,15 +69,18 @@
             this.ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
             this.ribbon.ExpandCollapseItem,
             this.barButtonItem1,
-            this.DeviceList,
-            this.barButtonItem2,
+            this.ButtonDeviceList,
+            this.ButtonDeviceKind,
             this.barButtonGroup1,
-            this.barButtonItem3});
+            this.ButtonDeviceStatus,
+            this.ButtonCommandSet,
+            this.barButtonItem5});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
-            this.ribbon.MaxItemId = 9;
+            this.ribbon.MaxItemId = 11;
             this.ribbon.Name = "ribbon";
             this.ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
             this.DeviceInf,
+            this.DeviceCommandSetting,
             this.ribbonPage2});
             this.ribbon.Size = new System.Drawing.Size(1033, 128);
             this.ribbon.StatusBar = this.ribbonStatusBar;
@@ -75,23 +93,25 @@
             this.barButtonItem1.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem1.LargeGlyph")));
             this.barButtonItem1.Name = "barButtonItem1";
             // 
-            // DeviceList
+            // ButtonDeviceList
             // 
-            this.DeviceList.Caption = "设备清单";
-            this.DeviceList.Id = 5;
-            this.DeviceList.LargeGlyph = global::UAS_DeviceMonitor.Properties.Resources.netstatus_tx_64px_18991_easyicon_net;
-            this.DeviceList.Name = "DeviceList";
-            this.DeviceList.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
+            this.ButtonDeviceList.Caption = "设备清单";
+            this.ButtonDeviceList.Id = 5;
+            this.ButtonDeviceList.LargeGlyph = global::UAS_DeviceMonitor.Properties.Resources.netstatus_tx_64px_18991_easyicon_net;
+            this.ButtonDeviceList.Name = "ButtonDeviceList";
+            this.ButtonDeviceList.Tag = "PageDeviceList";
+            this.ButtonDeviceList.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
             // 
-            // barButtonItem2
+            // ButtonDeviceKind
             // 
-            this.barButtonItem2.Caption = "设备类型维护";
-            this.barButtonItem2.Glyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem2.Glyph")));
-            this.barButtonItem2.Id = 6;
-            this.barButtonItem2.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem2.LargeGlyph")));
-            this.barButtonItem2.Name = "barButtonItem2";
-            this.barButtonItem2.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
-            this.barButtonItem2.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
+            this.ButtonDeviceKind.Caption = "设备类型维护";
+            this.ButtonDeviceKind.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceKind.Glyph")));
+            this.ButtonDeviceKind.Id = 6;
+            this.ButtonDeviceKind.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceKind.LargeGlyph")));
+            this.ButtonDeviceKind.Name = "ButtonDeviceKind";
+            this.ButtonDeviceKind.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+            this.ButtonDeviceKind.Tag = "PageDeviceKind";
+            this.ButtonDeviceKind.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
             // 
             // barButtonGroup1
             // 
@@ -101,35 +121,77 @@
             this.barButtonGroup1.LargeGlyph = global::UAS_DeviceMonitor.Properties.Resources.Png_Device;
             this.barButtonGroup1.Name = "barButtonGroup1";
             // 
-            // barButtonItem3
+            // ButtonDeviceStatus
             // 
-            this.barButtonItem3.Caption = "运行状态";
-            this.barButtonItem3.Glyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem3.Glyph")));
-            this.barButtonItem3.Id = 8;
-            this.barButtonItem3.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem3.LargeGlyph")));
-            this.barButtonItem3.Name = "barButtonItem3";
-            this.barButtonItem3.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
+            this.ButtonDeviceStatus.Caption = "运行状态";
+            this.ButtonDeviceStatus.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceStatus.Glyph")));
+            this.ButtonDeviceStatus.Id = 8;
+            this.ButtonDeviceStatus.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceStatus.LargeGlyph")));
+            this.ButtonDeviceStatus.Name = "ButtonDeviceStatus";
+            this.ButtonDeviceStatus.Tag = "PageDeviceStatus";
+            this.ButtonDeviceStatus.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
+            // 
+            // ButtonCommandSet
+            // 
+            this.ButtonCommandSet.Caption = "指令设置";
+            this.ButtonCommandSet.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.Glyph")));
+            this.ButtonCommandSet.Id = 9;
+            this.ButtonCommandSet.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.LargeGlyph")));
+            this.ButtonCommandSet.Name = "ButtonCommandSet";
+            this.ButtonCommandSet.Tag = "PageCommandSet";
+            this.ButtonCommandSet.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
+            // 
+            // barButtonItem5
+            // 
+            this.barButtonItem5.Caption = "故障信息维护";
+            this.barButtonItem5.Glyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem5.Glyph")));
+            this.barButtonItem5.Id = 10;
+            this.barButtonItem5.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem5.LargeGlyph")));
+            this.barButtonItem5.Name = "barButtonItem5";
+            this.barButtonItem5.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
             // 
             // DeviceInf
             // 
             this.DeviceInf.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
-            this.ribbonPageGroup2});
+            this.RibDeviceInf});
             this.DeviceInf.Name = "DeviceInf";
             this.DeviceInf.Text = "设备信息";
             // 
-            // ribbonPageGroup2
+            // RibDeviceInf
+            // 
+            this.RibDeviceInf.AllowTextClipping = false;
+            this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceList);
+            this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceKind);
+            this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceStatus);
+            this.RibDeviceInf.Name = "RibDeviceInf";
+            this.RibDeviceInf.ShowCaptionButton = false;
+            // 
+            // DeviceCommandSetting
             // 
-            this.ribbonPageGroup2.AllowTextClipping = false;
-            this.ribbonPageGroup2.ItemLinks.Add(this.DeviceList);
-            this.ribbonPageGroup2.ItemLinks.Add(this.barButtonItem2);
-            this.ribbonPageGroup2.ItemLinks.Add(this.barButtonItem3);
-            this.ribbonPageGroup2.Name = "ribbonPageGroup2";
-            this.ribbonPageGroup2.ShowCaptionButton = false;
+            this.DeviceCommandSetting.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
+            this.RibDeviceCommand});
+            this.DeviceCommandSetting.Name = "DeviceCommandSetting";
+            this.DeviceCommandSetting.Text = "设备指令配置";
+            this.DeviceCommandSetting.Visible = false;
+            // 
+            // RibDeviceCommand
+            // 
+            this.RibDeviceCommand.ItemLinks.Add(this.ButtonCommandSet);
+            this.RibDeviceCommand.Name = "RibDeviceCommand";
+            this.RibDeviceCommand.Text = "ribbonPageGroup3";
             // 
             // ribbonPage2
             // 
+            this.ribbonPage2.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
+            this.RibDeviceBadInf});
             this.ribbonPage2.Name = "ribbonPage2";
-            this.ribbonPage2.Text = "ribbonPage2";
+            this.ribbonPage2.Text = "设备故障监控";
+            // 
+            // RibDeviceBadInf
+            // 
+            this.RibDeviceBadInf.ItemLinks.Add(this.barButtonItem5);
+            this.RibDeviceBadInf.Name = "RibDeviceBadInf";
+            this.RibDeviceBadInf.Text = "ribbonPageGroup4";
             // 
             // ribbonStatusBar
             // 
@@ -155,9 +217,57 @@
             this.MainTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
             this.MainTabControl.Location = new System.Drawing.Point(0, 128);
             this.MainTabControl.Name = "MainTabControl";
+            this.MainTabControl.SelectedTabPage = this.PageDeviceList;
             this.MainTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.False;
             this.MainTabControl.Size = new System.Drawing.Size(1033, 552);
             this.MainTabControl.TabIndex = 3;
+            this.MainTabControl.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.PageDeviceList,
+            this.PageCommandSet,
+            this.PageDeviceKind,
+            this.PageDeviceStatus});
+            // 
+            // PageDeviceList
+            // 
+            this.PageDeviceList.Controls.Add(this.GridDeviceList);
+            this.PageDeviceList.Name = "PageDeviceList";
+            this.PageDeviceList.Size = new System.Drawing.Size(1027, 546);
+            this.PageDeviceList.Text = "xtraTabPage1";
+            // 
+            // PageCommandSet
+            // 
+            this.PageCommandSet.Name = "PageCommandSet";
+            this.PageCommandSet.Size = new System.Drawing.Size(1027, 546);
+            this.PageCommandSet.Text = "xtraTabPage1";
+            // 
+            // PageDeviceKind
+            // 
+            this.PageDeviceKind.Name = "PageDeviceKind";
+            this.PageDeviceKind.Size = new System.Drawing.Size(1027, 546);
+            this.PageDeviceKind.Text = "xtraTabPage2";
+            // 
+            // PageDeviceStatus
+            // 
+            this.PageDeviceStatus.Name = "PageDeviceStatus";
+            this.PageDeviceStatus.Size = new System.Drawing.Size(1027, 546);
+            this.PageDeviceStatus.Text = "xtraTabPage3";
+            // 
+            // GridDeviceList
+            // 
+            this.GridDeviceList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.GridDeviceList.Location = new System.Drawing.Point(0, 0);
+            this.GridDeviceList.MainView = this.GridViewDeviceList;
+            this.GridDeviceList.MenuManager = this.ribbon;
+            this.GridDeviceList.Name = "GridDeviceList";
+            this.GridDeviceList.Size = new System.Drawing.Size(1027, 546);
+            this.GridDeviceList.TabIndex = 0;
+            this.GridDeviceList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.GridViewDeviceList});
+            // 
+            // GridViewDeviceList
+            // 
+            this.GridViewDeviceList.GridControl = this.GridDeviceList;
+            this.GridViewDeviceList.Name = "GridViewDeviceList";
             // 
             // Main
             // 
@@ -174,8 +284,13 @@
             this.Ribbon = this.ribbon;
             this.StatusBar = this.ribbonStatusBar;
             this.Text = "设备监控管理平台";
+            this.Load += new System.EventHandler(this.Main_Load);
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).EndInit();
+            this.MainTabControl.ResumeLayout(false);
+            this.PageDeviceList.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.GridDeviceList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceList)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -188,13 +303,24 @@
         private DevExpress.XtraBars.BarButtonItem barButtonItem1;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
-        private DevExpress.XtraBars.BarButtonItem DeviceList;
+        private DevExpress.XtraBars.BarButtonItem ButtonDeviceList;
         private DevExpress.XtraBars.Ribbon.RibbonPage DeviceInf;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
-        private DevExpress.XtraBars.BarButtonItem barButtonItem2;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceInf;
+        private DevExpress.XtraBars.BarButtonItem ButtonDeviceKind;
         private DevExpress.XtraBars.BarButtonGroup barButtonGroup1;
-        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage2;
         private DevExpress.XtraTab.XtraTabControl MainTabControl;
-        private DevExpress.XtraBars.BarButtonItem barButtonItem3;
+        private DevExpress.XtraBars.BarButtonItem ButtonDeviceStatus;
+        private DevExpress.XtraBars.Ribbon.RibbonPage DeviceCommandSetting;
+        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage2;
+        private DevExpress.XtraBars.BarButtonItem ButtonCommandSet;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceCommand;
+        private DevExpress.XtraBars.BarButtonItem barButtonItem5;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceBadInf;
+        private DevExpress.XtraTab.XtraTabPage PageDeviceList;
+        private DevExpress.XtraTab.XtraTabPage PageCommandSet;
+        private DevExpress.XtraTab.XtraTabPage PageDeviceKind;
+        private DevExpress.XtraTab.XtraTabPage PageDeviceStatus;
+        private DevExpress.XtraGrid.GridControl GridDeviceList;
+        private DevExpress.XtraGrid.Views.Grid.GridView GridViewDeviceList;
     }
 }

UAS_DeviceMonitor/Main.cs

@@ -17,9 +17,38 @@ namespace UAS_DeviceMonitor
             InitializeComponent();
         }
 
+        private void Main_Load(object sender, EventArgs e)
+        {
+            //隐藏素有的Xpage
+            for (int i = 0; i < MainTabControl.TabPages.Count; i++)
+            {
+                MainTabControl.TabPages[i].PageVisible = false;
+            }
+        }
+
+        /// <summary>
+        /// 选项卡切换不同XPage
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonItem_ItemClick(object sender, ItemClickEventArgs e)
         {
+            HideXPage(e.Item.Tag.ToString());
+        }
 
+        /// <summary>
+        /// 根据点击按钮的Tag显示对应的XPage
+        /// </summary>
+        /// <param name="PageName"></param>
+        private void HideXPage(string PageName)
+        {
+            for (int i = 0; i < MainTabControl.TabPages.Count; i++)
+            {
+                if (MainTabControl.TabPages[i].Name == PageName)
+                    MainTabControl.TabPages[i].PageVisible = true;
+                else
+                    MainTabControl.TabPages[i].PageVisible = false;
+            }
         }
     }
 }

UAS_DeviceMonitor/Main.resx

@@ -185,7 +185,7 @@
         AzIX4bNMm0EgAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="barButtonItem2.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ButtonDeviceKind.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAATdEVYdFRpdGxlAFRhYmxlO0Zvcm1hdDvurMrjAAAC
@@ -204,7 +204,7 @@
         5ij/KEJ+A7zjIhnwnf68AAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="barButtonItem2.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ButtonDeviceKind.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAATdEVYdFRpdGxlAFRhYmxlO0Zvcm1hdDvurMrjAAAH
@@ -245,7 +245,7 @@
         z5X+PxSF4t+qN/szT9oWSwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="barButtonItem3.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ButtonDeviceStatus.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAVdEVYdFRpdGxlAEdhdWdlO0NpcmN1bGFyO9nUvNQA
@@ -257,7 +257,7 @@
         o6cNV7yK135vk1pzmldZbPtEYM1qGlfZhZD6r5+pzB9+5yT4ARH/KQWgyOnDAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="barButtonItem3.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ButtonDeviceStatus.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAVdEVYdFRpdGxlAEdhdWdlO0NpcmN1bGFyO9nUvNQA
@@ -275,6 +275,113 @@
         k+/QMwHMbkDtq1i6vYw+wlDU5FpNc9qWAMMh2IzmfV9GUnodb8JwCppA4weGQQ4ixU2I6TC8g1qvY+n8
         IBlMwc4K5iGGMWPsrh8k0vZJloKcF2PFmH0/yaTtozQPdBaMEWPV+ihNKDRbp2whD3gaHBtjGKvNXNQk
         YQmnyvVy01zcD5MC7lh3uWf3Qn+adfL/fpxeHtXAP2zZTBNbPKbVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="ButtonCommandSet.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAcdEVYdFRpdGxlAExlZ2VuZDtMZWdlbmRMb2NhdGlv
+        bjteupJQAAACXElEQVQ4T43Sy1NSYRgG8DM1lV3+H/sLWtRUuxbViLWq1AyzGiBRykxRLhpOi2a6mNNM
+        mdaMXLwCgahTUqsmzJaZoCLKncPl6X2/Axi7Fj+eM3Pe9/k+GKShkaDHNvoNT16zr8LQSEUQg6+CsL5k
+        K7C8WIH5+Reh/9mSV5Kkg1LP00WUAAV9VLNGqQwoCiUYhvyggkNS93BAvHg87IZ76RfmFxVzAcUsmVkg
+        gTXKNUz711Cklk6rTyl4aFsQBY9s84hsJ/dtJREWEghvknJO+X6iQAV6i5cLDkt8Fb7Sg8HZ8mJC4OGN
+        f/yJxAXXp1UUCkXoTB4uOCLpLT5xJYN1pnaBkxZYZZk5vauQqUBjdCsFHSavciXzNA1XTto/sWKdheOw
+        e0KQ80Xc653jgjpJO+BBvlBCh2mqdri8wPmbk3BOukPIyQXc6ZlVCtrpISvTd+p3QWt0UTqhMzrpmTmg
+        7XNCQ7R9DkpFKiOjtcvFBUerBdG9LHbiiijby2B7NytsCRlsxghlTUFb9zQyuYIyTCVd4yHox0LQvf0h
+        llYs5/F54CyWe88gwgWxNBJpGS2dTi44JqkNU0hl82KYT7r75jtcoRgabUGxsNx3GqnVEThaTiK8k0aE
+        xJMymu7bueC41NrpQjKTF8P8ssEcwDmDWwjvZOA3nIKjuR72pnpsRNMkhd1kDjd05YJmvZOulEc8JVft
+        MTqF8bCQyCGWyJKc+J2uaSaVApX6nftq+0dcaf+ARqK6PQFV2wQa1OPC5VvvhUutFWO4eHMMF66Peqig
+        jtC/iZv2nfhPtCwd+At2xfPrFtRf5wAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="ButtonCommandSet.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        /wJFMIQs8XmmmQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="barButtonItem5.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAidEVYdFRpdGxlAEdyaWQ7U3ByZWFkc2hlZXQ7Um93
+        O0NvbHVtbjtpiW5hAAAC0ElEQVQ4T4XTWUhUYRQH8OuaSxohZFSUUYOtEthTT1ngBgqlYdOilVvuVmSZ
+        qaS4YKaDyzip6UzqFFm5lFuaOqYzmqPmhIILKj7UpGKjk85oD//OVWd6MTrw4zv33u/8uXyXy1AZERNi
+        +h9bNlZjYgCAYTFRgi5JdGEPogq7iQyRT2WIEEgRUbAunC9FWH4nQvPWBWW3dlCAiT6A3SSZVEEyoUI7
+        rYKWcbRRr5PbNI5WWnUCstppijHTB9zM/bS2UTwwQ34gtnwQFV9mUEE9K0Y0oO8rFbPwTW9mA8z1Af5Z
+        beDVja5tvCvsx8co+78i7dEcbo/IYjkiiuRIeTMEblIjG2ChD7ia1owPYz/xvE+Jsn4lWiLsoZ0qh3ZS
+        BM1EKeqDDmJevYL5RaLWIpEnYQMs9QEXHzWgYWQeIrkSQtIQdADLYwJoRvnQTIqheJEGlXoZi0srtK6g
+        5NUAG7CNsF/OiPF6+A7x4kEE5kgRwJOixtcOVZft8Ja7FwpxOvoex6I/wB9SngByxTQaJSOo9/TM6fby
+        nqtxcb3AeMRUo3Z4DsU939b4ZXZgVqXFDJlfWIKMewmrPS2Y5mVgMI+PpgcpmMpMw0pnI9qc3eYY1+jX
+        qPo6B2GvEqW93xFZ8BmzC2yAhl5Zg+rbcZB7ueB3YTL6wvwhD7mB1fwEyDzOIGPn7lTGKVjUfjbsJVhO
+        ISwx7iTX4VbSe+SJulDbNIhi31DI3E9Dm30fmsx76HI+hQQb2yd0BuaEMSNWxHoT7GHZlhxzFA77+UAd
+        eh6/gs9hiOuNZxwHPj2zXPsU/0JlWso5kasIvI6l+BBUnjyCSsfDUMcFYOAKF/w9h7I3HdShMhfvO744
+        G3UNZQ4cuBsa84hAdHQ/lME+KLXlqDYd1KEySbWx8y3ZwZlxMzBKo+utxMrFwIhXtN1OmWi9i7vpoA6V
+        ARtCLAj7OxtuYHu6x5j+AYtUTbR+QGtEAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="barButtonItem5.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
 </value>
   </data>
 </root>

UAS_DeviceMonitor/UAS_DeviceMonitor.csproj

@@ -66,6 +66,7 @@
     <EmbeddedResource Include="Main.resx">
       <DependentUpon>Main.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -99,6 +100,7 @@
     <Folder Include="Device\Command\" />
     <Folder Include="Device\Information\" />
     <Folder Include="Device\Transfer\" />
+    <Folder Include="PublicMethod\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.