2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs

@@ -41,9 +41,9 @@
        /// </summary>

        private Dictionary<string, CommonDevice> dicSelectDevice = new Dictionary<string, CommonDevice>();

        /// <summary>

        /// 当前选择的分支 1：场景  2：功能

        /// 当前选择的分支 0：场景  1：功能

        /// </summary>

        private int nowSwitchIndex = 1;

        private int nowSwitchIndex = 0;

        /// <summary>

        /// 当前选择的设备索引

        /// </summary>

@@ -126,7 +126,7 @@
            tabControl.SelectTabEvent += (tabIndex) =>

            {

                this.nowSwitchIndex = tabIndex;

                if (tabIndex == 1)

                if (tabIndex == 0)

                {

                    //显示场景列表

                    this.frameSceneTable.Visible = true;

@@ -139,7 +139,11 @@
                    this.frameDeviceTable.Visible = true;

                }

            };

            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

@@ -155,12 +159,15 @@
            this.frameSceneTable.RemoveAll();



            var listScene = new List<Common.SceneUI>();

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

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

            {

                if (HdlShardLogic.Current.IsFileExists(lookRoom.SceneUIList[i].FileName) == true)

                var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{lookRoom.ListSceneId[i]}.json");

                if (byteData == null)

                {

                    listScene.Add(lookRoom.SceneUIList[i]);

                    continue;

                }

                var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));

                listScene.Add(sceneUi);

            }

            if (listScene.Count == 0)

            {

@@ -171,46 +178,24 @@


            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                var listView = new VerticalFrameControl(29);

                var listView = new VerticalFrameControl(3);

                listView.Y = Application.GetRealHeight(53);

                listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);

                frameSceneTable.AddChidren(listView);



                foreach (var data in listScene)

                {

                    //场景图片

                    var frameContr = new FrameLayoutControl();

                    frameContr.UseClickStatu = false;

                    frameContr.Height = Application.GetRealHeight(470);

                    listView.AddChidrenFrame(frameContr);



                    //场景图片

                    var btnPic = new ImageView();

                    btnPic.X = Application.GetRealWidth(179);

                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = (uint)Application.GetRealHeight(17);

                    frameContr.AddChidren(btnPic);



                    var btnName = new NormalViewControl(251, 282, true);

                    btnName.IsMoreLines = true;

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.RadiusEx = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

                    btnName.TextAlignment = TextAlignment.Center;

                    frameContr.AddChidren(btnName);

                    //场景控件

                    var frameContr = new ScenePictrueControl();

                    listView.AddChidren(frameContr);

                    frameContr.InitControl(data);



                    var btnSelect = new IconViewControl(58);

                    btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";

                    btnSelect.SelectedImagePath = "Item/ItemSelected.png";

                    btnSelect.X = Application.GetRealWidth(887);

                    btnSelect.Y = Application.GetRealHeight(35);

                    frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly);

                    frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEvent);

                    if (dicSelectScene.ContainsKey(data.Id) == true)

                    {

                        btnSelect.IsSelected = true;

@@ -452,8 +437,9 @@
        {

            //获取这个房间里面的分享设备

            var listDevice = new List<CommonDevice>();

            foreach (var deviceFile in this.lookRoom.DeviceUIFilePathList)

            foreach (var deviceKeys in this.lookRoom.ListDevice)

            {

                string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);

                if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true)

                {

                    var strArry = deviceFile.Split('_');