Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代

wxr

2024-10-14 b847c06d8617efb2cbbad6f11b0344b779138e92

 HDL_ON/Entity/Function/Function.cs

@@ -198,7 +198,7 @@
                    case SPK.HvacAirFreshJinmao:
                        iconPath = "airFreshjinmao";
                        break;
                    case SPK.HvacAC:
                    case SPK.HvacAC:case SPK.HvacAcPanel:
                        iconPath = "acstandard";
                        break;
                    case SPK.HvacFan:
@@ -669,21 +669,30 @@
                        result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
                    }
                }
                //提示错误
                if (result != StateCode.SUCCESS)
                {
                    Application.RunOnMainThread(() =>
                    if (!Common.ApiUtlis.Ins.hadInternet)
                    {
                        collect = !collect;
                        IMessageCommon.Current.ShowErrorInfoAlter(result);
                    });
                } else
                        this.SaveFunctionFile();
                    }
                    else
                    {
                        Application.RunOnMainThread(() =>
                        {
                            collect = !collect;
                            IMessageCommon.Current.ShowErrorInfoAlter(result);
                        });
                    }
                }
                else
                {
                    Application.RunOnMainThread(() =>
                    {
                        this.SaveFunctionFile();
                        UI.HomePage.RefreshFunctionView();
                    });
                }
                
            })
            { IsBackground = true }.Start();
        }
@@ -1942,6 +1951,10 @@
        /// </summary>
        public const string HvacAC = "hvac.ac";
        /// <summary>
        /// 面板空调
        /// </summary>
        public const string HvacAcPanel = "hvac.ac_panel";
        /// <summary>
        /// 毛细管空调
        /// </summaryc
        public const string HvacCac = "hvac.cac";
@@ -1955,6 +1968,7 @@
            var spkList = new List<string>();
            spkList.Add(AcStandard);
            spkList.Add(HvacAC);
            spkList.Add(HvacAcPanel);
            spkList.Add(AcIr);
            spkList.Add(HvacCac);
            return spkList;