From 3793a9a38ac6c4c4111c2bba3a35a71c30601e82 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 13 四月 2020 19:38:24 +0800
Subject: [PATCH] 上传个东西
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs
index 30a38e4..10f20ce 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs
@@ -326,27 +326,33 @@
taskInfo2.TaskType = 5;
taskInfo2.Data1 = 3;
taskInfo2.Data2 = listMode[selectModelIndex];
- listData.Add(taskInfo2);
-
- //娓╁害
- if (listMode[selectModelIndex] == 4)
- {
- //鍒剁儹
- var taskInfo3 = new Safeguard.TaskListInfo();
- taskInfo3.TaskType = 5;
- taskInfo3.Data1 = 4;
- taskInfo3.Data2 = listTemperature[selectTemperatureIndex] * 100;
+ listData.Add(taskInfo2);
+
+ //娓╁害
+ var taskInfo3 = new Safeguard.TaskListInfo();
+ taskInfo3.TaskType = 5;
+ taskInfo3.Data2 = listTemperature[selectTemperatureIndex] * 100;
+ //1:鑷姩 3:鍒跺喎 4:鍒剁儹 7:閫侀 8:闄ゆ箍
+
+ //鑷姩
+ if (listMode[selectModelIndex] == 1)
+ {
+ taskInfo3.Data1 = 7;
listData.Add(taskInfo3);
}
- else
+ //鍒剁儹
+ else if (listMode[selectModelIndex] == 4)
{
- //鎴戜篃涓嶇煡閬撹繖涓槸浠�涔堝垎鏀�
- var taskInfo4 = new Safeguard.TaskListInfo();
- taskInfo4.TaskType = 5;
- taskInfo4.Data1 = 5;
- taskInfo4.Data2 = listTemperature[selectTemperatureIndex] * 100;
- listData.Add(taskInfo4);
+ taskInfo3.Data1 = 4;
+ listData.Add(taskInfo3);
}
+ //鍒跺喎锛岄櫎婀块粯璁ら兘鏄� 鍒跺喎
+ else if (listMode[selectModelIndex] == 3 || listMode[selectModelIndex] == 8)
+ {
+ taskInfo3.Data1 = 5;
+ listData.Add(taskInfo3);
+ }
+ //閫侀娌℃湁娓╁害鐨勬蹇�
}
//鑾峰彇鐘舵�佺殑鏄剧ず鏂囨湰
--
Gitblit v1.8.0