合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

old mode 100755
new mode 100644
@@ -16,7 +16,7 @@
        {
            Tag = "Logic";
        }
        public void Show(string titlename)
        public void Show(string titlename,string if_logic,bool _bool)
        {
          

@@ -30,7 +30,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);
@@ -110,12 +110,12 @@

                        Text = k.ToString().Length == 1 ? "0" + k.ToString() : k.ToString(),
                        Y = Application.GetRealHeight(40),
                        Height = Application.GetMinRealAverage(100),
                        Width = Application.GetMinRealAverage(100),
                        Height = Application.GetRealWidth(100),
                        Width = Application.GetRealWidth(100),
                        X = Application.GetRealWidth(35 * j) + Application.GetRealWidth(100 * (j - 1)),
                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                        SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        Radius = (uint)Application.GetRealHeight(50),
                        Radius = (uint)Application.GetRealWidth(50),
                        BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                        SelectedBackgroundColor = ZigbeeColor.Current.LogicAddColor,
                        Tag = k,
@@ -162,7 +162,7 @@
                if (monselectedlist.Count == 0)
                {

                    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();
@@ -186,10 +186,26 @@
                Common.Logic.CurrentLogic.TimeAttribute.Repeat = 3;
                Common.Logic.CurrentLogic.TimeAttribute.MonthDate = intvalue;

                var logicCommunalPage = new LogicCommunalPage();
                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });

                if (LogicView.IfString._LockLogic == if_logic)
                {
                    //跳到s_one门锁编辑界面
                    var oneLogic = new OneLogic();
                    UserView.HomePage.Instance.AddChidren(oneLogic);
                    UserView.HomePage.Instance.PageIndex += 1;
                    oneLogic.Show(_bool);
                }
                else
                {

                    var logicCommunalPage = new LogicCommunalPage { };
                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                    UserView.HomePage.Instance.PageIndex += 1;
                    logicCommunalPage.Show(() => { });
                }


               

            };