2019.12.23

gxc

2019-12-23 ddb46a700775aacfb6cc82d9586302a38c8fa0a7

 ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs

@@ -357,7 +357,8 @@
                TextID = R.MyInternationalizationString.EditInfo,
                TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14
                TextSize = 15,
                IsBold=true
            };
            infoFL.AddChidren(infoEdit);

@@ -404,7 +405,8 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextID = R.MyInternationalizationString.AddScentTargetAction,
                Gravity = Gravity.CenterVertical
                Gravity = Gravity.CenterVertical,
                TextSize=15
            };
            addTargetFL.AddChidren(target);

@@ -484,24 +486,25 @@
                    Height = Application.GetRealHeight(450),
                    Width = Application.GetRealWidth(selectRow_Width),
                    Gravity = Gravity.CenterHorizontal,
                    Radius = (uint)Application.GetRealHeight(17),
                    Radius = (uint)Application.GetRealHeight(35),
                    BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
                };
                selectFL.AddChidren(itemFL);
                itemFL.Animate = Animate.DownToUp;
                //itemFL.Animate = Animate.DownToUp;

                var selectLocalPicture = new Button()
                {
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.LocalPicture,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    TextSize=17
                };
                itemFL.AddChidren(selectLocalPicture);
                var selectLocalLine = new Button()
                {
                    Y = selectLocalPicture.Bottom,
                    Height = 1,
                    BackgroundColor = ZigbeeColor.Current.GXCLineColor
                    BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
                };
                itemFL.AddChidren(selectLocalLine);

@@ -510,14 +513,15 @@
                    Y = selectLocalLine.Bottom,
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.Photograph,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    TextSize=17
                };
                itemFL.AddChidren(selectPhotographBtn);
                var selectPhotographLine = new Button()
                {
                    Y = selectPhotographBtn.Bottom,
                    Height = 1,
                    BackgroundColor = ZigbeeColor.Current.GXCLineColor,
                    BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
                };
                itemFL.AddChidren(selectPhotographLine);

@@ -526,7 +530,8 @@
                    Y = selectPhotographLine.Bottom,
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.MyAblums,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    TextSize=17
                };
                itemFL.AddChidren(selectAblumsBtn);

@@ -539,7 +544,8 @@
                    TextID = R.MyInternationalizationString.Cancel,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    Radius = (uint)Application.GetRealHeight(17)
                    Radius = (uint)Application.GetRealHeight(35),
                    TextSize=17
                };
                selectFL.AddChidren(cancelBtn);

@@ -700,24 +706,25 @@
                    Height = Application.GetRealHeight(450),
                    Width = Application.GetRealWidth(selectRow_Width),
                    Gravity=Gravity.CenterHorizontal,
                    Radius = (uint)Application.GetRealHeight(17),
                    Radius = (uint)Application.GetRealHeight(35),
                    BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
                };
                selectFL.AddChidren(itemFL);
                itemFL.Animate = Animate.DownToUp;
                //itemFL.Animate = Animate.DownToUp;

                var selectedFunctionBtn = new Button()
                {
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.Function,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    TextSize=17
                };
                itemFL.AddChidren(selectedFunctionBtn);
                var selectedFunctionLine = new Button()
                {
                    Y = selectedFunctionBtn.Bottom,
                    Height = 1,
                    BackgroundColor = ZigbeeColor.Current.GXCLineColor
                    BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
                };
                itemFL.AddChidren(selectedFunctionLine);

@@ -726,14 +733,15 @@
                    Y = selectedFunctionLine.Bottom,
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.Scence,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    TextSize=17
                };
                itemFL.AddChidren(selectedSceneBtn);
                var selectedSceneLine = new Button()
                {
                    Y = selectedSceneBtn.Bottom,
                    Height = 1,
                    BackgroundColor = ZigbeeColor.Current.GXCLineColor,
                    BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
                };
                itemFL.AddChidren(selectedSceneLine);

@@ -742,7 +750,8 @@
                    Y = selectedSceneLine.Bottom,
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.Delay,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    TextSize=17
                };
                itemFL.AddChidren(selectedTimerBtn);

@@ -756,7 +765,8 @@
                    TextID = R.MyInternationalizationString.Cancel,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    Radius = (uint)Application.GetRealHeight(17)
                    Radius = (uint)Application.GetRealHeight(35),
                    TextSize=17
                };
                selectFL.AddChidren(cancelBtn);