首次合并了全部的代码

黄学彪

2019-10-15 2bf5ec775cb57d8015bee58c745a1e48081ff1b1

 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