diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index 21014f94..57758a1a 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -21,6 +21,8 @@
+
+
@@ -225,6 +227,8 @@
+
+
diff --git a/BPASmartClient.CustomResource/Fonts/MT/iconfont.ttf b/BPASmartClient.CustomResource/Fonts/MT/iconfont.ttf
new file mode 100644
index 00000000..a790bcd4
Binary files /dev/null and b/BPASmartClient.CustomResource/Fonts/MT/iconfont.ttf differ
diff --git a/BPASmartClient.CustomResource/Fonts/naicha.ttf b/BPASmartClient.CustomResource/Fonts/naicha.ttf
new file mode 100644
index 00000000..a790bcd4
Binary files /dev/null and b/BPASmartClient.CustomResource/Fonts/naicha.ttf differ
diff --git a/BPASmartClient.CustomResource/Image/背景矢量/beijing.png b/BPASmartClient.CustomResource/Image/背景矢量/beijing.png
new file mode 100644
index 00000000..15d57a81
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/背景矢量/beijing.png differ
diff --git a/BPASmartClient.CustomResource/Themes/MyStyle.xaml b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
index acdc7f56..d18e74e3 100644
--- a/BPASmartClient.CustomResource/Themes/MyStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
@@ -797,6 +797,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPASmartClient.MilkWithTea/MainWindow.xaml.cs b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs
new file mode 100644
index 00000000..bb1932c3
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MilkWithTea
+{
+ ///
+ /// Interaction logic for MainWindow.xaml
+ ///
+ public partial class MainWindow : Window
+ {
+ public MainWindow()
+ {
+ InitializeComponent();
+ }
+
+
+
+
+
+ private void Grid_MouseDown(object sender, MouseButtonEventArgs e)
+ {
+ this.DragMove();
+ }
+ }
+}
diff --git a/BPASmartClient.MilkWithTea/View/MainControlView.xaml b/BPASmartClient.MilkWithTea/View/MainControlView.xaml
new file mode 100644
index 00000000..8fc6f50c
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/View/MainControlView.xaml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs b/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs
new file mode 100644
index 00000000..54f586d6
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MilkWithTea.View
+{
+ ///
+ /// MainControlView.xaml 的交互逻辑
+ ///
+ public partial class MainControlView : UserControl
+ {
+ public MainControlView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/BPASmartClient.MorkT/View/DebugView.xaml b/BPASmartClient.MorkT/View/DebugView.xaml
index 6fa9be9b..2dbc12ff 100644
--- a/BPASmartClient.MorkT/View/DebugView.xaml
+++ b/BPASmartClient.MorkT/View/DebugView.xaml
@@ -24,12 +24,12 @@
-
-
-
+
+
+
-
@@ -91,15 +91,15 @@
-
-
-
+
+
冰淇淋
-
- 模式
-
+ 模式
+
@@ -224,8 +224,8 @@
-->
-
-
@@ -275,26 +275,25 @@
Text="{Binding CaffeeFault}" Height="22" Width="60" />
-
+
饮品
-
-
-
-
+
模式
-
-
@@ -307,11 +306,11 @@
Margin="0,0,0,10" HorizontalAlignment="Left" Width="1000">
-
-
diff --git a/BPASmartClient.MorkTM/BPASmartClient.MorkTM.csproj b/BPASmartClient.MorkTM/BPASmartClient.MorkTM.csproj
index 0115625e..c10b5d75 100644
--- a/BPASmartClient.MorkTM/BPASmartClient.MorkTM.csproj
+++ b/BPASmartClient.MorkTM/BPASmartClient.MorkTM.csproj
@@ -45,4 +45,8 @@
+
+
+
+
diff --git a/BPASmartClient.MorkTM/Control_MorkTM.cs b/BPASmartClient.MorkTM/Control_MorkTM.cs
index bf6da5a4..7567c424 100644
--- a/BPASmartClient.MorkTM/Control_MorkTM.cs
+++ b/BPASmartClient.MorkTM/Control_MorkTM.cs
@@ -17,11 +17,17 @@ namespace BPASmartClient.MorkTM
public override global::BPA.Message.Enum.DeviceClientType DeviceType { get { return BPA.Message.Enum.DeviceClientType.TMC_MT; } }
GVL_MorkTM morkTM = new GVL_MorkTM();
+
+ PolymerBatching polymer = new PolymerBatching();
+
+ //浮点数放大倍数
+ const int expand = 100;
+
public override void DoMain()
{
ServerInit();
DataParse();
- PolymerBatching.GetMaterialInfo();
+ polymer.GetMaterialInfo();
ActionManage.GetInstance.Register(new Action
-
+
diff --git a/BPASmartClient/DeviceInfo.xml b/BPASmartClient/DeviceInfo.xml
index 4fae7d09..f56b3e6b 100644
--- a/BPASmartClient/DeviceInfo.xml
+++ b/BPASmartClient/DeviceInfo.xml
@@ -85,6 +85,17 @@
-->-->
+
+
+
+
+ 192.168.6.1
+ 502
+ M,M0.1,1;M,M1.0,8;M,M2.0,9;M,M8.0,4;M,M13.5,1;M,M16.0,7;
+
+
+
+