黄学彪
2020-11-20 99253403b560f761d5f9af8b4f5140496996433a
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
@@ -270,7 +270,7 @@
                else
                {
                    var frameBack = new FrameLayout();
                    frameBack.X = ControlCommonResourse.XXLeft;
                    frameBack.X = HdlControlResourse.XXLeft;
                    frameBack.Y = Application.GetRealHeight(178);
                    frameBack.BackgroundColor = UserCenterColor.Current.White;
                    frameBack.Width = bodyFrameLayout.Width;
@@ -297,7 +297,7 @@
        /// </summary>
        /// <param name="dicData"></param>
        /// <param name="listView"></param>
        private void InitDeviceObjectRow(Dictionary<int, List<CommonDevice>> dicData, VerticalListControl listView)
        private void InitDeviceObjectRow(Dictionary<string, List<CommonDevice>> dicData, VerticalListControl listView)
        {
            var scrolContr = new RoomDeviceGroupMenuControl(dicData);
            this.frameDeviceTable.AddChidren(scrolContr);
@@ -328,15 +328,15 @@
            foreach (var device in listDevice)
            {
                var frameRow = new FrameRowControl(listView.rowSpace / 2);
                frameRow.LeftOffset = Application.GetRealWidth(46) - ControlCommonResourse.XXLeft;
                frameRow.RightOffset = -ControlCommonResourse.XXLeft;
                frameRow.LeftOffset = Application.GetRealWidth(46) - HdlControlResourse.XXLeft;
                frameRow.RightOffset = -HdlControlResourse.XXLeft;
                listView.AddChidren(frameRow);
                //图标
                var btnIcon = frameRow.AddLeftIcon(81);
                Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
                HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);
                //名称
                var btnView = frameRow.AddLeftCaption(string.Empty, 600);
                btnView.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
                btnView.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                btnView.TextSize = 15;
                //底线
                frameRow.AddBottomLine();
@@ -345,7 +345,7 @@
                btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";
                btnSelect.SelectedImagePath = "Item/ItemSelected.png";
                string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
                string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
                if (dicSelectDevice.ContainsKey(mainKeys) == true)
                {
                    btnSelect.IsSelected = true;
@@ -385,11 +385,11 @@
        /// 获取分组后的设备
        /// </summary>
        /// <returns></returns>
        private Dictionary<int, List<CommonDevice>> GetAllGroupDevice()
        private Dictionary<string, List<CommonDevice>> GetAllGroupDevice()
        {
            //全部的设备
            var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);
            var dic = new Dictionary<int, List<CommonDevice>>();
            var dic = new Dictionary<string, List<CommonDevice>>();
            foreach (var device in listDevice)
            {
                if (memberShardInfo.dicAllShardKeys.ContainsKey(device.FilePath) == true)
@@ -397,12 +397,12 @@
                    //如果已经分享了,则不显示
                    continue;
                }
                var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
                if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
                var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
                if (dic.ContainsKey(typeInfo.BeloneText) == false)
                {
                    dic[typeInfo.BeloneTextId] = new List<CommonDevice>();
                    dic[typeInfo.BeloneText] = new List<CommonDevice>();
                }
                dic[typeInfo.BeloneTextId].Add(device);
                dic[typeInfo.BeloneText].Add(device);
            }
            return dic;
        }