合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

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

@@ -24,7 +24,7 @@
            var middle = new VerticalScrolViewLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184-260),
                Height = Application.GetRealHeight(Method.H - 184-260),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
@@ -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();