合并前上传一个版本

黄学彪

2021-03-15 df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0

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

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

        /// <summary>
        /// wifi名
        /// </summary>
        private string wifiName = string.Empty;
        /// <summary>
        /// wifi密码
        /// </summary>
        private string wifiPassword = string.Empty;

        #endregion

        #region ■ 初始化_____________________________
@@ -20,8 +29,13 @@
        /// <summary>
        /// 画面显示(底层会固定调用此方法，借以完成画面创建)
        /// </summary>
        public void ShowForm()
        /// <param name="i_wifiName">wifi名(别的界面传过来的)</param>
        /// <param name="i_wifiPassword">(别的界面传过来的)</param>
        public void ShowForm(string i_wifiName, string i_wifiPassword)
        {
            this.wifiName = i_wifiName;
            this.wifiPassword = i_wifiPassword;

            //设置头部信息
            base.SetTitleText(Language.StringByID(StringId.AddInfraredRemoteControl));
            //这个界面的背景需要白色
@@ -62,12 +76,9 @@
            //搜索时间(秒)
            int searchTime = 5;

#if __IOS__
#endif
#if __Android__
            //安卓搜索蓝牙(特效问题,加1秒)
            this.StartSearchBluetoothOnAndriod(searchTime + 1);
#endif
            //搜索蓝牙(特效问题,加1秒)
            this.StartSearchBluetooth(searchTime + 1);

            HdlThreadLogic.Current.RunThread(() =>
            {
                //进度条特效
@@ -84,19 +95,18 @@

        #endregion

        #region ■ 安卓搜索蓝牙_______________________
        #region ■ 搜索蓝牙___________________________

#if __Android__
        /// <summary>
        /// 安卓搜索蓝牙
        /// </summary>
        /// <param name="i_searchTime">搜索时间(秒)</param>
        private void StartSearchBluetoothOnAndriod(int i_searchTime)
        private void StartSearchBluetooth(int i_searchTime)
        {
            //开始搜索蓝牙
            HdlAndroidBluetoothLogic.Current.ScanBluetooth(i_searchTime, (listBluetooth) =>
            HdlBluetoothLogic.Current.ScanBluetooth(i_searchTime, (listBluetooth) =>
            {
                var listDevice = new List<HdlAndroidBluetoothLogic.BluetoothInfo>();
                var listDevice = new List<HdlBluetoothLogic.BluetoothInfo>();
                foreach (var device in listBluetooth)
                {
                    //只有这个标识,才是红外宝
@@ -109,7 +119,7 @@
                if (listDevice.Count == 0)
                {
                    //摧毁蓝牙缓存
                    HdlAndroidBluetoothLogic.Current.Dispone();
                    HdlBluetoothLogic.Current.Dispone();
                    //显示失败界面
                    HdlThreadLogic.Current.RunMain(() =>
                    {
@@ -119,7 +129,7 @@
                else if (listDevice.Count == 1)
                {
                    //如果只检测到一个,则直接连接
                    HdlAndroidBluetoothLogic.Current.ContectBluetooth(listDevice[0], (result) =>
                    HdlBluetoothLogic.Current.ContectBluetooth(listDevice[0], (result) =>
                    {
                        if (result == true)
                        {
@@ -128,8 +138,12 @@
                            {
                                this.CloseForm();
                                var form = new AddMiniRemoteControlDirection3Page();
                                form.AddForm();
                                form.AddForm(this.wifiName, this.wifiPassword);
                            });
                        }
                        else
                        {
                            HdlBluetoothLogic.Current.Dispone();
                        }
                    });
                }
@@ -144,7 +158,7 @@
                    this.ShowBluetoothListView(listName, (index) =>
                    {
                        //如果只检测到一个,则直接连接
                        HdlAndroidBluetoothLogic.Current.ContectBluetooth(listDevice[index], (result) =>
                        HdlBluetoothLogic.Current.ContectBluetooth(listDevice[index], (result) =>
                        {
                            if (result == true)
                            {
@@ -153,15 +167,18 @@
                                {
                                    this.CloseForm();
                                    var form = new AddMiniRemoteControlDirection3Page();
                                    form.AddForm();
                                    form.AddForm(this.wifiName, this.wifiPassword);
                                });
                            }
                            else
                            {
                                HdlBluetoothLogic.Current.Dispone();
                            }
                        });
                    });
                }
            });
        }
#endif

        #endregion

@@ -232,8 +249,17 @@
            var btnReSearch = this.AddBottomClickButton(Language.StringByID(StringId.ReSearch));
            btnReSearch.ButtonClickEvent += (sender, e) =>
            {
                //初始化中部信息
                this.InitMiddleFrame();
                //检测蓝牙需要的东西
                btnReSearch.CanClick = false;
                HdlBluetoothLogic.Current.CheckCanScanBluetooth((result) =>
                {
                    btnReSearch.CanClick = true;
                    if (result == true)
                    {
                        //初始化中部信息
                        this.InitMiddleFrame();
                    }
                });
            };
        }