合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

old mode 100755
new mode 100644
@@ -84,6 +84,8 @@
            this.AddSensorDeviceReportEvent();

            //开启传感器状态还原的线程

            this.StartRecoverSenorStatuThread();

            //显示App公告

            this.ShowAppNotice();

        }



        /// <summary>

@@ -630,6 +632,11 @@
                    {

                        cardContr = new Controls.DevicePmSensorCardControl();

                    }

                    // 晾衣架 
                    else if (device.Type == DeviceType.Airer)

                    {

                        cardContr = new Controls.DeviceAirerCardControl();

                    }

                    //彩灯(调光器)

                    else if (device.Type == DeviceType.DimmableLight)

                    {

@@ -643,7 +650,17 @@
                    //温湿度

                    else if (device.Type == DeviceType.TemperatureSensor)

                    {

                        cardContr = new Controls.DeviceTemperatureCardControl();

                        //空气质量传感器 
                        //获取设备类型

                        var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });

                        if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)

                        {

                            cardContr = new Controls.DeviceAirQualitySensorCardControl();

                        }

                        else

                        {

                            cardContr = new Controls.DeviceTemperatureCardControl();

                        }

                    }

                    //门锁

                    else if (device.Type == DeviceType.DoorLock)

@@ -656,7 +673,7 @@
                        cardContr = new Controls.DeviceColorTemperatureCardControl();

                    }

                    //无法识别

                    else

                    if (cardContr == null)

                    {

                        cardContr = new Controls.DeviceCardCommon();

                    }

@@ -697,6 +714,7 @@
                        }

                        HdlThreadLogic.Current.RunThread(() =>

                        {

                            int sendCount = 0;

                            while (listDeviceBackContr.Parent != null)

                            {

                                bool hadSend = false;

@@ -712,7 +730,7 @@
                                        //发送获取状态的命令

                                        listContr[i].SendStatuComand();

                                        hadSend = true;

                                        System.Threading.Thread.Sleep(200);

                                        System.Threading.Thread.Sleep(300);

                                    }

                                }

                                if (hadSend == false)

@@ -720,7 +738,13 @@
                                    //如果已经全部回路都接收了网关回复,则不再二次发送

                                    break;

                                }

                                System.Threading.Thread.Sleep(2000);

                                sendCount++;

                                if (sendCount == 2)

                                {

                                    //就发2次

                                    break;

                                }

                                System.Threading.Thread.Sleep(5000);

                            }

                        }, ShowErrorMode.NO);

                    }

@@ -1114,6 +1138,18 @@
                {

                    //处理一般设备的上报数据

                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);



                    //晾衣架上报需要特殊处理，其他上报的回路统一转为端点1

                    var tempList = LocalDevice.Current.GetDevicesByMac(report.DeviceAddr);

                    if (tempList.Count > 0)

                    {

                        var tempDeviceEnum = LocalDevice.Current.GetMyDeviceEnumInfo(tempList);

                        if (tempDeviceEnum.ConcreteType == Common.DeviceConcreteType.Airer)

                        {

                            mainKeys = report.DeviceAddr + "_" + 1;

                        }

                    }



                    if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)

                    {

                        //刷新卡片信息

@@ -1280,6 +1316,109 @@
            return true;

        }



        /// <summary>

        /// 显示App公告

        /// </summary>

        private void ShowAppNotice()

        {

            HdlThreadLogic.Current.RunThread(() =>

            {

                if (HdlFirmwareUpdateLogic.CheckCanShowNotice() == true)

                {

                    while (this.IsFormOpen("HdlAutoBackupForm") == true)

                    {

                        //自动备份的界面正在打开中

                        System.Threading.Thread.Sleep(1000);

                    }

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        //加载系统公告

                        var form2 = new AppNoticeForm();

                        UserView.UserPage.Instance.AddChidren(form2);

                        form2.Show();

                        form2.FinishEvent += () =>

                        {

                            HdlThreadLogic.Current.RunThread(() =>

                            {

                                System.Threading.Thread.Sleep(1000);

                                //显示App升级的弹窗

                                this.ShowUpdateAppDialog();



                            }, ShowErrorMode.NO);

                        };



                    }, ShowErrorMode.NO);

                }

                else

                {

                    //显示App升级的弹窗

                    this.ShowUpdateAppDialog();

                }

            }, ShowErrorMode.NO);

        }



        /// <summary>

        /// 显示App升级的弹窗

        /// </summary>

        private void ShowUpdateAppDialog()

        {

            //App升级提示

            if (string.IsNullOrEmpty(FirmwareUpdateResourse.AppNeedUpdateUrl) == false)

            {

                //整了一次之后就不整了

                string updateUrl = FirmwareUpdateResourse.AppNeedUpdateUrl;

                FirmwareUpdateResourse.AppNeedUpdateUrl = string.Empty;



                while (this.IsFormOpen("HdlAutoBackupForm") == true)

                {

                    //自动备份的界面正在打开中

                    System.Threading.Thread.Sleep(1000);

                }

                //发现APP新版本,马上升级{0}开启新体验哦~

                this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uAppUpdateMsg1).Replace("{0}", "\r\n"), () =>

                {

#if iOS

                    Uri url = new Uri(updateUrl);

                    UIKit.UIApplication.SharedApplication.OpenUrl(url);

#endif

#if Android

                    HDLUtils.OpenUrl(updateUrl);

#endif

                }, Language.StringByID(R.MyInternationalizationString.uLevelUp));

                //App升级提示优先

                return;

            }

            //网关升级提示

            if (FirmwareUpdateResourse.ListGatewayNeedUpdate.Count > 0)

            {

                //整完之后就清空

                var listGateway = new List<string>();

                listGateway.AddRange(FirmwareUpdateResourse.ListGatewayNeedUpdate);

                FirmwareUpdateResourse.ListGatewayNeedUpdate = new List<string>();



                while (this.IsFormOpen("HdlAutoBackupForm") == true)

                {

                    //自动备份的界面正在打开中

                    System.Threading.Thread.Sleep(1000);

                }

                foreach (var gwId in listGateway)

                {

                    //目前只整一个

                    if (HdlGatewayLogic.Current.IsGatewayExist(gwId) == true)

                    {

                        //发现网关新版本,马上升级{0}开启新体验哦~

                        this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uGatewayUpdateMsg1).Replace("{0}", "\r\n"), () =>

                        {

                            var form = new UserCenter.GatewayUpdate.GatewayFirmwareUpdateForm();

                            form.AddForm(HdlGatewayLogic.Current.GetLocalGateway(gwId));

                        });

                        break;

                    }

                }

                return;

            }

        }



        #endregion



        #region ■ 界面重新激活事件___________________

@@ -1293,6 +1432,6 @@
            return 1;

        }



        #endregion

#endregion

    }

}