2023年09月11日14:15:05

mac

2023-09-11 a5ae6e497c9e1398220949e028d44fa15cb274c6

2023年09月11日14:15:05

修复海信设备在线离线bug

 HDL_ON/Entity/Function/Function.cs

@@ -451,7 +451,7 @@
        public bool online {
            get
            {
                if (spk == SPK.AirSwitchP3)
                if (spk == SPK.AirSwitchP3|| spk == SPK.ElectricalTvHisense)
                {
                    return _online;
                }

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -1215,8 +1215,7 @@
                        {
                            var list =CommonMethod.Current.GetVideoDoorLockList();
                            var form = new VideoDoorLockListPage(()=> {
                                functionContentView?.RemoveFromParent();
                                this.RefreshFunctionView();
                                UpdateBottomView();
                            });
                            form.AddForm(list);
                        };
@@ -1228,8 +1227,7 @@
                        {
                            var list = HDL_ON.UI.UI2.FuntionControlView.Aks.AksCommonMethod.Current.GetVideoControlsList();
                            var form = new HDL_ON.UI.UI2.FuntionControlView.Aks.AksListPage(() => {
                                functionContentView?.RemoveFromParent();
                                this.RefreshFunctionView();
                                UpdateBottomView();
                            });
                            form.AddForm(list);
                        };
@@ -1258,8 +1256,8 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        skipView.DelAction += () =>
                        {
                            functionContentView?.RemoveFromParent();
                            this.RefreshFunctionView();
                           
                            UpdateBottomView();
                        };
                    };
                }

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs

@@ -526,7 +526,12 @@
                    Radius = (uint)Application.GetRealWidth(22),
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                };
                contentView.AddChidren(delTextBtn);
                //如果是成员隐藏收藏功能
                if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
                {
                    contentView.AddChidren(delTextBtn);
                }


                EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
                {

 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs

@@ -93,7 +93,7 @@
            this.btnRoomName = btnRoomName;
            this.btnCollectionIcon = btnCollectionIcon;
            this.comerom = comerom;
            this.action = action; 
            this.action = action;

        }

@@ -105,7 +105,7 @@
            //初始化事件
            this.EventListener();
            //读取数据
            //this.ReadData();
            this.ReadData();

        }

@@ -192,11 +192,11 @@
                ControlCommand(HisenseTVFunctionalAttributeConstant.volume_subtract, "");
            };
            //菜单
           caidanBtn.SetClickListener((btn) =>
            {
                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "11");
            caidanBtn.SetClickListener((btn) =>
             {
                 ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "11");

            });
             });
            //播放
            bofangBtn.SetClickListener((btn) =>
            {
@@ -293,6 +293,26 @@
        {
            try
            {
                if (this.device == null)
                {
                    //设备不在线控制失败
                    Application.RunOnMainThread(() =>
                    {
                        CommonMethod.Current.ShowTip(Language.StringByID(StringId.shebeibuzaixian), 3);
                    });
                    return;
                }

                if (!this.device.online)
                {
                    //设备不在线控制失败
                    Application.RunOnMainThread(() =>
                    {
                        CommonMethod.Current.ShowTip(Language.StringByID(StringId.shebeibuzaixian), 3);
                    });
                    return;
                }

                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add(key, value);
                Send.Current.SendControlCommand(this.device, dic, action);
@@ -304,14 +324,27 @@
        /// </summary>
        private void ReadData()
        {
            if (this.device == null)
            {
                return;
            }
            CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    CommonMethod.Current.MainThread(() =>

                    var isRefreshDeviceStatus = Send.Current.RefreshDeviceStatus(new List<string> { this.device.deviceId });
                    if (isRefreshDeviceStatus)
                    {
                    });
                        var fun = Send.Current.GetDeviceInfo(this.device.deviceId);
                        if (fun != null)
                        {
                            //更新真实在线状态
                            this.device.online = fun.online;
                        }

                    }
                }
                catch { }
                finally
@@ -413,7 +446,7 @@
            kaijiFL.GetImageButton().SelectedImagePath = "HisenseTv/kaiguanSelected.png";
            kaijiFL.GetTextButton().TextID = StringId.kaiji;

            guanFL = new CustomFrameLayout(); 
            guanFL = new CustomFrameLayout();
            backgroundOpenFl.AddChidren(guanFL);
            guanFL.X = kaijiFL.Right + Application.GetRealWidth(37);
            guanFL.Y = yHeight;
@@ -580,7 +613,7 @@
            #endregion

        }
     

        /// <summary>
        /// 初始化头部
        /// </summary>
@@ -592,7 +625,7 @@
            this.topView.topNameBtn.TextID = StringId.dianshi;
            this.AddChidren(topView.TopFLayoutView());
        }
       


        /// <summary>
        /// 重新计算宽度(设备名称,房间控件)
@@ -650,7 +683,7 @@
            TextID = StringId.dangqianmenweiguan,
            TextSize = TextSize.Text14,
            TextColor = MusicColor.TextColor,
            SelectedTextColor= MusicColor.MusicTxet14SelectedColor,
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextAlignment = TextAlignment.Center,
            Gravity = Gravity.CenterHorizontal,
            Name = "btnText",
@@ -724,7 +757,7 @@
            this.BackgroundColor = 0xffECEDEE;
            this.SelectedBackgroundColor = 0xFFF2F3F7;
            this.Radius = (uint)Application.GetRealHeight(19);
            this.Padding = new Padding(0,0,0,0);
            this.Padding = new Padding(0, 0, 0, 0);
        }


@@ -817,8 +850,8 @@
            TextColor = MusicColor.TextColor,
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextSize = TextSize.Text16,
            TextID =StringId.xinhaoyuan,
            Padding=new Padding(0,0,0,0),
            TextID = StringId.xinhaoyuan,
            Padding = new Padding(0, 0, 0, 0),
            IsBold = true,
        };


 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /Send.cs

@@ -73,6 +73,56 @@
        }

        /// <summary>
        /// 刷新设备状态
        /// </summary>
        /// <param name="tipType">是否需要提示,默认提示</param>
        /// <returns></returns>
        public bool RefreshDeviceStatus(List<string> functionIds, TipType tipType = TipType.flicker)
        {
            try
            {
                Dictionary<string, object> d = new Dictionary<string, object>();
                d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
                d.Add("deviceIds", functionIds);
                var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus, "刷新设备状态");
                if (!this.DataChecking(responsePackNew, tipType))
                {
                    return false;
                }
                return true;
            }
            catch
            {
                return false;
            }
        }

        /// <summary>
        /// 获取设备详情
        /// </summary>
        /// <param name="tipType">是否需要提示,默认提示</param>
        /// <returns></returns>
        public Function GetDeviceInfo(string functionId, TipType tipType = TipType.flicker)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("deviceIds", new List<string>() { functionId });

            var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GetDevcieInfoList, "获取设备详情");
            if (!this.DataChecking(responsePackNew, tipType))
            {
                return null;
            }
            var functionList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Function>>(responsePackNew.Data.ToString());
            if (functionList != null && functionList.Count > 0)
            {
                return functionList[0];
            }
            return null;

        }

        /// <summary>
        ///删除设备
        /// </summary>
        /// <param name="deviceId">设备id</param>