From 6b5f23413ceac72ad97d354e658798c8a422f556 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 16:52:17 +0800
Subject: [PATCH] 2021-3-26-3
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/MainView.cs | 143 +++++++++++
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs | 70 ++--
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 263 +++-----------------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/HeigthChangeView.cs | 113 ++++++++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 43 ++-
HDL_ON/HDL_ON.projitems | 2
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs | 18
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs | 121 +++++++++
10 files changed, 489 insertions(+), 287 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 337ed12..b23684e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,39 +1,50 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="504" Column="10" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" Line="256" Column="72" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="341" Column="41" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="45" Column="19" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="223" Column="28" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="271" Column="71" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" Line="109" Column="13" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="398" Column="46" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="141" Column="75" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="183" Column="76" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="262" Column="14" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="233" Column="78" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs" Line="98" Column="15" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs" Line="14" Column="54" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="264" Column="56" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="169" Column="26" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="14" Column="40" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="304" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="15" Column="13" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="206" Column="34" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="400" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
- <Node name="Mqtt" expanded="True">
- <Node name="MqttClient.cs" selected="True" />
- </Node>
+ <Node name="Mqtt" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True" />
+ <Node name="PirDevice" expanded="True">
+ <Node name="DeviceSet.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True" />
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Assets" expanded="True">
+ <Node name="Phone" expanded="True" />
+ </Node>
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="PirIcon" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
</Node>
</State>
</Pad>
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index d2037b3..7518066 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -363,6 +363,8 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\FrameLayout50.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\PirView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\ControlView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\MainView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\HeigthChangeView.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)UI\" />
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
index 484c1fa..47a0357 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
@@ -243,7 +243,6 @@
loading.Hide();
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
- ///杩欓噷锛氱洃鍚琈TTP鎺ㄩ�佷笅鏉ヤ富棰橈紝鎵嶇煡閬撴槸鍚︽坊鍔犳垚鍔�
var buttonObj = control.status.Find((c) => c.value == obj.value);
if (buttonObj != null)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
index c31a4b1..6ea0cc1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
@@ -65,7 +65,7 @@
TextAlignment = TextAlignment.Center,
};
fLayout.AddChidren(text1Btn);
- //鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
+ //鍙埌鍒嗙被-鍔熻兘-鎿嶄綔浣跨敤
Button text2Btn = new Button
{
Width = Application.GetRealWidth(375 - 32),
@@ -90,13 +90,41 @@
this.AddChidren(namePatchView.FLayoutView());
namePatchView.btnText1.TextID = StringId.yaokongqimingcheng;
namePatchView.btnText2.Text = control.name;
- namePatchView.btnClick.MouseUpEventHandler += (sender,e) => {
+
+ //鎵�灞炲尯鍩�
+ View.PatchView quyuPatchView = new View.PatchView();
+ quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
+ this.AddChidren(quyuPatchView.FLayoutView());
+ quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
+ quyuPatchView.btnText2.Text=Intelligence.Automation.LogicMethod.GetGetRoomName(function);
+
+ //缁х画娣诲姞
+ Button addBtn = new Button
+ {
+ Y = quyuPatchView.frameLayout.Bottom + Application.GetRealHeight(125),
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(375 - 32),
+ Height = Application.GetRealHeight(20),
+ TextID = StringId.jixutianjia,
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textConfirmColor,
+ TextAlignment = TextAlignment.Center,
+ };
+ this.AddChidren(addBtn);
+ //瀹屾垚
+ View.SaveView saveView = new View.SaveView();
+ this.AddChidren(saveView.FLayoutView());
+ saveView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ #endregion
+ #region 鐣岄潰鐐瑰嚮浜嬩欢
+ //閬ユ帶鍣ㄥ悕绉扮偣鍑讳簨浠�
+ namePatchView.btnClick.MouseUpEventHandler += (sender, e) => {
List<string> list = new List<string>();
- for (int i = 0; i < Pir.currPir.FunctioList.Count; i++)
+ for (int i = 0; i < PirDevice.Pir.currPir.FunctioList.Count; i++)
{
- list.Add(Pir.currPir.FunctioList[i].name);
+ list.Add(PirDevice.Pir.currPir.FunctioList[i].name);
}
Method method = new Method();
method.EditControlName(StringId.editName, list, control.name, (name, view) =>
@@ -127,7 +155,7 @@
else
{
Method methodError = new Method();
- methodError.ErrorShow(responsePackNew,"");
+ methodError.ErrorShow(responsePackNew, "");
}
});
@@ -139,12 +167,7 @@
}, () => { });
};
- //鎵�灞炲尯鍩�
- View.PatchView quyuPatchView = new View.PatchView();
- quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
- this.AddChidren(quyuPatchView.FLayoutView());
- quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
- quyuPatchView.btnText2.Text=Intelligence.Automation.LogicMethod.GetGetRoomName(function);
+ //鎵�灞炲尯鍩熺偣鍑讳簨浠�
quyuPatchView.btnClick.MouseUpEventHandler += (sender, e) =>
{
Method method = new Method();
@@ -154,31 +177,6 @@
quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(function);
});
};
-
-
- //缁х画娣诲姞
- Button addBtn = new Button
- {
- Y = quyuPatchView.frameLayout.Bottom + Application.GetRealHeight(125),
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(375 - 32),
- Height = Application.GetRealHeight(20),
- TextID = StringId.jixutianjia,
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textConfirmColor,
- TextAlignment = TextAlignment.Center,
- };
- this.AddChidren(addBtn);
- //瀹屾垚
- View.SaveView saveView = new View.SaveView();
- this.AddChidren(saveView.FLayoutView());
- saveView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- #endregion
- #region 鐣岄潰鐐瑰嚮浜嬩欢
- //閬ユ帶鍣ㄥ悕绉扮偣鍑讳簨浠�
- namePatchView.btnClick.MouseUpEventHandler += (sender, e) => { };
- //鎵�灞炲尯鍩熺偣鍑讳簨浠�
- quyuPatchView.btnClick.MouseUpEventHandler += (sender, e) => { };
//缁х画娣诲姞鐐瑰嚮浜嬩欢
addBtn.MouseUpEventHandler += (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
index b7077cf..6af3af1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
@@ -177,9 +177,9 @@
if (StringId.xiugaimingzi == intValue)
{
List<string> list = new List<string>();
- for (int b = 0; b < Pir.pirDeviceList.Count; b++)
+ for (int b = 0; b < PirDevice.Pir.pirDeviceList.Count; b++)
{
- list.Add(Pir.pirDeviceList[b].name);
+ list.Add(PirDevice.Pir.pirDeviceList[b].name);
}
Method methodView = new Method();
methodView.EditControlName(StringId.xiugaimingzi, list, pirclick.name, (name, view) =>
@@ -202,12 +202,16 @@
TipPopView tipPopView = new TipPopView();
tipPopView.TipBox(StringId.tip, text, (dialog) =>
{
-
Thread(dialog, (responsePackNew) =>
- {
- dialog.Close();
- UIView(vv);
- }, "鍒犻櫎", pirclick.deviceId, "");
+ {
+ var pir = Pir.pirDeviceList.Find((c) => c.deviceId == pirclick.deviceId);
+ if (pir != null)
+ {
+ Pir.pirDeviceList.Remove(pirclick);
+ }
+ dialog.Close();
+ UIView(vv);
+ }, "鍒犻櫎", pirclick.deviceId, "");
}, () =>
{
NewSwitchView(pirclick, vv);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
index f0565fd..e62c484 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
@@ -181,10 +181,24 @@
var pirJosn = Newtonsoft.Json.JsonConvert.DeserializeObject<Pir>(str);
if (pirJosn != null)
{
- if (null == Pir.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
+
+/* 椤圭洰鈥淗DL-ON_iOS鈥濈殑鏈悎骞剁殑鏇存敼
+鍦ㄦ涔嬪墠:
+ if (null == Pir.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
+鍦ㄦ涔嬪悗:
+ if (null == list.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
+*/
+ if (null == PirDevice.Pir.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
{
- Pir.pirDeviceList.Add(pirJosn);
+
+/* 椤圭洰鈥淗DL-ON_iOS鈥濈殑鏈悎骞剁殑鏇存敼
+鍦ㄦ涔嬪墠:
+ Pir.pirDeviceList.Add(pirJosn);
+鍦ㄦ涔嬪悗:
+ list.pirDeviceList.Add(pirJosn);
+*/
+ PirDevice.Pir.pirDeviceList.Add(pirJosn);
}
}
@@ -320,6 +334,7 @@
})
{ IsBackground = true }.Start();
}
+
/// <summary>
/// 鍙戦�佸懡浠ょ嚎绋�
/// </summary>
@@ -327,15 +342,113 @@
/// <param name="action">鍥炶皟鍑芥暟</param>
/// <param name="str">鍒ゆ柇瀛楃</param>
/// <param name="frame">log鐖舵帶浠�</param>
- /// <param name="dialog">log鐖舵帶浠�</param>
- public void ThreadSend(Control control, Action<HDL_ON.DAL.Server.ResponsePackNew> action, string str, FrameLayout frame, Dialog dialog)
+ public void ThreadSend(Control control, Action<ResponsePackNew> action, string str, FrameLayout frame)
{
+
+ //鍔犺浇log
+ Loading loading = new Loading();
+ frame.AddChidren(loading);
+ loading.Start();
+ ResponsePackNew responsePackNew = null;
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ if (str == "鍒犻櫎")
+ {
+ responsePackNew = PirSend.DeleteDevice(control.deviceId);
+ }
+ else if (str == "淇敼鍚嶇О")
+ {
+ responsePackNew = PirSend.DeviceRename(control.deviceId, control.name);
+ }
+ else if (str == "鍒犻櫎鎸夐敭") {
+ // responsePackNew = PirSend.CodeRemove(control.deviceId, control.name);
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ action(responsePackNew);
+ }
+ else
+ {
+ Method method = new Method();
+ method.ErrorShow(responsePackNew, "");
+ }
+
+ });
+ }
+
+ })
+ { IsBackground = true }.Start();
}
+ /// <summary>
+ /// 鍙戦�佸懡浠ょ嚎绋�
+ /// </summary>
+ /// <param name="control">鍙戦�佹暟鎹璞�</param>
+ /// <param name="action">鍥炶皟鍑芥暟</param>
+ /// <param name="str">鍒ゆ柇瀛楃</param>
+ /// <param name="dialog">log鐖舵帶浠�</param>
+ public void ThreadSend(Control control, Action<ResponsePackNew> action, string str,Dialog dialog)
+ {
+ //鍔犺浇log
+ Loading loading = new Loading();
+ dialog.AddChidren(loading);
+ ResponsePackNew responsePackNew = null;
+ loading.Start();
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ if (str == "鍒犻櫎")
+ {
+ responsePackNew = PirSend.DeleteDevice(control.deviceId);
+ }
+ else if (str == "淇敼鍚嶇О")
+ {
+
+ responsePackNew = PirSend.DeviceRename(control.deviceId, control.name);
+ }
+ else if (str == "鍒犻櫎鎸夐敭")
+ {
+ // responsePackNew = PirSend.CodeRemove(control.deviceId, control.name);
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ action(responsePackNew);
+ }
+ else
+ {
+ Method method = new Method();
+ method.ErrorShow(responsePackNew, "");
+ }
+
+ });
+ }
+
+ })
+ { IsBackground = true }.Start();
+
+
+ }
/// <summary>
/// MQTT涓婚鎺ㄩ�佷笅鏉ョ殑閬ユ帶鍣ㄦ暟鎹�
/// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index 9ec777a..288f850 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -5,7 +5,7 @@
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
[System.Serializable]
- public class Pir : Entity.Function
+ public class Pir : Entity.Function
{
/// <summary>
/// 绾㈠瀹濆垪琛�
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index cfa6492..57fa14e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -10,7 +10,6 @@
public PirMain()
{
Tag = "PirMain";
-
}
/// <summary>
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
@@ -28,117 +27,10 @@
middFLayout.Y = Application.GetRealHeight(64);
middFLayout.Height = Application.GetRealHeight(667 - 64);
this.AddChidren(middFLayout);
-
- FrameLayout pirDeviceFLayout = new FrameLayout();
- pirDeviceFLayout.Y = Application.GetRealHeight(12);
- pirDeviceFLayout.X = Application.GetRealWidth(16);
- pirDeviceFLayout.Width = Application.GetRealWidth(343);
- pirDeviceFLayout.Height = Application.GetRealHeight(187);
- pirDeviceFLayout.BackgroundColor = CSS.CSS_Color.view;
- pirDeviceFLayout.Radius = (uint)Application.GetRealHeight(12);
- middFLayout.AddChidren(pirDeviceFLayout);
-
- //璁惧绠＄悊
- Button text1Btn = new Button
- {
- Y = Application.GetRealHeight(11),
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textConfirmColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.shebeigaunli,
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(text1Btn);
-
-
- Button pirIcon = new Button
- {
- Y = Application.GetRealHeight(47),
- X = Application.GetRealWidth(28),
- Width = Application.GetRealWidth(66),
- Height = Application.GetRealWidth(66),
- UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
- };
- pirDeviceFLayout.AddChidren(pirIcon);
-
- //mini鏅鸿兘閬ユ帶鍣�
- Button text2Btn = new Button
- {
- Y = Application.GetRealHeight(70),
- X = Application.GetRealWidth(112),
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textTipColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "mini鏅鸿兘閬ユ帶鍣�",
- };
- pirDeviceFLayout.AddChidren(text2Btn);
-
- //绾㈠瀹濇暟閲�
- Button numberDeviceBtn = new Button
- {
- Y = Application.GetRealHeight(137),
- X = Application.GetRealWidth(32),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "1" + Language.StringByID(StringId.ge),
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(numberDeviceBtn);
- //褰撳墠绾㈠閬ユ帶璁惧
- Button numberDeviceTextBtn = new Button
- {
- Y = numberDeviceBtn.Bottom + Application.GetRealHeight(4),
- X = Application.GetRealWidth(32),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(14),
- TextSize = TextSize.text10,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.dangqianhongwaishebei,
- };
- pirDeviceFLayout.AddChidren(numberDeviceTextBtn);
- //鎵�鏈夌孩澶栧疂鐨勯仴鎺у櫒鏁伴噺
- Button currDeviceNumberControlBtn = new Button
- {
- Y = Application.GetRealHeight(137),
- X = Application.GetRealWidth(198),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "1" + Language.StringByID(StringId.ge),
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(currDeviceNumberControlBtn);
- //宸叉坊鍔犻仴鎺у櫒
- Button currDeviceNumberControlTextBtn = new Button
- {
- Y = currDeviceNumberControlBtn.Bottom + Application.GetRealHeight(4),
- X = Application.GetRealWidth(198),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(14),
- TextSize = TextSize.text10,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.yitianjiayaokongqi,
- };
- pirDeviceFLayout.AddChidren(currDeviceNumberControlTextBtn);
- ///绾㈠瀹濈偣鍑讳簨浠�
- FrameLayout clickFLayout = new FrameLayout();
- pirDeviceFLayout.AddChidren(clickFLayout);
-
-
+ View.MainView mainView = new View.MainView();
+ mainView.Show(middFLayout);
FrameLayout deviceListFLayout = new FrameLayout();
- deviceListFLayout.Y = pirDeviceFLayout.Bottom + Application.GetRealHeight(12);
+ deviceListFLayout.Y = mainView.pirDeviceFLayout.Bottom + Application.GetRealHeight(12);
deviceListFLayout.X = Application.GetRealWidth(16);
deviceListFLayout.Width = Application.GetRealWidth(343);
deviceListFLayout.Height = Application.GetRealHeight(328);
@@ -172,18 +64,6 @@
Text = "mini鏅鸿兘閬ユ帶鍣�",
};
deviceListFLayout.AddChidren(deviceNameBtn);
- if (Pir.pirDeviceList.Count != 0)
- {
- Pir.currPir = Pir.pirDeviceList[0];
- int sum = 0;
- for (int i = 0; i < Pir.pirDeviceList.Count; i++)
- {
- sum += Pir.pirDeviceList[i].FunctioList.Count;
- }
- deviceNameBtn.Text = Pir.pirDeviceList[0].name;
- numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
- currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
- }
//涓嬫媺鍥炬爣
var dropdownIconBtn = new Button
@@ -195,94 +75,24 @@
UnSelectedImagePath = "PirIcon/dropdown.png",
};
deviceListFLayout.AddChidren(dropdownIconBtn);
+ #endregion
- deviceNameBtn.MouseUpEventHandler += (sender, e) =>
+ if (Pir.pirDeviceList.Count != 0)
{
-
- #region 鍖哄煙寮规鐣岄潰
- FrameLayout fLayout = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(fLayout);
- fLayout.MouseUpEventHandler += (sender1, e1) =>
- {
- fLayout.RemoveFromParent();
- };
-
- FrameLayout iconFLyout = new FrameLayout
- {
- X = Application.GetRealWidth(205),
- Y = Application.GetRealHeight(314),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(21 + 44),
- //BackgroundImagePath = "LogicIcon/bjicon.png",
- };
- fLayout.AddChidren(iconFLyout);
-
- FrameLayout textFLyout = new FrameLayout
- {
- X = Application.GetRealWidth(8),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(144),
- Height = Application.GetRealHeight(44),
- };
- VerticalScrolViewLayout vv = new VerticalScrolViewLayout
- {
- X = Application.GetRealWidth(8),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(144),
- Height = Application.GetRealHeight(44 * 4),
- };
-
- if (Pir.pirDeviceList.Count > 4)
- {
- iconFLyout.Height = Application.GetRealHeight(21 + 44 * 4);
- iconFLyout.AddChidren(vv);
- iconFLyout.BackgroundImagePath = "PirIcon/4.png";
- }
- else
- {
-
- iconFLyout.AddChidren(textFLyout);
- iconFLyout.Height = Application.GetRealHeight(21 + 44 * Pir.pirDeviceList.Count);
- textFLyout.Height = Application.GetRealHeight(44 * Pir.pirDeviceList.Count);
- iconFLyout.BackgroundImagePath = $"PirIcon/{Pir.pirDeviceList.Count}.png";
- }
- #endregion
-
+ //榛樿绗竴涓孩澶栧疂
+ Pir.currPir = Pir.pirDeviceList[0];
+ int sum = 0;
for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
- var pirJson = Pir.pirDeviceList[i];
- View.PirNameView pirNameView = new View.PirNameView();
- if (Pir.pirDeviceList.Count > 4)
- {
- vv.AddChidren(pirNameView.FLayoutView());
- }
- else
- {
- pirNameView.frameLayout.Y = Application.GetRealHeight(i * 44);
- textFLyout.AddChidren(pirNameView.FLayoutView());
- }
- pirNameView.btnName.Text = pirJson.name;
- pirNameView.btnClick.Tag = pirJson;
- pirNameView.btnClick.MouseUpEventHandler += (sender2, e2) =>
- {
- fLayout.RemoveFromParent();
- deviceNameBtn.Text = pirJson.name;
- Pir.currPir = pirJson;
-
- };
- if (Pir.pirDeviceList.Count - 1 == i)
- {
- ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
- pirNameView.btnLine.BackgroundColor = CSS.CSS_Color.view;
- }
+ //鏌ユ壘
+ sum += Pir.pirDeviceList[i].FunctioList.Count;
}
-
- };
- ///
- clickFLayout.MouseUpEventHandler += (sender, e) =>
+ deviceNameBtn.Text = Pir.pirDeviceList[0].name;
+ mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
+ mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
+ }
+ ///璁惧绠＄悊鐨勭偣鍑讳簨浠�
+ mainView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
DeviceSet deviceSet = new DeviceSet();
@@ -292,21 +102,30 @@
if (Pir.currPir != null)
{
deviceNameBtn.Text = Pir.currPir.name;
- deviceNameBtn.Text = Pir.pirDeviceList[0].name;
- numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
+ mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
}
int sum = 0;
for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
sum += Pir.pirDeviceList[i].FunctioList.Count;
}
- currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
+ mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
});
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- #endregion
+ ///绾㈠鍚嶇О鐨勭偣鍑讳簨浠�
+ deviceNameBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ View.HeigthChangeView heigthChangeView = new View.HeigthChangeView();
+ heigthChangeView.Show(this, Pir.pirDeviceList, (pirJson) =>
+ {
+ deviceNameBtn.Text = pirJson.name;
+ Pir.currPir = pirJson;
+ });
+ };
+
int line = 0;
for (int i = 1, j = 0; i <= 7; i++, j++)
{
@@ -367,11 +186,11 @@
{
if (DeviceTypeList.Count == 0)
{
- GetDeviceTypeList(true,() =>
- {
- DeviceTypeViewClick(if_value);
+ GetDeviceTypeList(true, () =>
+ {
+ DeviceTypeViewClick(if_value);
- });
+ });
}
else
{
@@ -380,14 +199,13 @@
}
};
}
- GetDeviceTypeList(false,() => { });
-
}
/// <summary>
/// 璁惧杩涘叆涓嬩竴绾ф柟娉�
/// </summary>
/// <param name="if_value"></param>
- void DeviceTypeViewClick(int if_value) {
+ private void DeviceTypeViewClick(int if_value)
+ {
var strings = GetTypeString(if_value).Split('-');
var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
if (jobDeviceType == null)
@@ -587,7 +405,7 @@
/// </summary>
/// <param name="tag">鏍囪瘑瑕佷笉瑕佹彁绀猴紙true=鎻愮ず锛�</param>
/// <param name="action">鍥炶皟鍑芥暟</param>
- private void GetDeviceTypeList(bool tag,Action action)
+ public void GetDeviceTypeList(bool tag, Action action)
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
@@ -614,9 +432,10 @@
}
else
{
- if (tag) {
+ if (tag)
+ {
Method method = new Method();
- method.ErrorShow(responsePackNew,"");
+ method.ErrorShow(responsePackNew, "");
}
}
}, "", "璁惧绫诲瀷鍒楄〃");
@@ -624,7 +443,7 @@
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鐨勫搧鐗屽垪琛�
/// </summary>
- private void GetBrandList(string id, Action<List<Brand>> actionBrand)
+ public void GetBrandList(string id, Action<List<Brand>> actionBrand)
{
List<Brand> brandList = new List<Brand>();
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
@@ -653,7 +472,7 @@
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew,"");
+ method.ErrorShow(responsePackNew, "");
}
}, id, "鍝佺墝鍒楄〃");
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/HeigthChangeView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/HeigthChangeView.cs
new file mode 100644
index 0000000..73d4108
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/HeigthChangeView.cs
@@ -0,0 +1,113 @@
+锘縰sing System;
+using Shared;
+using System.Collections.Generic;
+namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice.View
+{
+ public class HeigthChangeView
+ {
+
+
+ /// <summary>
+ /// 鑳屾櫙
+ /// </summary>
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ /// <summary>
+ ///
+ /// </summary>
+ FrameLayout iconFLyout = new FrameLayout
+ {
+ X = Application.GetRealWidth(205),
+ Y = Application.GetRealHeight(314),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(21 + 44),
+ //BackgroundImagePath = "LogicIcon/bjicon.png",
+ };
+ /// <summary>
+ ///
+ /// </summary>
+ FrameLayout textFLyout = new FrameLayout
+ {
+ X = Application.GetRealWidth(8),
+ Y = Application.GetRealHeight(14),
+ Width = Application.GetRealWidth(144),
+ Height = Application.GetRealHeight(44),
+ };
+ /// <summary>
+ ///
+ /// </summary>
+ VerticalScrolViewLayout vv = new VerticalScrolViewLayout
+ {
+ X = Application.GetRealWidth(8),
+ Y = Application.GetRealHeight(14),
+ Width = Application.GetRealWidth(144),
+ Height = Application.GetRealHeight(44 * 4),
+ };
+ /// <summary>
+ /// View鏂规硶
+ /// </summary>
+ /// <param name="frame"></param>
+ /// <param name="list"></param>
+ /// <param name="action"></param>
+ public void Show(FrameLayout frame, List<Pir> list, Action<Pir> action)
+ {
+
+ frame.AddChidren(fLayout);
+ fLayout.AddChidren(iconFLyout);
+
+ fLayout.MouseUpEventHandler += (sender1, e1) =>
+ {
+ fLayout.RemoveFromParent();
+ };
+ if (list.Count > 4)
+ {
+ iconFLyout.Height = Application.GetRealHeight(21 + 44 * 4);
+ iconFLyout.AddChidren(vv);
+ iconFLyout.BackgroundImagePath = "PirIcon/4.png";
+ }
+ else
+ {
+
+ iconFLyout.AddChidren(textFLyout);
+ iconFLyout.Height = Application.GetRealHeight(21 + 44 * list.Count);
+ textFLyout.Height = Application.GetRealHeight(44 * list.Count);
+ iconFLyout.BackgroundImagePath = $"PirIcon/{list.Count}.png";
+ }
+
+
+ for (int i = 0; i < list.Count; i++)
+ {
+ var pirJson = list[i];
+ View.PirNameView pirNameView = new View.PirNameView();
+ if (list.Count > 4)
+ {
+ vv.AddChidren(pirNameView.FLayoutView());
+ }
+ else
+ {
+ pirNameView.frameLayout.Y = Application.GetRealHeight(i * 44);
+ textFLyout.AddChidren(pirNameView.FLayoutView());
+ }
+ pirNameView.btnName.Text = pirJson.name;
+ pirNameView.btnClick.Tag = pirJson;
+ pirNameView.btnClick.MouseUpEventHandler += (sender2, e2) =>
+ {
+ var pir = pirNameView.btnClick.Tag as Pir;
+ action(pir);
+ fLayout.RemoveFromParent();
+
+ //deviceNameBtn.Text = pirJson.name;
+ //Pir.currPir = pirJson;
+
+ };
+ if (list.Count - 1 == i)
+ {
+ ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
+ pirNameView.btnLine.BackgroundColor = CSS.CSS_Color.view;
+ }
+ }
+ }
+ }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/MainView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/MainView.cs
new file mode 100644
index 0000000..b0fcd2d
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/MainView.cs
@@ -0,0 +1,143 @@
+锘縰sing System;
+using HDL_ON.UI.UI2.Intelligence.Automation.LogicView;
+using Shared;
+namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice.View
+{
+ public class MainView
+ {
+ /// <summary>
+ /// 涓荤┖闂�
+ /// </summary>
+ public FrameLayout pirDeviceFLayout = new FrameLayout
+ {
+
+ Y = Application.GetRealHeight(12),
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(187),
+ BackgroundColor = CSS.CSS_Color.view,
+ Radius = (uint)Application.GetRealHeight(12),
+
+ };
+ /// <summary>
+ /// 璁惧绠＄悊
+ /// </summary>
+ public Button text1Btn = new Button
+ {
+ Y = Application.GetRealHeight(11),
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(120),
+ Height = Application.GetRealHeight(20),
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textConfirmColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = StringId.shebeigaunli,
+ IsBold = true,
+ };
+
+ /// <summary>
+ /// 鍥炬爣
+ /// </summary>
+ public Button pirIcon = new Button
+ {
+ Y = Application.GetRealHeight(47),
+ X = Application.GetRealWidth(28),
+ Width = Application.GetRealWidth(66),
+ Height = Application.GetRealWidth(66),
+ UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
+ };
+
+ /// <summary>
+ /// mini鏅鸿兘閬ユ帶鍣�
+ /// </summary>
+ public Button text2Btn = new Button
+ {
+ Y = Application.GetRealHeight(70),
+ X = Application.GetRealWidth(112),
+ Width = Application.GetRealWidth(120),
+ Height = Application.GetRealHeight(20),
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textTipColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "mini鏅鸿兘閬ユ帶鍣�",
+ };
+
+
+ /// <summary>
+ /// 绾㈠瀹濇暟閲�
+ /// </summary>
+ public Button numberDeviceBtn = new Button
+ {
+ Y = Application.GetRealHeight(137),
+ X = Application.GetRealWidth(32),
+ Width = Application.GetRealWidth(100),
+ Height = Application.GetRealHeight(20),
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "1" + Language.StringByID(StringId.ge),
+ IsBold = true,
+ };
+
+ /// <summary>
+ /// 褰撳墠绾㈠閬ユ帶璁惧
+ /// </summary>
+ public Button numberDeviceTextBtn = new Button
+ {
+ Y = Application.GetRealHeight(137 + 20) + Application.GetRealHeight(4),
+ X = Application.GetRealWidth(32),
+ Width = Application.GetRealWidth(100),
+ Height = Application.GetRealHeight(14),
+ TextSize = TextSize.text10,
+ TextColor = CSS.CSS_Color.textCancelColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = StringId.dangqianhongwaishebei,
+ };
+
+ /// <summary>
+ /// 鎵�鏈夌孩澶栧疂鐨勯仴鎺у櫒鏁伴噺
+ /// </summary>
+ public Button currDeviceNumberControlBtn = new Button
+ {
+ Y = Application.GetRealHeight(137),
+ X = Application.GetRealWidth(198),
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealHeight(20),
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "1" + Language.StringByID(StringId.ge),
+ IsBold = true,
+ };
+
+ /// <summary>
+ /// 宸叉坊鍔犻仴鎺у櫒
+ /// </summary>
+ public Button currDeviceNumberControlTextBtn = new Button
+ {
+ Y = Application.GetRealHeight(137 + 20) + Application.GetRealHeight(4),
+ X = Application.GetRealWidth(198),
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealHeight(14),
+ TextSize = TextSize.text10,
+ TextColor = CSS.CSS_Color.textCancelColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = StringId.yitianjiayaokongqi,
+ };
+ ///绾㈠瀹濈偣鍑讳簨浠�
+ public Button clickBtn = new Button();
+ public void Show(FrameLayout middFLayout)
+ {
+ middFLayout.AddChidren(pirDeviceFLayout);
+ pirDeviceFLayout.AddChidren(text1Btn);
+ pirDeviceFLayout.AddChidren(pirIcon);
+ pirDeviceFLayout.AddChidren(text2Btn);
+ pirDeviceFLayout.AddChidren(numberDeviceBtn);
+ pirDeviceFLayout.AddChidren(numberDeviceTextBtn);
+ pirDeviceFLayout.AddChidren(currDeviceNumberControlBtn);
+ pirDeviceFLayout.AddChidren(currDeviceNumberControlTextBtn);
+ pirDeviceFLayout.AddChidren(clickBtn);
+ }
+
+ }
+}
--
Gitblit v1.8.0