2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -1,7 +1,6 @@
using System;

using System.Collections.Generic;

using System.Text;

using System.Threading.Tasks;

using ZigBee.Device;



namespace Shared.Phone.UserCenter.SharedContent

@@ -58,6 +57,7 @@
        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        /// <param name="i_room">查看的房间对象</param>

        /// <param name="i_memberShardInfo">成员的分享数据</param>

        public void ShowForm(Common.Room i_room, MemberShardInfoData i_memberShardInfo)

        {

            this.lookRoom = i_room;

@@ -196,18 +196,14 @@
                foreach (var data in listScene)

                {

                    //场景图片

                    var frameContr = new FrameLayoutControl();

                    frameContr.UseClickStatu = false;

                    frameContr.Width = Application.GetRealWidth(878);

                    frameContr.Height = Application.GetRealHeight(440);

                    frameContr.Gravity = Gravity.CenterHorizontal;

                    frameContr.BackgroundImagePath = data.IconPath;

                    var frameContr = new ScenePictrueControl();

                    listView.AddChidrenFrame(frameContr);

                    frameContr.InitControl(data);



                    var btnSelect = new IconViewControl(58);

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

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

                    btnSelect.X = Application.GetRealWidth(786);

                    btnSelect.X = Application.GetRealWidth(887);

                    btnSelect.Y = Application.GetRealHeight(35);

                    frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly);

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

@@ -236,6 +232,8 @@
                        }

                    };

                }

                //调整一下高度

                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(185));

            });

        }



@@ -262,13 +260,13 @@
                }

                else

                {

                    var frameBack = new FrameLayoutControl(false);

                    var frameBack = new FrameLayout();

                    frameBack.X = ControlCommonResourse.XXLeft;

                    frameBack.Y = Application.GetRealHeight(178);

                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

                    frameBack.Height = Application.GetRealHeight(1650);

                    frameBack.RadiusEx = 20;

                    frameBack.Radius = (uint)Application.GetRealHeight(58);

                    frameDeviceTable.AddChidren(frameBack);



                    var listView = new VerticalListControl(23);

@@ -365,6 +363,9 @@
                    }

                };

            }



            //列表自己有个23的Y轴坐标

            listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23), Application.GetRealHeight(300 - 23));

        }



        #endregion

@@ -387,44 +388,10 @@
                    //如果已经分享了,则不显示

                    continue;

                }

                var typeInfo = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });

                if (device.Type == DeviceType.IASZone)

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

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

                {

                    //这个强制为传感器

                    typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId1200;

                    typeInfo.ConcreteType = Common.DeviceConcreteType.Sensor;

                }

                if (device.Type == DeviceType.OnOffOutput)

                {

                    //继电器的时候,需要特殊处理

                    if (device.DfunctionType == DeviceFunctionType.A开关)

                    {

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uSwitch;

                    }

                    else if (device.DfunctionType == DeviceFunctionType.A插座)

                    {

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uSocket1;

                    }

                    else if (device.DfunctionType == DeviceFunctionType.A灯光)

                    {

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uLight;

                    }

                    else

                    {

                        //继电器

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId2300;

                    }

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

                    {

                        dic[typeInfo.BeloneTextId] = new List<CommonDevice>();

                    }

                }

                else

                {

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

                    {

                        dic[typeInfo.BeloneTextId] = new List<CommonDevice>();

                    }

                    dic[typeInfo.BeloneTextId] = new List<CommonDevice>();

                }

                dic[typeInfo.BeloneTextId].Add(device);

            }