morkBF

BPASmartClient.MorkBF/Control_MorkBF.cs

@@ -1095,24 +1095,24 @@ namespace BPASmartClient.MorkBF
                 statsModels.Add(new StatsModel() { Name = "帝王蟹", Count = 666 });
                 ScreenModelMaxWok maxWok = new ScreenModelMaxWok
                 {
-                    IsRun = new Random().Next(0, 2) == 0 ? IsRun.运行 : IsRun.停止,
-                    WorkStatus_1 = (WorkStatus)new Random().Next(0, 3),
-                    WorkStatus_2 = (WorkStatus)new Random().Next(0, 3),
-                    RobotStatu = (WorkStatus)new Random().Next(0, 3),
+                    IsRun = IsHealth ? IsRun.运行 : IsRun.停止,
+                    WorkStatus_1 = morkBF.FirePot1_Temperature > 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_2 = morkBF.FirePot2_Temperature > 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    RobotStatu = morkBF.Robot_ActionCallback == 0? WorkStatus.待机 : WorkStatus.工作,
                     Alarm = new List<AlarmModel>(),
                     FailuresCount = 0,
                     StatsCount = statsModels,
                     MaxWok_Dishes_1 = "满汉全席",
                     MaxWok_Dishes_2 = "海鲜大餐",
-                    MaxWok_Task_1 = "炒制菜品",
-                    MaxWok_Task_2 = "热油",
+                    MaxWok_Task_1 = "无",
+                    MaxWok_Task_2 = "无",
                     MaxWok_Process_1 = new List<ProcessModel>(),
-                    MaxWok_HeatGear_1 = new Random().Next(0, 5).ToString(),
-                    MaxWok_HeatGear_2 = new Random().Next(0, 5).ToString(),
-                    MaxWok_StirGear_1 = new Random().Next(0, 5).ToString(),
-                    MaxWok_StirGear_2 = new Random().Next(0, 5).ToString(),
-                    MaxWok_FlipSpeed_1 = new Random().Next(250, 450).ToString(),
-                    MaxWok_FlipSpeed_2 = new Random().Next(250, 450).ToString(),
+                    MaxWok_HeatGear_1 = morkBF.FirePot1_FireGear.ToString(),
+                    MaxWok_HeatGear_2 = morkBF.FirePot2_FireGear.ToString(),
+                    MaxWok_StirGear_1 = morkBF.FirePot1_StirGear.ToString(),
+                    MaxWok_StirGear_2 = morkBF.FirePot2_StirGear.ToString(),
+                    MaxWok_FlipSpeed_1 = morkBF.FirePot1_FlipSpeed.ToString(),
+                    MaxWok_FlipSpeed_2 = morkBF.FirePot2_FlipSpeed.ToString(),
                     MaxWok_Temp_1 = new Random().Next(250, 450).ToString(),
                     MaxWok_Temp_2 = new Random().Next(250, 450).ToString(),
                     MaxWok_OrderCount_1 = 2,

BPASmartClient.MorkBF/GVL_MorkBF.cs

@@ -149,6 +149,11 @@ namespace BPASmartClient.MorkBF
         /// </summary>
         [VariableMonitor("1#炒锅在洗锅位置反馈", "M22.2", "498")]
         public bool FirePot1_PotOnCleanPosition{ get; set; }
+
+        public int FirePot1_FireGear { get; set; } = 0;
+        public int FirePot1_StirGear { get; set; } = 0;
+        public int FirePot1_FlipSpeed { get; set; } = 0;
+
         #endregion
 
         #region 炒锅2读取数据
@@ -258,7 +263,11 @@ namespace BPASmartClient.MorkBF
         /// </summary>
         [VariableMonitor("2#炒锅在洗锅位置反馈", "M27.2", "538")]
         public bool FirePot2_PotOnCleanPosition{ get; set; }
-        #endregion
+
+        public int FirePot2_FireGear { get; set; } = 0;
+        public int FirePot2_StirGear { get; set; } = 0;
+
+        public int FirePot2_FlipSpeed { get; set; } = 0;
 
         #region 机器人数据读取
         public bool Robot_IsBusy;