2020-04-15-1

WJC

2020-04-15 323876bfe85fc2684871d5d95c213c6e2713f3f4

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

@@ -84,6 +84,16 @@
                    //过滤掉不支持的设备
                    continue;
                }
                if (device.Type == DeviceType.DoorLock)
                {
                    var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                    if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
                    {
                        //暂时不支持S-one门锁;
                        //过滤掉不支持S-one门锁设备;
                        continue;
                    }
                }
                deviceUIlist.Add(device);
            }
            return deviceUIlist;
@@ -341,7 +351,7 @@
                        deviceTypeList.Add(DeviceType.Thermostat);
                        deviceTypeList.Add(DeviceType.AirSwitch);
                        ///门锁特殊
                        deviceTypeList.Add(DeviceType.DoorLock);
                       // deviceTypeList.Add(DeviceType.DoorLock);
                    }
                    break;
                case "condition_mould":
@@ -363,7 +373,7 @@
                        deviceTypeList.Add(DeviceType.Thermostat);
                        deviceTypeList.Add(DeviceType.AirSwitch);
                        ///门锁特殊
                        deviceTypeList.Add(DeviceType.DoorLock);
                      // deviceTypeList.Add(DeviceType.DoorLock);
                    }
                    break;

@@ -757,7 +767,17 @@
                {
                    succeed = true;
                    CurrentLogic.LogicId = logicifon.LogicId;
                    Common.Logic.LogicList.Add(CurrentLogic);
                    if (LogicView.IfString._LockLogic == if_logic)
                    {
                        //门锁联动事件逻辑列表
                        Common.Logic.LockLogicList.Add(CurrentLogic);
                    }
                    else
                    {
                        //自动化逻辑列表
                        Common.Logic.LogicList.Add(CurrentLogic);

                    }
                    if (tag)
                    {
                        Send.Zj(tag, CurrentLogic);
@@ -786,10 +806,9 @@

            if (LogicView.IfString._Logic == if_logic)
            {
                UserView.HomePage.Instance.RemoveViewByTag("Logic");
                if (CurrentLogic.LogicType == 0)
                {
                   
                    UserView.HomePage.Instance.RemoveViewByTag("Logic");
                    //只刷新分类上下滑动view；
                    Phone.Category.CategoryMainForm.instance?.RefreshBodyView();
                    // Category.Category.instance?.RefreshBodyView();
@@ -826,6 +845,9 @@
            deviceTarget.Show(str1, str2);
        }

       
        /// <summary>
        /// 界面高度
        /// </summary>
        public static int H = 1922;
    }
}