添加请求解锁功能
This commit is contained in:
commit
9a60d77c84
9 files changed
+39
-2
No files matched your search
+2
-1
@@ -126,7 +126,8 @@
|
|||||||
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,220,5"
|
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,220,5"
|
||||||
Source="/link.png" Visibility="{Binding Link_bool}"/>
|
Source="/link.png" Visibility="{Binding Link_bool}"/>
|
||||||
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,270,5"
|
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,270,5"
|
||||||
Source="/LOCK.png" Visibility="{Binding Lock_bool}"/>
|
Source="/LOCK.png" Visibility="{Binding Lock_bool}" MouseLeftButtonDown="Image_MouseLeftButtonDown"
|
||||||
|
MouseLeftButtonUp="Image_MouseLeftButtonUp"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
+10
-1
@@ -198,6 +198,15 @@ namespace DyeingComputer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Image_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
((Image)sender).RenderTransform = new ScaleTransform(0.9,0.9);
|
||||||
|
}
|
||||||
|
private void Image_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
((Image)sender).RenderTransform = Transform.Identity;
|
||||||
|
MainWindowViewModel.UserInfoStart = 901;
|
||||||
|
MainWindowViewModel.UserInfo = Properties.Resources.Unlock;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Generated
+9
@@ -1284,6 +1284,15 @@ namespace DyeingComputer.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Unlock 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string Unlock {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Unlock", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 value 的本地化字符串。
|
/// 查找类似 value 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -549,4 +549,7 @@
|
|||||||
<data name="RUN" xml:space="preserve">
|
<data name="RUN" xml:space="preserve">
|
||||||
<value>RUN</value>
|
<value>RUN</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Unlock" xml:space="preserve">
|
||||||
|
<value>Unlock</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -549,4 +549,7 @@
|
|||||||
<data name="RUN" xml:space="preserve">
|
<data name="RUN" xml:space="preserve">
|
||||||
<value>RUN</value>
|
<value>RUN</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Unlock" xml:space="preserve">
|
||||||
|
<value>Unlock</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -549,4 +549,7 @@
|
|||||||
<data name="RUN" xml:space="preserve">
|
<data name="RUN" xml:space="preserve">
|
||||||
<value>运行</value>
|
<value>运行</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Unlock" xml:space="preserve">
|
||||||
|
<value>解锁</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -549,4 +549,7 @@
|
|||||||
<data name="RUN" xml:space="preserve">
|
<data name="RUN" xml:space="preserve">
|
||||||
<value>運行</value>
|
<value>運行</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Unlock" xml:space="preserve">
|
||||||
|
<value />
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -469,6 +469,8 @@ namespace DyeingComputer.UserClass
|
|||||||
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
|
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
|
||||||
Chart_new.Add("ERR", MainWindowViewModel.ERR_JOG);
|
Chart_new.Add("ERR", MainWindowViewModel.ERR_JOG);
|
||||||
Chart_new.Add("UserButton", MainWindowViewModel._UserButton);
|
Chart_new.Add("UserButton", MainWindowViewModel._UserButton);
|
||||||
|
Chart_new.Add("UserInfoStart", MainWindowViewModel.UserInfoStart);
|
||||||
|
Chart_new.Add("UserInfo", MainWindowViewModel.UserInfo);
|
||||||
Chart_new.Add("WORK_RUN", MainWindowViewModel.WORK_RUN);
|
Chart_new.Add("WORK_RUN", MainWindowViewModel.WORK_RUN);
|
||||||
Chart_new.Add("RUN_STEPID", MainWindowViewModel.RUN_STEPID);
|
Chart_new.Add("RUN_STEPID", MainWindowViewModel.RUN_STEPID);
|
||||||
Chart_new.Add("LOCK", MainWindowViewModel._Lock_bool);
|
Chart_new.Add("LOCK", MainWindowViewModel._Lock_bool);
|
||||||
@@ -492,6 +494,8 @@ namespace DyeingComputer.UserClass
|
|||||||
Chart_new.Add("STLC", MainWindowViewModel.Selet_dtm("1019"));
|
Chart_new.Add("STLC", MainWindowViewModel.Selet_dtm("1019"));
|
||||||
client.SendAsync("SC830" + "[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
|
client.SendAsync("SC830" + "[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
|
||||||
MainWindowViewModel.TX++;
|
MainWindowViewModel.TX++;
|
||||||
|
|
||||||
|
MainWindowViewModel.UserInfoStart = 900;
|
||||||
}
|
}
|
||||||
catch (Exception ex) { client.SendAsync("SC931" + "[" + MainWindowViewModel.S01 + "]" + ex); }
|
catch (Exception ex) { client.SendAsync("SC931" + "[" + MainWindowViewModel.S01 + "]" + ex); }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,6 +80,8 @@ namespace DyeingComputer.ViewModel
|
|||||||
public static string SYSKEY;
|
public static string SYSKEY;
|
||||||
public static UInt32 RX = 0;
|
public static UInt32 RX = 0;
|
||||||
public static UInt32 TX = 0;
|
public static UInt32 TX = 0;
|
||||||
|
public static int UserInfoStart = 900;
|
||||||
|
public static string UserInfo;
|
||||||
public ICommand ProgramgroupView_stop { get; }
|
public ICommand ProgramgroupView_stop { get; }
|
||||||
bool _isInteractive;
|
bool _isInteractive;
|
||||||
public bool IsInteractive//步骤表交互选择
|
public bool IsInteractive//步骤表交互选择
|
||||||
|
|||||||
Reference in new issue
Block a user