合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

old mode 100644
new mode 100755
@@ -263,7 +263,7 @@
            };
            sharedFL.AddChidren(sharedLine);

            var confirmBtn = new Device.CommonForm.CompleteButton()
            var confirmBtn = new Device.CommonForm.CompleteButton(1,2,3)
            {
                TextID = R.MyInternationalizationString.ConfirmAdd,
            };