新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

 ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs

@@ -294,7 +294,7 @@


            //上一次选择的菜单和数据

            DeviceRowInfo nowSelectDeviceInfo = null;

            MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;

            MainPage.Controls.DeviceFunctionMenuControl oldSelectContr = null;

            foreach (string strText in dicGroupDevice.Keys)

            {

                var rowInfo = dicGroupDevice[strText];

@@ -305,9 +305,9 @@
                deviceFunctionMenuContr.AddChidren(devieFrame);



                //菜单图片控件

                var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();

                var deviceObjContr = new MainPage.Controls.DeviceFunctionMenuControl();

                devieFrame.AddChidren(deviceObjContr);

                deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);

                deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected);

                deviceObjContr.ButtonClickEvent += (sender, e) =>

                {

                    //选择的是同一个东西的话,不处理

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

                    string path2 = string.Empty;

                    //获取图片

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

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

                    dic[typeInfo.BeloneText].IconPath = path1;

                    dic[typeInfo.BeloneText].IconPathSelected = path2;

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