20201208

wei

2020-12-08 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -73,6 +73,54 @@
            }
            return logicId;
        }

        /// <summary>
        /// 生成逻辑sid方法
        /// </summary>
        //public static string NewSid()
        //{
        //    String sLogicid = "";
        //    try
        //    {
        //        String sOidBeginsWith = "000101";//厂商 + 通讯方式
        //        //生成4个byte时间戳
        //        DateTime dt = DateTime.Now;
        //        long sTimeSp = GateWay.ConvertDateTimeLong(dt);
        //        string sTimeSpan = "";
        //        GateWay.ConvertIntToByteArray(sTimeSp, ref sTimeSpan);
        //        if (sTimeSpan.Length != 8) return sLogicid;
        //        //间隔10毫秒 错开时间戳
        //        HDLUDP.TimeBetwnNext(10);
        //        sLogicid = sOidBeginsWith + sTimeSpan;
        //        //1501 物模型为自动化， 0001 表示 1 号自动化功能
        //        sLogicid += "15";
        //        sLogicid += "1501";
        //        //自动化号自增
        //        int iTopSceneId = 1;
        //        if (myGateway.LogicResponse != null)
        //        {
        //            if (myGateway.LogicResponse.objects != null)
        //            {
        //                for (int i = 0; i < myGateway.LogicResponse.objects.Count; i++)
        //                {
        //                    string ccc = myGateway.LogicResponse.objects[i].sid.Substring(myGateway.LogicResponse.objects[i].sid.Length - 8, 4);
        //                    int iThisSceneId = Convert.ToInt16(myGateway.LogicResponse.objects[i].sid.Substring(myGateway.LogicResponse.objects[i].sid.Length - 8, 4), 16);
        //                    if (iThisSceneId >= iTopSceneId)
        //                        iTopSceneId = iThisSceneId + 1;
        //                }
        //            }
        //        }
        //        sLogicid += iTopSceneId.ToString("X4");//场景号 两个byte 
        //                                               //大类小类没有用到 固定为0
        //        sLogicid += "0000";
        //        return sLogicid;
        //    }
        //    catch
        //    {
        //        return sLogicid;
        //    }
        //}

        /// <summary>
        /// 封装Dictionary对象
        /// </summary>
@@ -95,7 +143,7 @@
        /// <returns></returns>
        public static List<HDL_ON.Entity.Room> GetGatewayRoomList() 
        {
            return HDL_ON.Entity.DB_ResidenceData.rooms;
            return HDL_ON.Entity.DB_ResidenceData.residenceData.Rooms;
        }
        /// <summary>
        /// 获取网关房间列表
@@ -106,8 +154,8 @@

            List<Entity.Room> roomList = new List<Entity.Room>();
            Entity.Room room1 = new Entity.Room();
            room1.name = name;//默认一个房间名为:全部区域
            room1.sid = "全部区域";//默认sid用识别该房间
            room1.roomName = name;//默认一个房间名为:全部区域
            room1.uid = "全部区域";//默认sid用识别该房间
            roomList.Add(room1);//默认添加到房间列表里
            var roomLists = GetGatewayRoomList();
            foreach (var room in roomLists)
@@ -218,11 +266,11 @@
            List<HDL_ON.Entity.Function> lists = GetGatewayDeviceList();
            foreach (var dev in lists)
            {
                if (dev.roomIds.Find((id) => id == room.sid) != null)
                if (dev.roomIds.Find((id) => id == room.uid) != null)
                {
                    deviceLists.Add(dev);
                }
                if (room.sid == "全部区域")
                if (room.uid == "全部区域")
                {
                    //房间名为全部区域时，显示网关全部设备
                    deviceLists = lists;
@@ -282,10 +330,10 @@

            foreach (var dev in device.roomIds)
            {
                var room = roomLists.Find((c) => c.sid == dev);
                var room = roomLists.Find((c) => c.uid == dev);
                if (room != null)
                {
                    roomName += room.floorName + "." + room.name + ",";
                    roomName += room.floorName + "." + room.roomName + ",";
                }
            }