merge

jace.tang

2022-06-14 bd5297c64f39c360a7bf41435a88ae5e70840fc2

 CommonUtil.cs

@@ -6,6 +6,7 @@
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Forms;
using System.Threading;

namespace M423project
{
@@ -46,22 +47,22 @@
        private static object lockObj = new object();
        private static object logObj = new object();

        private static bool uploadDataEnable = true;
        //private static bool uploadDataEnable = true;

        public static bool UploadDataEnable
        {
            get
            {
                lock (lockObj) { return uploadDataEnable; }
            }
            set
            {
                lock (lockObj)
                {
                    uploadDataEnable = value;
                }
            } 
        }
        //public static bool UploadDataEnable
        //{
        //    get
        //    {
        //        lock (lockObj) { return uploadDataEnable; }
        //    }
        //    set
        //    {
        //        lock (lockObj)
        //        {
        //            uploadDataEnable = value;
        //        }
        //    } 
        //}

        private static DetectionOption detectionOption = DetectionOption.doProduct;

@@ -118,7 +119,11 @@
        /// 主窗体引用
        /// </summary>
        public static MainForm mainForm { get; set; }
 

        public static ManualResetEvent UploadDoneHandle = new ManualResetEvent(true);
        public static object UploadDataLock = new object();
        public static bool UploadDataEnable = true;

        static CommonUtil()
        {
            CurrentDir = Directory.GetCurrentDirectory();