合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

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

            #region  界面的布局代码
@@ -97,8 +97,8 @@
                FunView monView = new FunView();
                monView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
                monView.funnameBtn.Text= name;
                monView.funnextBtn.Width = Application.GetMinRealAverage(60);
                monView.funnextBtn.Height = Application.GetMinRealAverage(60);
                monView.funnextBtn.Width = Application.GetRealWidth(60);
                monView.funnextBtn.Height = Application.GetRealWidth(60);
                monView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
                monView.funnextBtn.Visible = false;
                middle.AddChidren(monView.FunFrameView());
@@ -172,7 +172,7 @@
                }
                if (weekvalue == 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();
@@ -181,10 +181,23 @@
                Common.Logic.CurrentLogic.TimeAttribute.Repeat = 5;
                Common.Logic.CurrentLogic.TimeAttribute.WeekDay = weekvalue;

                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(() => { });
                }
            };