合并乐橙代码

wei

2021-07-06 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5

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

@@ -256,7 +256,7 @@
                                        }
                                    }
                                    break;
                                case SPK.SensoruUtrasonic:
                                case SPK.SensorUtrasonic:
                                    {
                                        string str = "";
                                        foreach (var dic in dicList)
@@ -295,6 +295,22 @@

                                        }
                                        inputView.btnState.Text = str;
                                    }
                                    break;
                                case SPK.SenesorMegahealth:
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
                                            if (value == "fall")
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.diedao);
                                            }
                                            else
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.wuren);
                                            }
                                        }
                                    }
                                    break;

@@ -1332,7 +1348,7 @@
                        }
                    }
                    break;
                case SPK.SensoruUtrasonic:
                case SPK.SensorUtrasonic:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1371,6 +1387,22 @@
                        }
                    }
                    break;
                case SPK.SenesorMegahealth:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "fall")
                            {
                                button1.Text = Language.StringByID(StringId.diedao);
                            }
                            else
                            {
                                button1.Text = Language.StringByID(StringId.wuren);
                            }
                        }
                    }
                    break;
            }
        }
        /// <summary>