2022年07月25日10:31:11

wjc

2022-07-25 23c9d1577fd0c02ca6976c874855ad60268646b8

2022年07月25日10:31:11

更新

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,8 @@
        /// 公共域名就近解析
        /// </summary>

        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        /// <summary>
        /// RegionMark
        /// </summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs

@@ -310,13 +310,13 @@
                                        LogicMethod.CurrLogicMethod.RemoveAllView();
                                        MainView.MainShow();
                                    }
                                    else if (responsePackNew != null && responsePackNew.Code == "14005")
                                    {
                                        new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
                                    }
                                    else
                                    {
                                        new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
                                        if (responsePackNew != null)
                                        {
                                            new LogicView.TipPopView().FlashingBox(responsePackNew.message);
                                        }

                                    }
                                });
                            }
@@ -350,14 +350,15 @@
                                    LogicMethod.CurrLogicMethod.RemoveAllView();
                                    MainView.MainShow();
                                }
                                else if (responsePackNew != null && responsePackNew.Code == "14005")
                                {
                                    new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
                                }
                                else
                                {
                                    new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
                                    if (responsePackNew != null)
                                    {
                                        new LogicView.TipPopView().FlashingBox(responsePackNew.message);
                                }

                                }

                            });
                        }


 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -216,6 +216,40 @@
                        view1.frameLayout.Y = view.frameLayout.Bottom;
                        view1.btnText.TextID = StringId.fangchaigongneng;
                        fLayout.AddChidren(view1.FLayoutView());


                        int intValue = 0;
                        if (edit)
                        {
                            Input inputs = Logic.currlogic.input[index];
                            var dicList = inputs.condition;
                            foreach (var dic in dicList)
                            {
                                if (dic["key"] == "people_status")
                                {
                                    //有人/无人
                                    intValue = 1;
                                }
                                else
                                {
                                    //防拆功能
                                    intValue = 2;
                                }
                                break;

                            }
                        }
                        if (intValue == 1)
                        {
                            //有人/无人
                            view1.frameLayout.Visible = false;

                        }
                        else if (intValue == 2)
                        {
                            //防拆功能
                            view1.frameLayout.Y = Application.GetRealHeight(0);
                        }
                        view1.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view1.btnState, StringId.zaixian, StringId.buzaixian);
@@ -230,25 +264,7 @@
                //毫米波传感器(自研北邮)
                case SPK.SenesorMegahealth:
                    {
                        int intValue =0;
                        if (edit)
                        {
                            Input inputs = Logic.currlogic.input[index];
                            var dicList = inputs.condition;
                            foreach (var dic in dicList)
                            {
                                if (dic["key"] == "target_status")
                                {
                                    intValue = 1;
                                }
                                else
                                {
                                    intValue = 2;
                                }
                                break;

                            }
                        }
                        LogicView.FunTypeView view1= new LogicView.FunTypeView(); 
                        view1.btnText.TextID = StringId.diedaobaojing;
                        view1.btnState.Name = Language.StringByID(StringId.diedaobaojing);
@@ -263,13 +279,36 @@
                        view2.btnText.TextID = StringId.yourenbaojing;
                        view2.btnState.Name = Language.StringByID(StringId.yourenbaojing);
                        fLayout.AddChidren(view2.FLayoutView());
                        int intValue = 0;
                        if (edit)
                        {
                            Input inputs = Logic.currlogic.input[index];
                            var dicList = inputs.condition;
                            foreach (var dic in dicList)
                            {
                                if (dic["key"] == "target_status")
                                {
                                    //跌倒报警
                                    intValue = 1;
                                }
                                else
                                {
                                    //有人报警
                                    intValue = 2;
                                }
                                break;

                        if (intValue==1) {
                            }
                        }
                        if (intValue == 1)
                        {
                            //跌倒报警
                            view2.frameLayout.Visible = false;
                           
                        }
                        if (intValue == 2)
                        else if (intValue == 2)
                        {
                            //有人报警
                            view2.frameLayout.Y = Application.GetRealHeight(0);
                        }


 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -298,11 +298,11 @@
                                                    {
                                                        if (value == "true")
                                                        {
                                                            str += Language.StringByID(StringId.youren) + ";";
                                                            str = Language.StringByID(StringId.youren);
                                                        }
                                                        else
                                                        {
                                                            str += Language.StringByID(StringId.wuren) + ";";
                                                            str = Language.StringByID(StringId.wuren);
                                                        }


@@ -312,11 +312,11 @@
                                                    {
                                                        if (value == "true")
                                                        {
                                                            str += Language.StringByID(StringId.zaixian);
                                                            str = Language.StringByID(StringId.zaixian);
                                                        }
                                                        else
                                                        {
                                                            str += Language.StringByID(StringId.buzaixian);
                                                            str = Language.StringByID(StringId.buzaixian);
                                                        }
                                                    }
                                                    break;

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -183,7 +183,7 @@
        public List<HDL_ON.Entity.Function> GetGatewayDeviceList()
        {
            var list = Entity.FunctionList.List.GetDeviceFunctionList();
            //return GetTestDevice(list, true);
            //GetTestDevice(ref list, true);
            return list;
        }
        /// <summary>
@@ -1023,20 +1023,25 @@
        /// </summary>
        /// <param name="isBool">是否开启</param>
        /// <returns></returns>
        private List<Entity.Function> GetTestDevice(List<HDL_ON.Entity.Function> list, bool isBool)
        private List<Entity.Function> GetTestDevice(ref List<HDL_ON.Entity.Function> list, bool isBool)
        {
            if (isBool)
            {
                Entity.Function function = new Entity.Function { sid = "0123456789", name = "超声波传感器", spk = Entity.SPK.SensorUtrasonic };
                //模拟设备
                var functions = new List<Function> {
                 new Entity.Function { sid = "0123456789", name = "超声波传感器", spk = Entity.SPK.SensorUtrasonic },
                 };
                foreach (var function in functions)
                {
                var device = list.Find((o) => { return o.sid == function.sid; });
                if (device == null)
                {
                    list.Add(function);
                }
                }

            }
            return list;


        }