???????

黄学彪

2020-04-15 23532fa8ad34c89b6d24b01eaef6475fd0aad898

 ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs

@@ -68,7 +68,7 @@
            bodyFrameLayout.AddChidren(tabControl);

            tabControl.SelectTabEvent += (tabIndex) =>

            {

                if (tabIndex == 1)

                if (tabIndex == 0)

                {

                    //显示场景列表

                    this.ShowSceneList();

@@ -79,7 +79,11 @@
                    this.ShowFunctionList();

                }

            };

            tabControl.InitControl();

            var listTitle = new List<string>();

            //场景,功能

            listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));

            listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));

            tabControl.InitControl(listTitle);

        }



        #endregion

@@ -95,18 +99,23 @@
            this.frameTable.RemoveAll();

            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                if (lookRoom.SceneUIList.Count == 0)

                if (lookRoom.ListSceneId.Count == 0)

                {

                    //还没有添加场景哦

                    this.ShowNotDataImage(frameTable, Language.StringByID(R.MyInternationalizationString.uDoNotHadAddScenceMsg));

                    return;

                }

                var listView = new VerticalFrameControl(29);

                var listView = new VerticalFrameControl(3);

                listView.Height = frameTable.Height;

                frameTable.AddChidren(listView);



                foreach (var data in lookRoom.SceneUIList)

                foreach (var dataId in lookRoom.ListSceneId)

                {

                    var data = HdlSceneLogic.Current.GetSceneUIBySceneId(dataId);

                    if (data == null)

                    {

                        continue;

                    }

                    //场景控件

                    var frameContr = new ScenePictrueControl();

                    listView.AddChidrenFrame(frameContr);

@@ -223,7 +232,7 @@
        private Dictionary<int, DeviceRowInfo> GetAllGroupDevice()

        {

            //全部的设备

            var listDevice = lookRoom.GetRoomListDevice();

            var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);

            var dic = new Dictionary<int, DeviceRowInfo>();

            foreach (var device in listDevice)

            {