合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs

@@ -52,7 +52,7 @@
            framePic.AddChidren(btnLinght);



            //工作

            var btnWork = new NormalViewControl(Application.GetMinRealAverage(60), Application.GetMinRealAverage(40), false);

            var btnWork = new NormalViewControl(Application.GetMinRealAverage(70), Application.GetMinRealAverage(40), false);

            btnWork.X = Application.GetMinRealAverage(628);

            btnWork.Y = Application.GetMinRealAverage(113);

            btnWork.TextColor = UserCenterColor.Current.TextGrayColor3;

@@ -61,7 +61,7 @@
            framePic.AddChidren(btnWork);



            //配对

            var btnPair = new NormalViewControl(Application.GetMinRealAverage(60), Application.GetMinRealAverage(40), false);

            var btnPair = new NormalViewControl(Application.GetMinRealAverage(70), Application.GetMinRealAverage(40), false);

            btnPair.X = Application.GetMinRealAverage(628);

            btnPair.Y = Application.GetMinRealAverage(217);

            btnPair.TextColor = UserCenterColor.Current.TextGrayColor3;