2023年09月01日18:06:42

mac

2023-09-01 0a11352dffeb8d5f31dd40b9728fe1abf4537f04

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

@@ -12,6 +12,9 @@

namespace HDL_ON.UI
{
    /// <summary>
    /// 分类界面
    /// </summary>
    public partial class ClassificationPage : FrameLayout
    {

@@ -711,8 +714,12 @@
                        break;
                    case ShowFunction.Electric:
                        #region 电器

                        functionCount = FunctionList.List.GetElectricals().Count;
                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
#if DEBUG
                        functionCount = 1;
#endif
                        #endregion
                        break;
                    case ShowFunction.EnergyMonitoring:
@@ -755,10 +762,6 @@
                        break;
                    case ShowFunction.SecurityCenter:
                        functionCount = FunctionList.List.securities.Count;
                        //if (DB_ResidenceData.Instance.GatewayType == 1)
                        //{
                        //    functionCount = 1;
                        //}
                        break;
                    case ShowFunction.Acst:
                        functionCount = FunctionList.List.GetAcstParentList().Count;
@@ -766,8 +769,14 @@
                        break;
                    case ShowFunction.VideoDoorLock:
                        functionCount = FunctionList.List.GetVideoDoorLockList().Count;
                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
                            || obj.GetAttrState("status").ToString() == "normal_open").Count;

                        break;
                    case ShowFunction.Aks:
                        functionCount = FunctionList.List.GetVideoControlsList().Count;
#if DEBUG
                        //functionCount = 1;
                        functionCount = 1;
#endif
                        functionOnCount = 1;
                        break;
@@ -826,10 +835,17 @@
                    IsMoreLines = true,
                };
                functionView.AddChidren(btnName); 

                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
                    && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
                //不需要显示设备开状态数量;
                if (item != ShowFunction.Aks
                    && item != ShowFunction.VideoDoorLock
                    && item != ShowFunction.Environmental
                    && item != ShowFunction.Sensor
                    && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.FreshAir
                    && item != ShowFunction.Music
                    && item != ShowFunction.EnergyMonitoring
                    && item != ShowFunction.SecurityCenter
                    && item != ShowFunction.Acst && item != ShowFunction.IpCam
                    && functionCount != 0)
                {
@@ -1055,13 +1071,15 @@
                    case ShowFunction.EnergyMonitoring:
                        #region 能源监测
                        btnName.TextID = StringId.EnergyMonitoring;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var skipView = new EnergyMainPage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        functionPageTitleId = StringId.EnergyMonitoring;

                        //btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        //{
                        //    var skipView = new EnergyMainPage();
                        //    MainPage.BasePageView.AddChidren(skipView);
                        //    skipView.LoadPage();
                        //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        //};
                        #endregion
                        break;
                    case ShowFunction.Environmental:
@@ -1201,15 +1219,29 @@
                            form.AddForm(list);
                        };
                        break;
                    case ShowFunction.Aks:
                        //埃克斯影音中控
                        btnName.TextID = StringId.jiatingyingyuan;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            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();
                            });
                            form.AddForm(list);
                        };
                        break;

                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面--(萤石视频门锁)跳转自己的界面
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面--(萤石视频门锁)跳转自己的界面--埃克斯影音中控
                if (item != ShowFunction.VideoDoorLock
                     && item != ShowFunction.Aks
                    && item != ShowFunction.Music
                    && item != ShowFunction.Environmental
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring != item
                    //&& ShowFunction.EnergyMonitoring != item
                    && ShowFunction.VideoIntercom != item
                    && ShowFunction.SecurityCenter != item
                    && ShowFunction.Series != item
@@ -1290,7 +1322,7 @@
                int count = 0;
                foreach (var temp in FunctionList.List.InverterList())
                {
                    if (temp.online)
                    if (temp.isOnline())
                    {
                        if (temp.trait_on_off.state.ToString() == "on")
                        {
@@ -1453,8 +1485,11 @@
                    new System.Threading.Thread(() =>
                    {
                        System.Threading.Thread.Sleep(2000);
                        var status = new Dictionary<string, object> { ["method"] = "weather", ["data"] = MainPage.cityInfo.weather };
                        Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        Application.RunOnMainThread(() =>
                        {
                            var status = new Dictionary<string, object> { ["method"] = "weather", ["data"] = MainPage.cityInfo.weather };
                            Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        });
                    })
                    { IsBackground = true }.Start();
                    Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>