From c96d59d6b6379acb0fd899ad2e255a121ee6c8c6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 10:45:20 +0800
Subject: [PATCH] 20201218-1
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index 0fbb9aa..1542eb7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -1,6 +1,8 @@
锘縰sing HDL_ON.UI.CSS;
using System;
using Shared;
+using HDL_ON.Entity;
+using System.Text.RegularExpressions;
namespace HDL_ON.UI
{
@@ -8,7 +10,47 @@
{
void LoadEventList()
{
- //EditFunctionName();
+ LoadEvent_ChangeFunctionName ();
+ SkipChooseRoomPage();
+ }
+
+ /// <summary>
+ /// 淇敼鍔熻兘鍚嶇О鎸夐挳鐐瑰嚮浜嬩欢
+ /// </summary>
+ void LoadEvent_ChangeFunctionName()
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ //鍒涘缓鍥炶皟浜嬩欢
+ Action<string> callBackAction = (name) =>
+ {
+ if (string.IsNullOrEmpty(name))
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.DeviceNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ if (function.name != name)
+ {
+ Regex regtest = new Regex(@"\p{Cs}");
+ Match match = regtest.Match(name);
+ if (match.Success)
+ {
+ HDLCommon.Current.ShowAlert(Language.StringByID(StringId.CannotEnterSpecialCharacters));
+ return;
+ }
+ function.name = name;
+ btnFunctionName.Text = name;
+ function.SaveFunctionData(true);
+ }
+ };
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>());
+ };
+ btnEditName.MouseUpEventHandler = eventHandler;
+ btnFunctionName.MouseUpEventHandler = eventHandler;
}
/// <summary>
@@ -16,10 +58,19 @@
/// </summary>
void SkipChooseRoomPage()
{
- var view = new ChooseRoomPage();
- MainPage.BasePageView.AddChidren(view);
- view.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ //淇敼鍔熻兘鎵�灞炴埧闂翠箣鍚庣殑鍥炶皟浜嬩欢
+ Action chooseRoomBackAction = () => {
+ btnLocationValues.Text = function.GetRoomListName();
+ };
+ var view = new ChooseRoomPage(function,chooseRoomBackAction);
+ MainPage.BasePageView.AddChidren(view);
+ view.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ btnLocationInfoRight.MouseUpEventHandler = eventHandler;
+ btnLocationValues.MouseUpEventHandler = eventHandler;
}
}
}
--
Gitblit v1.8.0