2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

 ZigbeeApp/Shared/Common/SceneUI.cs

@@ -27,7 +27,7 @@
        /// <summary>
        /// 场景id
        /// </summary>
        public int Id = int.MaxValue;
        public int Id = -1;

        /// <summary>
        /// 场景名
@@ -39,7 +39,7 @@
        /// </summary>
        public string IconPath = "Scene/SceneDefault.png";
        /// <summary>
        /// 图片来源 0--本地图库 1--拍照 2--系统图库 
        /// 图片来源 0--本地图库 1--拍照 2--系统图库
        /// </summary>
        public int IconPathType = 0;

@@ -73,6 +73,12 @@
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int SceneDelayTime = 0;


        /// <summary>
        /// 剩余触发时间，单位秒
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int RemainTime;



        /// <summary>

        /// 场景执行目标

@@ -145,7 +151,7 @@

                    if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
                    {
                       

                        if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
                        {
                            CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ThisSceneHaveNoDevice);
@@ -155,7 +161,7 @@
                    if (sceneDeviceList.getSceneDeviceListInfo != null)
                    {
                        var deviceList = sceneDeviceList.getSceneDeviceListInfo.DeviceList;
                        

                        if (deviceList != null && Room.AllRoomDeviceUIList.Count != 0)
                        {
                            foreach (var sceneDev in deviceList)
@@ -226,6 +232,7 @@
                }
            });
        }

        #endregion

        #region ◆ 保存____________________________