sc
/
DyeingComputer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

master
sc 2 months ago
parent
77288bdf85 1806a35687
commit
58f457c305
4 changed files with 50 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      MainWindow.xaml
  2. 10
      MainWindow.xaml.cs
  3. 30
      UserClass/AsyncTcpServer.cs
  4. 8
      ViewModel/MainWindowViewModel.cs

20
MainWindow.xaml
View File

@ -186,9 +186,23 @@
MouseLeftButtonUp="Image_MouseLeftButtonUp" VerticalAlignment="Center"/> MouseLeftButtonUp="Image_MouseLeftButtonUp" VerticalAlignment="Center"/>
<Image Height="40" VerticalAlignment="Center" Width="40" Source="/Lmage/link.png" <Image Height="40" VerticalAlignment="Center" Width="40" Source="/Lmage/link.png"
Visibility="{Binding Link_bool}"/> Visibility="{Binding Link_bool}"/>
<Image Height="40" VerticalAlignment="Center" Width="40" Source="/Lmage/IconParkAutoFocus.png" <Image Height="40" Width="40" VerticalAlignment="Center" FlowDirection="LeftToRight"
Visibility="{Binding AUTO_bool}" MouseLeftButtonDown="Image_MouseLeftButtonDown_1" MouseLeftButtonDown="Image_MouseLeftButtonDown_1"
MouseLeftButtonUp="Image_MouseLeftButtonUp_1"/> MouseLeftButtonUp="Image_MouseLeftButtonUp_1">
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="/Lmage/IconParkAutoFocus.png"/>
<Style.Triggers>
<DataTrigger Binding="{Binding AUTO_bool}" Value="false">
<Setter Property="Source" Value="/Lmage/IconParkAutoFocus.png"/>
</DataTrigger>
<DataTrigger Binding="{Binding AUTO_bool}" Value="true">
<Setter Property="Source" Value="/Lmage/Hand.png"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>

10
MainWindow.xaml.cs
View File

@ -1,9 +1,10 @@
using DyeingComputer.UserClass; using DyeingComputer.UserClass;
using DyeingComputer.ViewModel;
using DyeingComputer.View; using DyeingComputer.View;
using DyeingComputer.ViewModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
@ -34,8 +35,7 @@ namespace DyeingComputer
MainWindowViewModel.ViewID = 1; MainWindowViewModel.ViewID = 1;
} }
private SQLiteHelper SQLiteHelpers = null; //定义数据库 public static SQLiteHelper SQLiteHelpers = null; //定义数据库
private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
/// <summary> /// <summary>
@ -197,7 +197,9 @@ namespace DyeingComputer
{ {
((Image)sender).RenderTransform = Transform.Identity; ((Image)sender).RenderTransform = Transform.Identity;
MainWindowViewModel.UserInfoStart = 901; MainWindowViewModel.UserInfoStart = 901;
MainWindowViewModel.UserInfo = Properties.Resources.Manual; if (MainWindowViewModel._AUTO_bool)
{ MainWindowViewModel.UserInfo = Properties.Resources.Auto; }
else { MainWindowViewModel.UserInfo = Properties.Resources.Manual; }
}//手动 }//手动
} }
} }

30
UserClass/AsyncTcpServer.cs
View File

@ -468,16 +468,32 @@ namespace DyeingComputer.UserClass
{ {
Dictionary<string, object> dat_829; Dictionary<string, object> dat_829;
dat_829 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT); dat_829 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
if (dat_829.GetValue("LOCK").ToString() == "True") if (dat_829.GetValue("NAME").ToString() == "LOCK") {
{ if (dat_829.GetValue("VALUE").ToString() == "True")
MainWindowViewModel._Lock_bool = true; {
client.SendAsync("SC829" + SYSKEY + SYSDAT); MainWindowViewModel._Lock_bool = true;
client.SendAsync("SC829" + SYSKEY + SYSDAT);
}
else
{
MainWindowViewModel._Lock_bool = false;
client.SendAsync("SC829" + SYSKEY + SYSDAT);
}
} }
else else if (dat_829.GetValue("NAME").ToString() == "AUTO")
{ {
MainWindowViewModel._Lock_bool = false; if (dat_829.GetValue("VALUE").ToString() == "True")
client.SendAsync("SC829" + SYSKEY + SYSDAT); {
MainWindowViewModel._AUTO_bool = true;
client.SendAsync("SC829" + SYSKEY + SYSDAT);
}
else
{
MainWindowViewModel._AUTO_bool = false;
client.SendAsync("SC829" + SYSKEY + SYSDAT);
}
} }
MainWindowViewModel.TX++; MainWindowViewModel.TX++;
APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令 APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
} }

8
ViewModel/MainWindowViewModel.cs
View File

@ -133,8 +133,8 @@ namespace DyeingComputer.ViewModel
} }
} }
public static bool _AUTO_bool; public static bool _AUTO_bool;
Visibility AUTO_bool_xml; //显示手自动状态 bool AUTO_bool_xml; //显示手自动状态
public Visibility AUTO_bool // public bool AUTO_bool //
{ {
get => AUTO_bool_xml; get => AUTO_bool_xml;
set set
@ -538,8 +538,8 @@ namespace DyeingComputer.ViewModel
else { Lock_bool = Visibility.Collapsed; }//锁图标 else { Lock_bool = Visibility.Collapsed; }//锁图标
if (_Link_bool) { Link_bool = Visibility.Visible; } if (_Link_bool) { Link_bool = Visibility.Visible; }
else { Link_bool = Visibility.Collapsed; }//连线图标 else { Link_bool = Visibility.Collapsed; }//连线图标
if (_AUTO_bool) { AUTO_bool = Visibility.Visible; Updata_dtd("3005",true); } if (_AUTO_bool) { AUTO_bool = _AUTO_bool; Updata_dtd("3005",true); }
else { AUTO_bool = Visibility.Collapsed; }//手自动图标 else { AUTO_bool = _AUTO_bool; }//手自动图标
if ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160)) if ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160))
{ ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERR101"); } //温度故障提示 { ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERR101"); } //温度故障提示

Write Preview
Loading…
Cancel
Save