合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -261,7 +261,7 @@
                btnPosition.ButtonClickEvent += (sender, e) =>

                {

                    //定位

                    Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0]);

                    Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0], true);

                };

            }



@@ -309,7 +309,7 @@
                    return;

                }

                var listMacDevice = LocalDevice.Current.GetDevicesByMac(deviceMac, false);

                if (LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)

                if (listMacDevice.Count > 0 && LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)

                {

                    //mini夜灯的功能设置界面

                    var room = HdlRoomLogic.Current.GetRoomByDevice(listMacDevice[0]);

@@ -377,7 +377,8 @@
                    }

                }

                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

                {

                    var listTemp = Common.LocalDevice.Current.GetPanelMatchEpointByMac(listDevice);

                    //展开模式时，扩大依据为:它有几个子控件

@@ -492,6 +493,16 @@
                var form = new DeviceMacInfoEditorForm();

                form.AddForm(device.DeviceAddr);

            }

            else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A晾衣架)

            {

                var form = new DeviceMacInfoEditorForm();

                form.AddForm(device.DeviceAddr);

            }

            else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A空气质量)

            {

                var form = new DeviceMacInfoEditorForm();

                form.AddForm(device.DeviceAddr);

            }

            else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A窗帘)

            {

                var form = new DeviceMacInfoEditorForm();

@@ -518,12 +529,6 @@
                var form = new DeviceAirConditioner.IndoorUnitSettionForm();

                form.AddForm((AC)device);

            }

            //环境面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

            {

                var form = new DeviceFunctionSettionForm();

                form.AddForm(device, true);

            }

            //新风面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

            {

@@ -531,7 +536,7 @@
                //干接点

                if (device.Type == DeviceType.FreshAir)

                {

                    var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

                    var form = new DevicePanel.PanelSettionWithSourceForm();

                    form.AddForm(device);

                }

                else

@@ -546,7 +551,7 @@


                if (device.Type == DeviceType.FreshAir || device.Type == DeviceType.Thermostat)

                {

                    var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();

                    var form = new DevicePanel.PanelSettionWithSourceForm();

                    form.AddForm(device);

                }

                else

@@ -555,7 +560,7 @@
                    form.AddForm(device, true);

                }

            }

            //简约环境面板的按键配置

            //简约多功能面板的按键配置

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)

            {

                var form = new DeviceFunctionSettionForm();

@@ -715,7 +720,7 @@
            }

            //如果是在线的

            var nowGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.NowSelectGatewayId);

            if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(nowGateway) == true)

            if (HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(nowGateway) == true)

            {

                //检测广播到的这个网关是否拥有住宅ID

                ZbGateway realWay = null;

@@ -731,6 +736,11 @@
                        ProgressBar.Close();

                        if (result2 == -1)

                        {

                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //隐藏下拉刷新特效

                                listView.EndHeaderRefreshing();

                            });

                            return;

                        }

                    }

@@ -742,7 +752,7 @@
            }



            //获取全部设备

            int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(nowGateway, false);

            int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(nowGateway.GwId, false);

            if (this.Parent == null)

            {

                return;

@@ -783,7 +793,7 @@
                {

                    if (this.gatewayViewRow != null && this.gatewayViewRow.zbGatewayId == selectGwId)

                    {

                        bool online = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbGateway);

                        bool online = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbGateway);

                        //刷新控件在线状态

                        this.gatewayViewRow?.RefreshOnlineStatu();

                        //根据网关在线状态刷新设备在线状态

@@ -979,10 +989,10 @@
                        return;

                    }

                    //添加升级固件信息(成不成功都无所谓)

                    var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());

                    var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A设备, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());



                    //获取设备最新版本

                    var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,

                    var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,

                        ota.HwVersion.ToString(),

                        ota.ImgTypeId.ToString(),

                        ota.ImgVersion);

@@ -1009,7 +1019,7 @@
                        }

                    });

                }

            });

            }, ShowErrorMode.NO);

        }



        #endregion

@@ -1143,6 +1153,20 @@
        /// </summary>

        public override int FormActionAgainEvent()

        {

            if (GatewayResourse.AppOldSelectGatewayId != this.gatewayViewRow.zbGatewayId)

            {

                //这个网关被整掉了,需要重新初始化界面

                this.nowActionDeviceMac = null;

                this.oldShowRightMuneRow = null;

                //重新选择网关

                HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();



                //初始化界面

                this.InitMiddleFrame();



                return 1;

            }



            if (this.nowActionDeviceMac != null)

            {

                //刷新指定设备行的信息

@@ -1224,9 +1248,9 @@
            /// </summary>

            private NormalViewControl btnName = null;

            /// <summary>

            /// 在线状态

            /// 在线状态(初始状态为在线)

            /// </summary>

            public bool isOnline = false;

            public bool isOnline = true;



            /// <summary>

            /// 自定义网关控件

@@ -1271,11 +1295,11 @@
                {

                    btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);

                    //在线状态

                    this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway);

                    if (this.isOnline == false)

                    {

                        btnName.TextColor = UserCenterColor.Current.TextGrayColor1;

                    }

                    //this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbway);

                    //if (this.isOnline == false)

                    //{

                    //    btnName.TextColor = UserCenterColor.Current.TextGrayColor1;

                    //}

                }

                else

                {

@@ -1340,7 +1364,7 @@
                    return;

                }

                //在线状态

                bool statu = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway);

                bool statu = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbway);

                if (this.isOnline != statu)

                {

                    this.isOnline = statu;

@@ -1397,7 +1421,7 @@
                btnName.Height = Application.GetRealHeight(60);

                btnName.TextSize = 15;

                btnName.Y = Application.GetRealHeight(57);

                btnName.Text = "小度小度";

                btnName.Text = "智能音箱";



                this.AddRightArrow();

                this.AddMostRightView("", 300, false).Name = "smartSoundLayout";