合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

old mode 100755
new mode 100644
@@ -16,7 +16,7 @@
            this.action = action;
        }

        public void Show()
        public void Show(string if_logic,bool _bool)
        {
            Tag = "Logic";

@@ -31,7 +31,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,8 +46,8 @@
            FunView onceView = new FunView();
            onceView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
            onceView.funnameBtn.TextID = MyInternationalizationString.executeonce;
            onceView.funnextBtn.Width = Application.GetMinRealAverage(60);
            onceView.funnextBtn.Height = Application.GetMinRealAverage(60);
            onceView.funnextBtn.Width = Application.GetRealWidth(60);
            onceView.funnextBtn.Height = Application.GetRealWidth(60);
            onceView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
            onceView.funnextBtn.Visible = false;
            middle.AddChidren(onceView.FunFrameView());
@@ -59,8 +59,8 @@
            dayView.funFrameLayout.Y = onceView.funFrameLayout.Bottom;
            dayView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
            dayView.funnameBtn.TextID = MyInternationalizationString.everyday;
            dayView.funnextBtn.Width = Application.GetMinRealAverage(60);
            dayView.funnextBtn.Height = Application.GetMinRealAverage(60);
            dayView.funnextBtn.Width = Application.GetRealWidth(60);
            dayView.funnextBtn.Height = Application.GetRealWidth(60);
            dayView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
            dayView.funnextBtn.Visible = false;
            middle.AddChidren(dayView.FunFrameView());
@@ -123,7 +123,7 @@
                var weekPage = new WeekPage();
                UserView.HomePage.Instance.AddChidren(weekPage);
                UserView.HomePage.Instance.PageIndex += 1;
                weekPage.Show(weekView.funnameBtn.Text);
                weekPage.Show(weekView.funnameBtn.Text, if_logic,_bool);

            };
            monView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -133,7 +133,7 @@
                var everymonthPage = new EverymonthPage();
                UserView.HomePage.Instance.AddChidren(everymonthPage);
                UserView.HomePage.Instance.PageIndex += 1;
                everymonthPage.Show(monView.funnameBtn.Text);
                everymonthPage.Show(monView.funnameBtn.Text, if_logic,_bool);

            };
            if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 0)
@@ -157,7 +157,7 @@
                {


                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                    var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                           Language.StringByID(MyInternationalizationString.selectweek),
                          Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();