章政 8 жил өмнө
parent
commit
9986dceb21

+ 0 - 3
UAS-出货标签管理/PublicMethod/AutoSizeFormClass.cs

@@ -44,7 +44,6 @@ namespace UAS_LabelMachine.PublicMethod
                 //**放在这里,是先记录控件本身,后记录控件的子控件
                 if (c.Controls.Count > 0)
                     AddControl(c);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
-                System.Console.WriteLine("初始位置:" + objCtrl.Left + "," + objCtrl.Top + "," + objCtrl.Width + "," + objCtrl.Height);
             }
         }
         //(3.2)控件自适应大小,
@@ -96,8 +95,6 @@ namespace UAS_LabelMachine.PublicMethod
                 if (c.Controls.Count > 0)
                 {
                     AutoScaleControl(c, wScale, hScale);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
-                    System.Console.WriteLine(c.GetType());
-                    System.Console.WriteLine("修改之后:" + c.Left + "," + c.Top + "," + c.Width + "," + c.Height);
                 }
             }
             if (ctl is DataGridView)

+ 2 - 2
UAS-出货标签管理/PublicMethod/DataHelper.cs

@@ -19,9 +19,9 @@ namespace UAS_LabelMachine
         //富为内网地址
         //private readonly string ConnectionStrings = "Data Source=192.168.0.88/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //富为外网地址
-        private readonly string ConnectionStrings = "Data Source=richwellgroup.com.cn/orcl;User ID=DATACENTER;PassWord=select!#%*(";
+        //private readonly string ConnectionStrings = "Data Source=richwellgroup.com.cn/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //怡海能达外网地址
-        //private readonly string ConnectionStrings = "Data Source=sz.hi-mantech.com/orcl;User ID=DATACENTER;PassWord=select!#%*(";
+        private readonly string ConnectionStrings = "Data Source=sz.hi-mantech.com/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //怡海能达内网地址
         //private readonly string ConnectionStrings = "Data Source=192.168.1.200/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //用户选择的数据库的连接字符串

+ 1 - 10
UAS-出货标签管理/PublicMethod/GlobalEventsHandler.cs

@@ -27,19 +27,10 @@ namespace UAS_Labeling.PublicMethod
             if (c != null && m.Msg == WM_LBUTTONDOWN && c is Button)
             {
                 LogManager.DoLog("点击【" + c.Text+"】");
-                if (CheckPower(c))
-                {
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
+                return CheckPower(c);
             }
             else
-            {
                 return false;
-            }
         }
 
         /// <summary>