Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-28 af0266fa5570b6adcdb22f631bf13170e8646ca5

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

@@ -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,
            };