From e5eef6ea2f997f6f2dfe5a7c165903080320ca82 Mon Sep 17 00:00:00 2001
From: NXX <447201003@qq>
Date: Thu, 3 Nov 2022 14:04:48 +0800
Subject: [PATCH] morkf

---
 BPASmartClient.MorkBF/Class1.cs                      | 8 --------
 BPASmartClient.MorkF/View/LocalMenu.xaml             | 4 ++--
 BPASmartClient.MorkF/View/LocalMenu.xaml.cs          | 1 +
 BPASmartClient.MorkF/ViewModel/DebugViewModel.cs     | 2 +-
 BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs | 5 +++++
 5 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 BPASmartClient.MorkBF/Class1.cs

diff --git a/BPASmartClient.MorkBF/Class1.cs b/BPASmartClient.MorkBF/Class1.cs
deleted file mode 100644
index cb4f64cb..00000000
--- a/BPASmartClient.MorkBF/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace BPASmartClient.MorkBF
-{
-    public class Class1
-    {
-    }
-}
diff --git a/BPASmartClient.MorkF/View/LocalMenu.xaml b/BPASmartClient.MorkF/View/LocalMenu.xaml
index 63b2f2f4..c459fe0f 100644
--- a/BPASmartClient.MorkF/View/LocalMenu.xaml
+++ b/BPASmartClient.MorkF/View/LocalMenu.xaml
@@ -25,7 +25,7 @@
                                     <ColumnDefinition/>
                                     <ColumnDefinition/>
                                 </Grid.ColumnDefinitions>
-                                <TextBox Grid.Column="0" Text="{Binding FryTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <TextBox Grid.Column="0" Text="{Binding FryTime}" HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 <TextBox Grid.Column="1" Text="{Binding During}" Margin="10,0"/>
                                 <ComboBox Grid.Column="2" Width="120" ItemsSource="{Binding DataContext.strPotActions , RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
                                       SelectedValue="{Binding Actions}" Margin="10,0"/>
@@ -72,7 +72,7 @@
         </Grid>
         <ListBox x:Name="listview1" Grid.Row="2"  BorderBrush="Black" BorderThickness="0" HorizontalAlignment="Center"  AllowDrop="True"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding PotActionStep}" Margin=" 10" Background="Transparent"
-                 PreviewMouseMove="listview1_MouseMove" Drop="listview1_Drop" PreviewMouseUp="listview1_MouseLeftButtonUp"
+                 
                  >
             
         </ListBox>
diff --git a/BPASmartClient.MorkF/View/LocalMenu.xaml.cs b/BPASmartClient.MorkF/View/LocalMenu.xaml.cs
index 8c0c001d..d2d6de00 100644
--- a/BPASmartClient.MorkF/View/LocalMenu.xaml.cs
+++ b/BPASmartClient.MorkF/View/LocalMenu.xaml.cs
@@ -43,6 +43,7 @@ namespace BPASmartClient.MorkF.View
         public LocalMenu()
         {
             InitializeComponent();
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "LocalMenuClose");
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
diff --git a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
index 2d398acc..003227d0 100644
--- a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
+++ b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
@@ -236,7 +236,7 @@ namespace BPASmartClient.MorkF.ViewModel
 
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                 variableMonitors = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
+                 //variableMonitors = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
 
                 if(variableMonitors != null)
                 {
diff --git a/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs b/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs
index 75225ebe..53e8ad0e 100644
--- a/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs
+++ b/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs
@@ -33,6 +33,10 @@ namespace BPASmartClient.MorkF.ViewModel
             {
                 PotActionStep.Remove(p);
             }
+            for (int i = 0; i < PotActionStep.Count; i++)
+            {
+                PotActionStep[i].FryTime = i + 1;
+            }
         }
 
 
@@ -61,6 +65,7 @@ namespace BPASmartClient.MorkF.ViewModel
                 Json<LocalPotStep>.Data.LocalstirFryGoods.GoodsKey = 11;
                 Json<LocalPotStep>.Data.LocalstirFryGoods.StirPotActions = new List<PotActions>(PotActionStep);
                 Json<LocalPotStep>.Save();
+                ActionManage.GetInstance.Send("LocalMenuClose");
             }));
 
             foreach(var pot in Enum.GetNames(typeof(StirFryPotActionEnum)))