Merge branch 'dev' into dev-temp

hxb

2022-08-29 9a4629512ccf8359efd88671c9317c3cc7faf0c8

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs

@@ -290,7 +290,7 @@
                    if (int.Parse((sender as EditText).Text) > 72)

                    {

                        string msg0 = Language.StringByID(R.MyInternationalizationString.InvalidTimeMoreThan72);

                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));

                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));

                        alert.Show();

                        editInvalidTime.Text = "72";

                    }