Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-06-30 0b5b6ec781a8cb3400ad34693792bad07e97a00c

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

@@ -328,6 +328,33 @@
                                    }
                                    break;
                                case SPK.SenesorMegahealth:
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
                                            switch (dic["key"])
                                            {
                                                case "people_status":
                                                    {
                                                        if (value == "true")
                                                        {
                                                            inputView.btnState.Text = Language.StringByID(StringId.shi);
                                                        }

                                                    }
                                                    break;
                                                case "target_status":
                                                    {
                                                        if (value == "4")
                                                        {
                                                            inputView.btnState.Text = Language.StringByID(StringId.shi);
                                                        }
                                                    }
                                                    break;
                                            }

                                        }
                                    }break;
                                case SPK.SenesorMegahealth2:
                                    {
                                        foreach (var dic in dicList)
@@ -1968,6 +1995,34 @@
                    }
                    break;
                case SPK.SenesorMegahealth:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            switch (dic["key"])
                            {
                                case "people_status":
                                    {
                                        if (value == "true")
                                        {
                                            button1.Text = Language.StringByID(StringId.shi);
                                        }
                                        
                                    }
                                    break;
                                case "target_status":
                                    {
                                        if (value == "4")
                                        {
                                            button2.Text = Language.StringByID(StringId.shi);
                                        }
                                    }
                                    break;
                            }

                        }
                    }
                    break;
                case SPK.SenesorMegahealth2:
                    {
                        foreach (var dic in dicList)