From 198304dd3870ffa96a5211bcb0afa1fbeadf4462 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 13 三月 2023 10:04:49 +0800 Subject: [PATCH] 代码备份 --- HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 2 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 1 HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 4 +- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 2 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 40 +++++++++++++++++++- HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 8 ++-- HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs | 4 +- HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 2 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | 16 ++----- 9 files changed, 55 insertions(+), 24 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs index e682ffb..afd0763 100644 --- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs +++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs @@ -3,6 +3,7 @@ using HDL_ON.DAL.Server; using HDL_ON.Entity; using Shared; +using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod; namespace HDL_ON.UI { diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs index b4d6ff9..70a5fc2 100644 --- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs +++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs @@ -1205,7 +1205,7 @@ } else if (function.spk == SPK.VideoDoorLock) { - btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(Comerom.collect); + btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect); //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png"; } else @@ -1243,7 +1243,7 @@ }; - var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone,Comerom.collect,()=> { + var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect,()=> { this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I }); view.MouseUpEventHandler = skipControlPageEvent; diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index 8c9339e..397a9fa 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs @@ -194,7 +194,7 @@ } else if (function.spk == SPK.VideoDoorLock) { - btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(Comerom.function); + btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function); } else if (function.spk == SPK.HvacCac) { diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs index 9ea32c1..1fb2267 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs @@ -405,7 +405,7 @@ /// </summary> void LoadEvent_DivSkipEvent() { - var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor,Comerom.room,this.action); + var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action); this.MouseUpEventHandler = eventHandler; btnName.MouseUpEventHandler = eventHandler; btnFromFloor.MouseUpEventHandler = eventHandler; diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs index 6ad66c0..4a885bc 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs @@ -1115,19 +1115,19 @@ try { var userList =FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device); - List<string> userIdList = new List<string>(); + List<string> userNameList = new List<string>(); for (int i = 0; i < userList.Count; i++) { var user = userList[i]; - userIdList.Add(user.extUserId); + userNameList.Add(user.extUserName); } Application.RunOnMainThread(() => { loading.Hide(); PublicInterface publicInterface = new PublicInterface();//鐢ㄦ埛鐣岄潰 - publicInterface.FrameOrVv(this, userIdList, new List<string> { btnState.Text }, device.name, (index) => + publicInterface.FrameOrVv(this, userNameList, new List<string> { btnState.Text }, device.name, (index) => { - var userId = userIdList[index]; + var userId = userNameList[index]; //鐣岄潰鏄剧ず閫変腑鍊� btnState.Text = userId; //鏁版嵁灏佽 diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs index fc25046..42a9fee 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs @@ -182,7 +182,7 @@ break; case SPK.VideoDoorLock: { //璺宠浆鍒癮ndroid閭h竟鍘� - HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipActivity(); + HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(); } break; } diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs index ac956de..cf5d627 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs @@ -29,9 +29,36 @@ /// <summary> /// 璺宠浆鍒癆ndroid閭h竟鍘� /// </summary> - public void SkipActivity() + public void SkipAddDeviceActivity() { //鏈疄鐜� + } + /// <summary> + /// 璺宠浆鍒癆ndroid(瀹炴椂瑙嗛)閭h竟鍘� + /// </summary> + public void SkipRTVActivity() + { + //鏈疄鐜� + HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog(); + showDialog.ClickBox("", (s) => { }, (s1) => { }); + } + /// <summary> + /// 璺宠浆鍒癆ndroid(鍘嗗彶璁板綍)閭h竟鍘� + /// </summary> + public void SkipRecordActivity() + { + //鏈疄鐜� + HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog(); + showDialog.ClickBox("", (s) => { }, (s1) => { }); + } + /// <summary> + /// 璺宠浆鍒癆ndroid(涓存椂瀵嗙爜)閭h竟鍘� + /// </summary> + public void SkipPSWActivity() + { + //鏈疄鐜� + HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog(); + showDialog.ClickBox("", (s) => { }, (s1) => { }); } /// <summary> /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍� @@ -82,7 +109,7 @@ { var list = FunctionList.List.GetVideoDoorLockList(); #if DEBUG - //list.Add(new Function { name = "瑙嗛闂ㄩ攣涓�", sid = "23456789", spk = SPK.VideoDoorLock }); + list.Add(new Function { name = "瑙嗛闂ㄩ攣涓�", sid = "23456789", spk = SPK.VideoDoorLock }); //list.Add(new Function { name = "瑙嗛闂ㄩ攣浜�", sid = "2345678922", spk = SPK.VideoDoorLock }); #endif return list; @@ -97,5 +124,14 @@ flicker,//闂儊妗� confirmation//纭妗� } + /// <summary> + /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰 + /// </summary> + public enum Comerom + { + function,//鍔熻兘 + collect,//鏀惰棌 + room,//鎴块棿 + } } } diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs index 3f89126..330e8ef 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs @@ -171,7 +171,7 @@ this.dicBatteryContr[i_device.sid] = btnBattery; frameBack.ButtonClickEvent += (sender, e) => { - var form = new VideoDoorLockPage(i_device, btnName, btnRoom,Comerom.function,()=> { + var form = new VideoDoorLockPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function,()=> { this.CloseForm(); }); MainPage.BasePageView.AddChidren(form); @@ -191,7 +191,7 @@ #endregion - public void SkipViewPage(Comerom comerom) { + public void SkipViewPage(CommonMethod.Comerom comerom) { //var form = new VideoDoorLockPage(i_device, btnName, btnRoom, Comerom.function); //MainPage.BasePageView.AddChidren(form); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs index 6e73d35..e4c70ef 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs @@ -71,7 +71,7 @@ /// <summary> /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰 /// </summary> - private Comerom Comerom; + private UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom Comerom; /// <summary> /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟 /// </summary> @@ -85,7 +85,7 @@ /// <param name="function">璁惧</param> /// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢</param> /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢</param> - public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, Comerom comerom, Action action) + public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom comerom, Action action) { this.device = function; this.btnDeviceName = btnDeviceName; @@ -277,6 +277,8 @@ this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { RemoveFromParent(); + + }; //璁剧疆 this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) => @@ -490,14 +492,6 @@ } - /// <summary> - /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰 - /// </summary> - public enum Comerom - { - function,//鍔熻兘 - collect,//鏀惰棌 - room,//鎴块棿 - } + } -- Gitblit v1.8.0