Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-17 189e35185099a619ec3c2060fed34cd5eee848a4

 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection1Page.cs

@@ -13,6 +13,11 @@
    {
        #region ■ 变量声明___________________________

        /// <summary>
        /// 添加设备完成之后的回调事件(温总说他自己要这个东西)
        /// </summary>
        public Action<Entity.Function> AddDeviceEvent = null;

        #endregion

        #region ■ 初始化_____________________________
@@ -57,24 +62,35 @@
            var btnNext = this.AddBottomClickButton(Language.StringByID(StringId.Next));
            btnNext.ButtonClickEvent += (sender, e) =>
            {
#if __IOS__
#endif
#if __Android__
                //检测蓝牙需要的东西
                HdlAndroidBluetoothLogic.Current.CheckCanScanBluetooth((result) =>
                btnNext.CanClick = false;
                HdlBluetoothLogic.Current.CheckCanScanBluetooth((result) =>
                {
                    btnNext.CanClick = true;
                    if (result == true)
                    {
                        this.CloseForm();
                        //注意：这个界面不能关闭,它用来回调温总的界面用的
                        var form = new AddMiniRemoteControlDirection2Page();
                        //wifi和密码都为空
                        form.AddForm();
                        //初始wifi和密码为空
                        form.AddForm(string.Empty, string.Empty);
                    }
                });
#endif
            };
        }

        #endregion

        #region ■ 关闭界面___________________________

        /// <summary>
        /// 关闭界面
        /// </summary>
        public override void CloseFormBefore()
        {
            this.AddDeviceEvent = null;
            base.CloseFormBefore();
        }

        #endregion
    }
}