全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

 ZigbeeApp/Shared/Phone/Device/Room/AddRoom.cs

@@ -290,7 +290,7 @@
            };
            settingContentFL.AddChidren(settingLine);

            confirm = new Device.CommonForm.CompleteButton(1700, 700, 90);
            confirm = new Device.CommonForm.CompleteButton(1700, 700, 127);
            confirm.SetTitle(R.MyInternationalizationString.Confrim);
            this.AddChidren(confirm);
            #endregion