？？？

Project.FLY.AppHelper/FLY.AppHelper/AppJustOne.cs

@@ -25,7 +25,7 @@ namespace FLY.AppHelper
                                           (p.ProcessName == process.ProcessName) &&
                                           (p.Id != process.Id) &&
                                           (p.MainModule.FileName == process.MainModule.FileName) &&
-                                          (p.HasExited)
+                                          (!p.HasExited)
                                       select p;
             try
             {

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Converter/ControllerStateConverter.cs

@@ -32,7 +32,7 @@ namespace ThickTcpUiInWindow.Converter
                 case CTRL_STATE.CORR:
                     return Application.Current.FindResource("strCSCorr");
                 case CTRL_STATE.GETSAMPLE:
-                    return Application.Current.FindResource("strCSGetSampl");
+                    return Application.Current.FindResource("strCSGetSample");
                 case CTRL_STATE.RUNNING:
                     return Application.Current.FindResource("strCSRunning");
                 case CTRL_STATE.DISCONNECTED:

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_Boltmap.xaml.cs

@@ -81,7 +81,7 @@ namespace ThickTcpUiInWindow
 
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 mBoltMapService.ApplyBorder();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",
@@ -92,7 +92,7 @@ namespace ThickTcpUiInWindow
 
         private void button_createimg_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 Window_BoltCreate w = new Window_BoltCreate();
                 w.Init(mBoltMapService, mInitParamService);

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_Curve.xaml.cs

@@ -95,7 +95,7 @@ namespace ThickTcpUiInWindow
 
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 mCurveService.Apply();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_CurveModify.xaml.cs

@@ -312,7 +312,7 @@ namespace ThickTcpUiInWindow
 
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 mCurveService.Apply();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_FlyAD.xaml.cs

@@ -60,7 +60,7 @@ namespace ThickTcpUiInWindow
 
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(2))
+            if (Window_Password.Authorize(10))
             {
                 mFlyADService.Apply();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_GageInfo.xaml.cs

@@ -414,7 +414,7 @@ namespace ThickTcpUiInWindow
         }
         void button_start_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 if (mGageInfoService.IsRunning)
                     mGageInfoService.Stop();

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_GetSample.xaml.cs

@@ -65,7 +65,7 @@ namespace ThickTcpUiInWindow
 
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 mGetSampleService.Apply();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_Initparam.xaml.cs

@@ -45,7 +45,7 @@ namespace ThickTcpUiInWindow
         }
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 mInitParamService.Apply();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_ScanWarning.xaml.cs

@@ -47,7 +47,7 @@ namespace ThickTcpUiInWindow
 
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 mScanWarningService.Apply();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_WarningSystem.xaml.cs

@@ -30,7 +30,7 @@ namespace ThickTcpUiInWindow
 
         private void button_apply_Click(object sender, RoutedEventArgs e)
         {
-            if (Window_Password.Authorize(1))
+            if (Window_Password.Authorize(2))
             {
                 mWarningService.Apply();
                 FLY.ControlLibrary.Window_Tip.Show("应用成功",

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Window_Password.xaml.cs

@@ -66,21 +66,25 @@ namespace ThickTcpUiInWindow
             switch (r) 
             {
                 case AUTHORIZE_RESULT.OK:
-                    this.DialogResult = true;
+                    {
                         mPwKeep.SetPSK(PSK);
-                    break;
+                        this.DialogResult = true;
+                        this.Close();
+                        return;
+                    }
                 case AUTHORIZE_RESULT.ERR_LEVEL:
-                    FLY.ControlLibrary.Window_WarningTip.Show("错误", "权限不足",
+                    {
+                        FLY.ControlLibrary.Window_WarningTip.Show("错误", $"权限不足 需要Lv{Level}以上密码",
                             TimeSpan.FromSeconds(2));
-                    this.DialogResult = false;
-                    break;
+                        return;
+                    }
                 case AUTHORIZE_RESULT.ERR_PW:
+                    {
                         FLY.ControlLibrary.Window_WarningTip.Show("错误", "密码错误",
-TimeSpan.FromSeconds(2));
-                    this.DialogResult = false;
-                    break;
+                            TimeSpan.FromSeconds(2));
+                        return;
+                    }
             }
-            this.Close();
             return;
         }
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Window_PasswordEdit.xaml.cs

@@ -81,7 +81,7 @@ namespace ThickTcpUiInWindow
 
         public int Level { get; set; }
 
-        public int[] Levels { get; } = new int[] { 0, 1 };
+        public int[] Levels { get; } = new int[] { 0, 1, 2 };
         PasswordService mPasswordService = null;
 
 
@@ -106,17 +106,15 @@ namespace ThickTcpUiInWindow
             }
             else if (mPasswordService.PWs.Exists(pw => pw.Password == PSK))
             {
-                FLY.ControlLibrary.Window_WarningTip.Show("错误", "此密码已经存在",
-                     TimeSpan.FromSeconds(2));
-                return false;
+                //此密码已经存在
+                //把它改级别
+                PasswordCell pc = mPasswordService.PWs.Find(pw => pw.Password == PSK);
+                if (pc != null)
+                    pc.Level = Level;
+                mPasswordService.Apply();
+                return true;
             }
-            //else if (Level)
-            //{
-            //    FLY.ControlLibrary.Window_WarningTip.Show("错误", "请选择密码级别",
-            //        TimeSpan.FromSeconds(2));
-            //    return false;
-            //}
-            //else
+            else
             {
                 
                 //删除全部level=1的密码

Project.FLY.Thick.Base/FLY.Thick.Base/Server/GM_Fix.cs

@@ -85,8 +85,8 @@ namespace FLY.Thick.Base.Server
             while (data.Count()>0)
             {
                 int cnt = (data.Count() > size) ? size : data.Count();
-                var ADs2 = data.Take(cnt);
-                var thicks2 = thicks.Take(cnt);
+                int[] ADs2 = data.Take(cnt).ToArray();
+                double[] thicks2 = thicks.Take(cnt).ToArray();
 
                 data.RemoveRange(0, cnt);
                 thicks.RemoveRange(0, cnt);
@@ -96,8 +96,8 @@ namespace FLY.Thick.Base.Server
                     {
                         time = dt,
                         ts = ts,
-                        ADs = ADs2.ToArray(),
-                        thicks = thicks2.ToArray()
+                        ADs = ADs2,
+                        thicks = thicks2
                     });
                 dt += TimeSpan.FromTicks(cnt * ts.Ticks);
             }