合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs

@@ -15,7 +15,12 @@
        {
            Tag = "Logic";
        }
        public void Show ()
        /// <summary>
        /// 添加目标功能类
        /// </summary>
        /// <param name="str1">设备界面识别字符串</param>
        /// <param name="str2">场景界面识别字符串</param>
        public void Show (string str1,string str2)
        {

            #region  最上面的布局代码
@@ -30,7 +35,7 @@
            var middle = new FrameLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184),
                Height = Application.GetRealHeight(Method.H - 184),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
@@ -46,7 +51,7 @@
                var roomAndDeviceView = new RoomAndDeviceView();
                UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
                UserView.HomePage.Instance.PageIndex += 1;
                roomAndDeviceView.IfType = LogicView.IfString.Action_Logic;
                roomAndDeviceView.IfType = str1;
                roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.addaction));
            };

@@ -63,7 +68,7 @@
                var addScenePage = new AddScenePage();
                UserView.HomePage.Instance.AddChidren(addScenePage);
                UserView.HomePage.Instance.PageIndex += 1;
                addScenePage.Show(LogicView.IfString.Action_LogicScene);
                addScenePage.Show(str2);
            };
            #endregion

@@ -72,7 +77,16 @@
            securityview.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
            securityview.funnameBtn.TextID = MyInternationalizationString.securitymode;
            securityview.funFrameLayout.Y = sceneview.funFrameLayout.Bottom;
            middle.AddChidren(securityview.FunFrameView());
            if (str1 == LogicView.IfString.Action_Logic)
            {   ///联动事件输出-不支持安防模式
                ///自动化输出-支持安防模式
                middle.AddChidren(securityview.FunFrameView());
            }
            else
            {
                ///改变最后功能快线条颜色
                sceneview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
            }
            securityview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                var securityMode = new SecurityMode();
@@ -89,8 +103,14 @@
            delayedview.iconBtn.UnSelectedImagePath = "ZigeeLogic/delay.png";
            delayedview.funnameBtn.TextID = MyInternationalizationString.delayed;
            delayedview.funFrameLayout.Y = securityview.funFrameLayout.Bottom;
            delayedview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
            middle.AddChidren(delayedview.FunFrameView());
            delayedview.funFrameLayout.Height = Application.GetRealHeight(160 + 20);//最后一行增加20高度;
            delayedview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor; ///改变最后功能快线条颜色
            if (str1 == LogicView.IfString.Action_Logic)
            {
                ///联动事件输出-不支持延时
                ///自动化输出-支持延时
                middle.AddChidren(delayedview.FunFrameView());
            }
            delayedview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                var delayTime = new DelayTime();