From 1de638833e4b07b5e6c272cf5c8474b5c92ce42f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 05 九月 2023 15:21:48 +0800
Subject: [PATCH] 删除音乐权限申请
---
OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 78 +--------------------------------------
1 files changed, 2 insertions(+), 76 deletions(-)
diff --git a/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs b/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
index 52ec4a5..77f4808 100644
--- a/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -36,13 +36,6 @@
sceneView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
viewLayout.AddChidren(sceneView.FLayoutView());
- //瀹夐槻
- LogicView.SelectTypeView securityView = new LogicView.SelectTypeView();
- securityView.frameLayout.Y = sceneView.frameLayout.Bottom;
- securityView.btnText.TextID = StringId.anfang;
- securityView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
- viewLayout.AddChidren(securityView.FLayoutView());
-
//寤舵椂
LogicView.SelectTypeView delayView = new LogicView.SelectTypeView();
delayView.frameLayout.Y = sceneView.frameLayout.Bottom;
@@ -52,32 +45,10 @@
- var colorfulRgbList = FunctionList.List.GetLightList().FindAll((obj) => obj.spk == SPK.LightRGB
- && obj.GetAttributes().Contains(FunctionAttributeKey.Colorful));
- //var seriesList = FunctionList.List.GetSeries();
- if (colorfulRgbList.Count > 0 || FunctionList.List.GetSeries().Count>0)
- {
- LogicView.SelectTypeView seriesView = new LogicView.SelectTypeView();
- seriesView.frameLayout.Y = securityView.frameLayout.Bottom;
- seriesView.btnText.TextID = StringId.HorseRaceLamp;
- seriesView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HorseRaceLampIcon.png";
- viewLayout.AddChidren(seriesView.FLayoutView());
- seriesView.btnClick.MouseUpEventHandler = (sender, e) =>
- {
- var settingPage = new LogicSeriesSettingPage();
- MainPage.BasePageView.AddChidren(settingPage);
- settingPage.LoadPage(colorfulRgbList);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
- };
- new FunTpye(LogicMethod.target_if).FunTypeView(viewLayout, seriesView.frameLayout.Bottom, 3);
- }
- else
- {
+
////鍔熻兘
///浜у搧缁忕悊鍚涚剷瑕佹眰锛岃澶囧姛鑳界Щ鍒拌繖閲屻��<2022-3-7>
- new FunTpye(LogicMethod.target_if).FunTypeView(viewLayout, securityView.frameLayout.Bottom, 2);
- }
+ new FunTpye(LogicMethod.target_if).FunTypeView(viewLayout, sceneView.frameLayout.Bottom, 2);
#endregion
#region 鎵�鏈夌偣鍑讳簨浠�
@@ -85,16 +56,6 @@
sceneView.btnClick.MouseUpEventHandler += (sen, e) =>
{
SceneMethod();
- };
- //瀹夐槻鐐瑰嚮浜嬩欢
- securityView.btnClick.MouseUpEventHandler += (sen, e) =>
- {
- Security security = new Security();
- MainPage.BasePageView.AddChidren(security);
- security.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
- //SecurityMethod(this);
};
//寤舵椂鐐瑰嚮浜嬩欢
delayView.btnClick.MouseUpEventHandler += (sen, e) =>
@@ -132,41 +93,6 @@
//娌″暐浣滅敤锛屼负浜嗗彂閫佹暟鎹牸寮忕粺涓�;
outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene" }, { "value", "0" } } };
AddOutput(outputDevice);
- LogicMethod.Current.RemoveAllView();
- AddLogic addLogic = new AddLogic();
- MainPage.BasePageView.AddChidren(addLogic);
- addLogic.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- }
- /// <summary>
- /// 娣诲姞瀹夐槻
- /// </summary>
- public void SecurityMethod(FrameLayout frameLayout, bool edit=false, int index1=-1)
- {
- List<string> stateList = new List<string>();
- if (edit&& index1 != -1) {
- Output output = Logic.currlogic.output[index1];
- var security = LogicMethod.Current.GetSecurity(output.sid);
- stateList.Add(security.name);
- }
- var securityList = LogicMethod.Current.GetSecurityList();
- List<string> nameList = new List<string>();
- for (int i = 0; i < securityList.Count; i++)
- {
- var security = securityList[i];
- nameList.Add(security.name);
- }
- PublicInterface publicInterface = new PublicInterface();
- publicInterface.FrameOrVv(frameLayout, nameList, stateList,Language.StringByID(StringId.addSecurityLogic),(index) =>
- {
- var securitySelecetd = securityList[index];
- Output outputDevice = new Output();
- outputDevice.target_type = "3";
- outputDevice.sid = securitySelecetd.sid;
- //娌″暐浣滅敤锛屼负浜嗗彂閫佹暟鎹牸寮忕粺涓�;
- outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "security" }, { "value", "0" } } };
- AddOutput(outputDevice,true);
LogicMethod.Current.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
--
Gitblit v1.8.0