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/Device/PirSensor/PirSensorBindTargetSettionForm.cs | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
index 49a9a16..34762cb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
@@ -44,31 +44,31 @@
#endregion
- #region 鈻� 鍒濆鍖朹____________________________
+ #region 鈻� 鍒濆鍖朹____________________________
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_iasZone">浼犳劅鍣ㄨ澶�</param>
- public void ShowForm(IASZone i_iasZone)
+ /// <param name="i_iasZone">浼犳劅鍣ㄨ澶�</param>
+ public void ShowForm(IASZone i_iasZone)
{
this.ScrollEnabled = false;
deviceIASZone = i_iasZone;
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBindTargets));
-
- HdlThreadLogic.Current.RunThread(() =>
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBindTargets));
+
+ HdlThreadLogic.Current.RunThread(() =>
{
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
- });
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private async void InitMiddleFrame()
+ });
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private async void InitMiddleFrame()
{
this.listEsixtDevice.Clear();
@@ -82,7 +82,7 @@
{
//鍒濆鍖栨帶浠�
this.InitMiddleControl();
- });
+ });
}
/// <summary>
@@ -172,7 +172,7 @@
btnLightView.TextID = R.MyInternationalizationString.uIlluminationValue;
btnLightView.TextSize = 12;
btnLightView.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnLightView.X = ControlCommonResourse.XXLeft;
+ btnLightView.X = HdlControlResourse.XXLeft;
btnLightView.Y = Application.GetRealHeight(71);
frameLight.AddChidren(btnLightView);
var btnLightValue = new NormalViewControl(200, 50, true);
@@ -300,8 +300,8 @@
frameLight.AddChidren(btnTipView);
//搴曠嚎
- var btnIfLine = new NormalViewControl(frameLight.Width, ControlCommonResourse.BottomLineHeight, false);
- btnIfLine.Y = frameLight.Height - ControlCommonResourse.BottomLineHeight;
+ var btnIfLine = new NormalViewControl(frameLight.Width, HdlControlResourse.BottomLineHeight, false);
+ btnIfLine.Y = frameLight.Height - HdlControlResourse.BottomLineHeight;
btnIfLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameLight.AddChidren(btnIfLine);
@@ -343,7 +343,7 @@
listView.AddChidren(frameResult);
//瑙﹀彂鐩爣
var rowTarget = new FrameRowControl(listView.rowSpace / 2);
- rowTarget.LeftOffset = Application.GetRealWidth(138) - ControlCommonResourse.XXLeft;
+ rowTarget.LeftOffset = Application.GetRealWidth(138) - HdlControlResourse.XXLeft;
frameResult.AddChidren(rowTarget);
rowTarget.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uTriggerTarget), 600);
rowTarget.AddRightArrow();
@@ -360,8 +360,8 @@
if (listSaveDevice.Count > 0)
{
//闅忎究涓竴涓悕瀛椾笂鍘�
- var device = Common.LocalDevice.Current.GetDevice(listSaveDevice[0]);
- btnTargetView.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(listSaveDevice[0]);
+ btnTargetView.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
}
else
{
@@ -373,11 +373,11 @@
foreach (string mainkey in this.listEsixtDevice)
{
- var device = Common.LocalDevice.Current.GetDevice(mainkey);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(mainkey);
if (device != null)
{
//闅忎究涓竴涓悕瀛椾笂鍘�
- btnTargetView.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ btnTargetView.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
break;
}
}
@@ -392,7 +392,7 @@
}
string strSecond = pirConfigure.transitionTime % 60 + Language.StringByID(R.MyInternationalizationString.uSecond);
var rowDelay = new FrameRowControl(listView.rowSpace / 2);
- rowDelay.LeftOffset = Application.GetRealWidth(138) - ControlCommonResourse.XXLeft;
+ rowDelay.LeftOffset = Application.GetRealWidth(138) - HdlControlResourse.XXLeft;
frameResult.AddChidren(rowDelay);
rowDelay.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDelayed), 300);
rowDelay.AddRightArrow();
@@ -450,7 +450,7 @@
this.listEsixtDevice.Clear();
foreach (var device in listDevice)
{
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (listEsixtDevice.Contains(mainKeys) == false)
{
listEsixtDevice.Add(mainKeys);
@@ -593,7 +593,7 @@
{
if (this.listSaveDevice.Contains(mainKey) == false)
{
- var myDevice = Common.LocalDevice.Current.GetDevice(mainKey);
+ var myDevice = HdlDeviceCommonLogic.Current.GetDevice(mainKey);
listDelDevice.Add(myDevice);
if (myDevice.Type == DeviceType.DimmableLight)
{
@@ -629,7 +629,7 @@
listLightDevice = new List<CommonDevice>();
foreach (var mainKey in listSaveDevice)
{
- var myDevice = Common.LocalDevice.Current.GetDevice(mainKey);
+ var myDevice = HdlDeviceCommonLogic.Current.GetDevice(mainKey);
listBind.Add(myDevice);
if (myDevice.Type == DeviceType.DimmableLight)
{
--
Gitblit v1.8.0