请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs

@@ -93,7 +93,7 @@
            var listRoom = new List<Common.Room>();

            foreach (string roomId in this.dicAllData.Keys)

            {

                listRoom.Add(Common.Room.CurrentRoom.GetRoomById(roomId));

                listRoom.Add(HdlRoomLogic.Current.GetRoomById(roomId));

            }



            //初始化房间菜单控件

@@ -129,7 +129,7 @@
        private void InitTopRightMenuControl()

        {

            //获取楼层

            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                return;

@@ -143,6 +143,7 @@
            btnFloor.Gravity = Gravity.CenterVertical;

            btnFloor.X = btnIconContr.X + btnIconContr.btnIcon.X - Application.GetRealWidth(300);

            btnFloor.TextAlignment = TextAlignment.CenterRight;

            btnFloor.IsBold = true;

            topFrameLayout.AddChidren(btnFloor);



            foreach (var floorId in dicFloor.Keys)

@@ -156,10 +157,10 @@
            btnIconContr.ButtonClickEvent += (sender, e) =>

            {

                //楼层菜单

                var contr = new TopRightMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, this.nowSelectFloorId, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                foreach (var floorId in dicFloor.Keys)

                {

                    contr.AddRowMenu(dicFloor[floorId], "Floor/Floor.png", "Floor/FloorSelected.png", () =>

                    contr.AddRowMenu(floorId, () =>

                    {

                        //记录起选择的ID

                        this.nowSelectFloorId = floorId;

@@ -242,7 +243,7 @@
            var dicData = new Dictionary<string, Dictionary<int, uRowInformation>>();

            //获取本地安防的场景

            Dictionary<int, string> dicScene = HdlSafeguardLogic.Current.GetLocalSceneByZoneID(this.zoonID);

            var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.nowSelectFloorId);

            var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.nowSelectFloorId);



            for (int i = 0; i < listRoom.Count; i++)

            {

@@ -271,9 +272,9 @@
            }

            var dicRoomData = new Dictionary<int, uRowInformation>();



            for (int j = 0; j < i_room.DeviceUIList.Count; j++)

            for (int j = 0; j < i_room.ListDevice.Count; j++)

            {

                var device = i_room.DeviceUIList[j].CommonDevice;

                var device = Common.LocalDevice.Current.GetDevice(i_room.ListDevice[j]);

                //如果那个设备已经添加了，则不再显示

                if (device == null || HdlSafeguardLogic.Current.IsAlarmDeviceExist(this.zoonID, device) == true)

                {

@@ -290,7 +291,7 @@


                    var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);

                    //获取图片

                    Common.LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref unSelectPath, ref selectPath);

                    Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref unSelectPath, ref selectPath);

                    if (dicRoomData.ContainsKey(typeInfo.BeloneTextId) == false)

                    {

                        dicRoomData[typeInfo.BeloneTextId] = new uRowInformation();

@@ -299,10 +300,15 @@
                    dicRoomData[typeInfo.BeloneTextId].listDevice.Add(device);

                }

            }

            for (int j = 0; j < i_room.SceneUIList.Count; j++)

            for (int j = 0; j < i_room.ListSceneId.Count; j++)

            {

                //如果那个场景已经添加了，则不再显示

                if (dicScene.ContainsKey(i_room.SceneUIList[j].Id) == true)

                if (dicScene.ContainsKey(i_room.ListSceneId[j]) == true)

                {

                    continue;

                }

                var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(i_room.ListSceneId[j]);

                if (sceneUi == null)

                {

                    continue;

                }

@@ -312,7 +318,7 @@
                    dicRoomData[R.MyInternationalizationString.uScence].IconPath = "Scene/SceneIcon.png";

                    dicRoomData[R.MyInternationalizationString.uScence].listScene = new List<Common.SceneUI>();

                }

                dicRoomData[R.MyInternationalizationString.uScence].listScene.Add(i_room.SceneUIList[j]);

                dicRoomData[R.MyInternationalizationString.uScence].listScene.Add(sceneUi);

            }

            return dicRoomData;

        }