Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs

@@ -69,6 +69,7 @@
            frameback.BackgroundImagePath = "Item/BottomButtonGround.png";

            bodyFrameLayout.AddChidren(frameback);

            var btnBackup = new NormalViewControl(400, 65, true);

            btnBackup.IsBold = true;

            btnBackup.TextColor = UserCenterColor.Current.White;

            btnBackup.TextSize = 16;

            btnBackup.Y = Application.GetRealHeight(49);

@@ -99,7 +100,7 @@
            bodyFrameLayout.AddChidren(btnRemind);

            btnRemind.ButtonClickEvent += (sender, e) =>

            {

                HdlAutoBackupLogic.SaveBackupNotPrompted(false, 1);

                HdlAutoBackupLogic.SaveBackupNotPrompted(false, 3);

                this.CloseForm();

            };

        }