2019.12.2

gxc

2019-12-02 5204bc34549ba4718158c447cbb3c74b39ffe163

 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs

@@ -100,15 +100,17 @@
                Gravity = Gravity.CenterHorizontal
            };
            AddChidren(SceneIcon);
            SceneIcon.SetViewShadow(true);

            sceneBG = new Button
            {
                Width = Application.GetMinRealAverage(487),
                Height = Application.GetMinRealAverage(348),
                UnSelectedImagePath = "Item/SceneCard.png",
                Gravity = Gravity.CenterHorizontal
            };
            AddChidren(sceneBG);

            //sceneBG = new Button
            //{
            //    Width = Application.GetMinRealAverage(487),
            //    Height = Application.GetMinRealAverage(348),
            //    UnSelectedImagePath = "Item/SceneCard.png",
            //    Gravity = Gravity.CenterHorizontal
            //};
            //AddChidren(sceneBG);

            TimeButton = new Button()
            {
@@ -138,7 +140,7 @@
                Y = Application.GetMinRealAverage(239),
                Width = Application.GetMinRealAverage(279),
                Height = Application.GetMinRealAverage(60),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment = TextAlignment.CenterLeft,
            };
@@ -150,7 +152,7 @@
        /// </summary>
        private void InitStatu()
        {
            SetIimeByDelayTime(scene.SceneDelayTime);
            SetTimeByDelayTime(scene.SceneDelayTime);
            SetSceneNameText(scene.Name);
            SetIcon(scene.IconPath);
            SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));
@@ -158,7 +160,6 @@
            TimeButton.MouseUpEventHandler += SetTimeEvents;
            CollectButton.MouseUpEventHandler += CollectionEvent;
            SceneIcon.MouseUpEventHandler += SceneUpHandler;
            sceneBG.MouseUpEventHandler += SceneUpHandler;
            SceneNameButton.MouseUpEventHandler += SceneUpHandler;
        }

@@ -189,7 +190,7 @@
        /// SetIimeByDelayTime
        /// </summary>
        /// <param name="time"></param>
        public void SetIimeByDelayTime(int time)
        public void SetTimeByDelayTime(int time)
        {
            if (time > 0)
            {
@@ -216,7 +217,14 @@
        /// <param name="iconPath"></param>
        public void SetIcon(string iconPath)
        {
            SceneIcon.UnSelectedImagePath = iconPath;
            if (scene.IconPathType == 0)
            {
                SceneIcon.UnSelectedImagePath = iconPath;
            }
            else
            {
                SceneIcon.UnSelectedImagePath = System.IO.Path.Combine(Config.Instance.FullPath, iconPath);
            }
        }

        /// <summary>
@@ -322,7 +330,7 @@
            timeSelect.TimeAction = (t) =>
            {
                scene.SceneDelayTime = t;
                SetIimeByDelayTime(t);
                SetTimeByDelayTime(t);
            };
        }