From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs | 140 +++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs
index 10f20ce..e5c2bc6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectAcForm.cs
@@ -64,7 +64,7 @@
//澶撮儴淇℃伅
var btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(65), false);
btnTitle.Y = Application.GetRealHeight(34);
- btnTitle.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ btnTitle.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
btnTitle.TextColor = UserCenterColor.Current.TextColor4;
btnTitle.TextSize = 16;
btnTitle.TextAlignment = TextAlignment.Center;
@@ -92,7 +92,7 @@
frameBack.AddChidren(btnFinish);
//绾�
- var btnLine1 = new NormalViewControl(frameBack.Width, ControlCommonResourse.BottomLineHeight, false);
+ var btnLine1 = new NormalViewControl(frameBack.Width, HdlControlResourse.BottomLineHeight, false);
btnLine1.Y = Application.GetRealHeight(138);
btnLine1.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameBack.AddChidren(btnLine1);
@@ -100,8 +100,8 @@
//寮�
var rowOpen = new FrameRowControl();
rowOpen.Y = btnLine1.Bottom + Application.GetRealHeight(69);
- rowOpen.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
- rowOpen.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(81);
+ rowOpen.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
+ rowOpen.RightOffset = HdlControlResourse.XXLeft - Application.GetRealWidth(81);
frameBack.AddChidren(rowOpen);
var btnOpen = rowOpen.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSimpleOpen), 400);
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -112,45 +112,45 @@
var btnOpenLine = rowOpen.AddBottomLine();
//绌鸿皟閰嶇疆閫夋嫨绌洪棿
- var pickerView = new UIPickerView();
- pickerView.Y = rowOpen.Bottom;
- pickerView.Height = Application.GetRealHeight(564);
- frameBack.AddChidren(pickerView);
- //杩欓噷鍔犱竴涓伄缃�,璁╁畠涓嶈兘鐐瑰嚮
- var framePickerShaw = new FrameLayout();
- framePickerShaw.Y = pickerView.Y;
+ var pickerView = new UIPickerView();
+ pickerView.Y = rowOpen.Bottom;
+ pickerView.Height = Application.GetRealHeight(564);
+ frameBack.AddChidren(pickerView);
+ //杩欓噷鍔犱竴涓伄缃�,璁╁畠涓嶈兘鐐瑰嚮
+ var framePickerShaw = new FrameLayout();
+ framePickerShaw.Y = pickerView.Y;
framePickerShaw.Height = pickerView.Height;
framePickerShaw.BackgroundColor = 0x60ffffff;
- frameBack.AddChidren(framePickerShaw);
- //鎭掓俯鍣� Data1锛堟暟鍊硷級: 0鍔犵儹/1鍒跺喎/2鑷姩璋冭妭/3 璁剧疆宸ヤ綔妯″紡/4 璁剧疆鍔犵儹搴︽暟 5/璁剧疆鍒跺喎搴︽暟 6/璁剧疆椋庢墖妯″紡
- //鎭掓俯鍣―ata2鏁板�煎涓嬶細
- //銆愬綋Data1=0|1|2鏃讹紝Data2涓鸿鍙樺寲鐨勫害鏁帮紝鍗曚綅锛�0.1鈩� 銆傘��
- //銆愯嫢Data1=3锛孌ata2涓鸿璁惧畾鐨勭┖璋冩ā寮忥紙0-9锛夛紝0锛歰ff锛�1锛歛uto锛�3锛歝ool锛� 4锛歨eat 锛�5锛歟mergency heating, 6锛歱recooling锛�7锛歠an only 锛�8锛歞ry锛�9锛歴leep銆傘��
- //銆愯嫢Data1=4|5锛孌ata2涓哄姞鐑垨鍒跺喎搴︽暟锛屽崟浣�0.01鎽勬皬搴︺�傘��
- //銆愯嫢Data1=6锛孌ata2涓鸿璁惧畾鐨勯鎵囨ā寮忥紙0-6锛夛紝0锛歰ff锛�1锛歭ow锛�2锛歮edium锛�3锛歨igh锛�4锛歰n锛�5锛歛uto锛�6锛歴mart銆�
- var listTemperature = new List<int>();
+ frameBack.AddChidren(framePickerShaw);
+ //鎭掓俯鍣� Data1锛堟暟鍊硷級: 0鍔犵儹/1鍒跺喎/2鑷姩璋冭妭/3 璁剧疆宸ヤ綔妯″紡/4 璁剧疆鍔犵儹搴︽暟 5/璁剧疆鍒跺喎搴︽暟 6/璁剧疆椋庢墖妯″紡
+ //鎭掓俯鍣―ata2鏁板�煎涓嬶細
+ //銆愬綋Data1=0|1|2鏃讹紝Data2涓鸿鍙樺寲鐨勫害鏁帮紝鍗曚綅锛�0.1鈩� 銆傘��
+ //銆愯嫢Data1=3锛孌ata2涓鸿璁惧畾鐨勭┖璋冩ā寮忥紙0-9锛夛紝0锛歰ff锛�1锛歛uto锛�3锛歝ool锛� 4锛歨eat 锛�5锛歟mergency heating, 6锛歱recooling锛�7锛歠an only 锛�8锛歞ry锛�9锛歴leep銆傘��
+ //銆愯嫢Data1=4|5锛孌ata2涓哄姞鐑垨鍒跺喎搴︽暟锛屽崟浣�0.01鎽勬皬搴︺�傘��
+ //銆愯嫢Data1=6锛孌ata2涓鸿璁惧畾鐨勯鎵囨ā寮忥紙0-6锛夛紝0锛歰ff锛�1锛歭ow锛�2锛歮edium锛�3锛歨igh锛�4锛歰n锛�5锛歛uto锛�6锛歴mart銆�
+ var listTemperature = new List<int>();
var listTemperatureStr = new List<string>();
- for (int i = 16; i <= 32; i++)
- {
- listTemperature.Add(i);
- listTemperatureStr.Add($"{i} 鈩�");
- }
- //妯″紡
- var listMode = new List<int> { 1, 3, 4, 7, 8 };
- var listModeStr = new List<string> {
- Language.StringByID(R.MyInternationalizationString.Mode_Auto),
- Language.StringByID(R.MyInternationalizationString.Mode_Cool),
- Language.StringByID(R.MyInternationalizationString.Mode_Heat),
- Language.StringByID(R.MyInternationalizationString.Mode_FanOnly),
- Language.StringByID(R.MyInternationalizationString.Mode_Dry)
- };
- //椋庨��
- var listFan = new List<int> { 1, 2, 3 };
- var listFanStr = new List<string> {
- Language.StringByID(R.MyInternationalizationString.Fan_Low),
- Language.StringByID(R.MyInternationalizationString.Fan_Middle),
- Language.StringByID(R.MyInternationalizationString.Fan_Height)
- };
+ for (int i = 16; i <= 32; i++)
+ {
+ listTemperature.Add(i);
+ listTemperatureStr.Add($"{i} 鈩�");
+ }
+ //妯″紡
+ var listMode = new List<int> { 1, 3, 4, 7, 8 };
+ var listModeStr = new List<string> {
+ Language.StringByID(R.MyInternationalizationString.Mode_Auto),
+ Language.StringByID(R.MyInternationalizationString.Mode_Cool),
+ Language.StringByID(R.MyInternationalizationString.Mode_Heat),
+ Language.StringByID(R.MyInternationalizationString.Mode_FanOnly),
+ Language.StringByID(R.MyInternationalizationString.Mode_Dry)
+ };
+ //椋庨��
+ var listFan = new List<int> { 1, 2, 3 };
+ var listFanStr = new List<string> {
+ Language.StringByID(R.MyInternationalizationString.Fan_Low),
+ Language.StringByID(R.MyInternationalizationString.Fan_Middle),
+ Language.StringByID(R.MyInternationalizationString.Fan_Height)
+ };
pickerView.setNPicker(listTemperatureStr, listModeStr, listFanStr);
//绌鸿皟鎺т欢榛樿涓虹伆鑹�
pickerView.setTextColorCenter(UserCenterColor.Current.TextGrayColor1, 0);
@@ -161,15 +161,15 @@
int selectTemperatureIndex = 0;
int selectModelIndex = 0;
int selectFanIndex = 0;
- pickerView.OnSelectChangeEvent = (value1, value2, value3) =>
- {
- //鏇存敼绱㈠紩
- selectTemperatureIndex = value1;
- selectModelIndex = value2;
- selectFanIndex = value3;
+ pickerView.OnSelectChangeEvent = (value1, value2, value3) =>
+ {
+ //鏇存敼绱㈠紩
+ selectTemperatureIndex = value1;
+ selectModelIndex = value2;
+ selectFanIndex = value3;
};
//搴曠嚎
- var btnPickerLine = new NormalViewControl(btnOpenLine.Width, ControlCommonResourse.BottomLineHeight, false);
+ var btnPickerLine = new NormalViewControl(btnOpenLine.Width, HdlControlResourse.BottomLineHeight, false);
btnPickerLine.X = btnOpenLine.X;
btnPickerLine.Y = pickerView.Bottom;
btnPickerLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
@@ -178,8 +178,8 @@
//鍏�
var rowClose = new FrameRowControl();
rowClose.Y = btnPickerLine.Bottom + Application.GetRealHeight(12);
- rowClose.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
- rowClose.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(81);
+ rowClose.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
+ rowClose.RightOffset = HdlControlResourse.XXLeft - Application.GetRealWidth(81);
frameBack.AddChidren(rowClose);
var btnClose = rowClose.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSimpleClose), 400);
btnClose.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -303,18 +303,18 @@
{
var listData = new List<Safeguard.TaskListInfo>();
//鍏�
- if (btnCloseSelect.Visible == true)
- {
- var taskInfo = new Safeguard.TaskListInfo();
- taskInfo.TaskType = 5;
- taskInfo.Data1 = 3;
- taskInfo.Data2 = 0;
- listData.Add(taskInfo);
- }
- //寮�
- else if (btnOpenSelect.Visible == true)
- {
- //閫侀
+ if (btnCloseSelect.Visible == true)
+ {
+ var taskInfo = new Safeguard.TaskListInfo();
+ taskInfo.TaskType = 5;
+ taskInfo.Data1 = 3;
+ taskInfo.Data2 = 0;
+ listData.Add(taskInfo);
+ }
+ //寮�
+ else if (btnOpenSelect.Visible == true)
+ {
+ //閫侀
var taskInfo = new Safeguard.TaskListInfo();
taskInfo.TaskType = 5;
taskInfo.Data1 = 6;
@@ -335,24 +335,24 @@
//1:鑷姩 3:鍒跺喎 4:鍒剁儹 7:閫侀 8:闄ゆ箍
//鑷姩
- if (listMode[selectModelIndex] == 1)
- {
+ if (listMode[selectModelIndex] == 1)
+ {
taskInfo3.Data1 = 7;
- listData.Add(taskInfo3);
- }
- //鍒剁儹
+ listData.Add(taskInfo3);
+ }
+ //鍒剁儹
else if (listMode[selectModelIndex] == 4)
{
taskInfo3.Data1 = 4;
listData.Add(taskInfo3);
- }
- //鍒跺喎锛岄櫎婀块粯璁ら兘鏄� 鍒跺喎
+ }
+ //鍒跺喎锛岄櫎婀块粯璁ら兘鏄� 鍒跺喎
else if (listMode[selectModelIndex] == 3 || listMode[selectModelIndex] == 8)
{
taskInfo3.Data1 = 5;
listData.Add(taskInfo3);
- }
- //閫侀娌℃湁娓╁害鐨勬蹇�
+ }
+ //閫侀娌℃湁娓╁害鐨勬蹇�
}
//鑾峰彇鐘舵�佺殑鏄剧ず鏂囨湰
--
Gitblit v1.8.0