From ba9e028d73bab5b7a0f000d11b39460d2b57707a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 19 三月 2021 18:07:10 +0800
Subject: [PATCH] 2021-3-19-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs | 63 +++++++++----------------------
1 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
index 82105bf..801b039 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
@@ -118,53 +118,24 @@
#endregion
#region 鐣岄潰鐐瑰嚮浜嬩欢
//閬ユ帶鍣ㄥ悕绉扮偣鍑讳簨浠�
- namePatchView.btnClick.MouseUpEventHandler += (sender, e) => {
+ namePatchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
List<string> list = new List<string>();
-
- for (int i = 0; i < PirDevice.Pir.currPir.FunctioList.Count; i++)
+ for (int i = 0; i < Pir.currPir.FunctioList.Count; i++)
{
- list.Add(PirDevice.Pir.currPir.FunctioList[i].name);
+ list.Add(Pir.currPir.FunctioList[i].name);
}
Method method = new Method();
- method.EditControlName(StringId.editName, list, control.name, (name, view) =>
+ method.EditControlName(StringId.editName, list, control.name, (name, dialog) =>
{
- //鍔犺浇log
- Loading loading = new Loading();
- view.AddChidren(loading);
- HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
- loading.Start();
- new System.Threading.Thread(() =>
+ Method.ThreadSend(new Control { deviceId = control.deviceId, name = name }, (responsePackNew) =>
{
- try
- {
- responsePackNew = PirSend.DeviceRename(control.deviceId, control.name);
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
- {
- view.Close();
- namePatchView.btnText2.Text = name;
- function.name = name;
- }
- else
- {
- Method methodError = new Method();
- methodError.ErrorShow(responsePackNew, "");
- }
+ dialog.Close();
+ namePatchView.btnText2.Text = name;
+ function.name = name;
- });
- }
-
- })
- { IsBackground = true }.Start();
-
-
+ }, "淇敼鍚嶇О", "dialog", null, dialog);
}, () => { });
};
//鎵�灞炲尯鍩熺偣鍑讳簨浠�
@@ -198,12 +169,16 @@
//瀹屾垚鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- //鍓嶉潰鐣岄潰
- // this.RemoveFromParent();
+ //绉婚櫎鎵�鏈夌晫闈�
MainPage.BasePageView.RemoveViewByTag("PirView");
- //涓荤晫闈�
- //MainPage.BasePageView.RemoveViewByTag("PirMain");
-
+ //绉婚櫎绾㈠瀹濇牴鐣岄潰
+ MainPage.BasePageView.RemoveViewByTag("PirMain");
+ //閲嶆柊鍔犺浇鐣岄潰
+ var page = new PirMain();
+ MainPage.BasePageView.AddChidren(page);
+ page.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
};
#endregion
}
--
Gitblit v1.8.0