bug fix

wxr

2023-11-06 613aec6974fccad5e4c07f745b58b3e93d4e8b82

bug fix

 HDL_ON/Entity/Function/Scene.cs

@@ -87,6 +87,14 @@
        /// 是否允许删除
        /// </summary>
        public bool can_delete = true;
        /// <summary>
        /// 是否允许编辑
        /// </summary>
        public bool can_edit = true;
        /// <summary>
        /// 是否是网关本地场景
        /// </summary>
        public bool local = false;

        /// <summary>
        /// 创建该场景的用户ID
@@ -562,25 +570,24 @@
        /// <returns></returns>
        private Function ConvertFunctionObject()
        {
            Function temp = null;
            if (type == "7")
            {
                var logic = Logic.LogicList.Find((obj) => obj.sid == sid);
                if (logic != null) {
                    _localFunction = new Function()
                    {
                        name = logic.name
                    };
                    temp = new Function();
                    temp.name = logic.name;
                }
            }
            else
            {
                var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
                if (localFunction == null)
                temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
                if (temp == null)
                {
                    localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                    temp = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                }
            }
            return localFunction;
            return temp;
        }



 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -481,7 +481,6 @@
        void LoadFunctionRow()
        {
            functionListView.RemoveAll();
            functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
            for(int i =0;i<scene.functions.Count;)
            {
                var scenefunction = scene.functions[i];
@@ -490,6 +489,7 @@
                    scene.functions.Remove(scenefunction);
                    continue;
                }
                functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
                try
                {
                    //将spk实体里面的min max值放入场景功能实体里，要不然数据会丢失 2022-06-21 16:06:45

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneTargetTypeChoosePage.cs

@@ -39,7 +39,7 @@
                Height = Application.GetRealHeight(20),
                BackgroundColor = CSS_Color.BackgroundColor
            });
            var topView = new TopViewDiv(bodyView,Language.StringByID(StringId.AddExecutionAction);
            var topView = new TopViewDiv(bodyView,Language.StringByID(StringId.AddExecutionAction));
            topView.maginY = 10;
            topView.LoadTopView();