2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

 ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs

@@ -333,11 +333,11 @@


            //设备图标背景控件

            var frameIconBackGroud = new FrameLayout();

            frameIconBackGroud.Height = Application.GetMinRealAverage(112);

            frameIconBackGroud.Width = Application.GetMinRealAverage(112);

            frameIconBackGroud.Height = this.GetPictrueRealSize(112);

            frameIconBackGroud.Width = this.GetPictrueRealSize(112);

            frameIconBackGroud.Gravity = Gravity.CenterVertical;

            frameIconBackGroud.X = Application.GetRealWidth(46);

            frameIconBackGroud.Radius = (uint)Application.GetMinRealAverage(112 / 2);

            frameIconBackGroud.Radius = (uint)this.GetPictrueRealSize(112 / 2);

            frameIconBackGroud.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;

            rowDevice.AddChidren(frameIconBackGroud, ChidrenBindMode.NotBind);

            frameIconBackGroud.Y += rowDevice.chidrenYaxis;

@@ -348,14 +348,14 @@
            Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, device);

            frameIconBackGroud.AddChidren(btnDeviceIcon);

            //重新绑定事件

            rowDevice.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEventOnly);

            rowDevice.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEvent);



            //设备名字

            var btnDeviceName = new NormalViewControl(600, 60, true);

            btnDeviceName.X = Application.GetRealWidth(181);

            btnDeviceName.Gravity = Gravity.CenterVertical;

            btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);

            rowDevice.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);

            rowDevice.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);

            btnDeviceName.Y += rowDevice.chidrenYaxis;

            //底线

            var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);

@@ -517,7 +517,7 @@
                    string path1 = string.Empty;

                    string path2 = string.Empty;

                    //获取图片

                    LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                    dic[typeInfo.BeloneTextId].IconPathSelected = path2;

                    dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;