新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

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

@@ -255,7 +255,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;

@@ -315,15 +315,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();

@@ -332,7 +332,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;

@@ -378,7 +378,7 @@
            var dic = new Dictionary<string, List<CommonDevice>>();

            foreach (var device in listDevice)

            {

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

                var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);

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

                {

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

@@ -446,16 +446,20 @@
                string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);

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

                {

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

                    if (strArry.Length < 3)

                    //从分享文件中序列化回来

                    var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);

                    if (deviceData == null)

                    {

                        continue;

                    }

                    //从分享文件中序列化回来

                    var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);

                    try

                    {

                        var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData));

                        var jobject = Newtonsoft.Json.Linq.JObject.Parse(System.Text.Encoding.UTF8.GetString(deviceData));

                        if (jobject.Property("DeviceID") == null)

                        {

                            continue;

                        }

                        var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(Convert.ToInt32(jobject["DeviceID"].ToString()), System.Text.Encoding.UTF8.GetString(deviceData));

                        if (device != null)

                        {

                            listDevice.Add(device);