Merge remote-tracking branch 'origin/dev-tzy' into temp-wxr

wei

2021-03-09 555a2bd930cd86e220ab7146ae4655a6cafe9ca3

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

@@ -281,16 +281,22 @@
                            value = "off";
                        }
                        break;
                    case StringId.youren:
                    case StringId.kaiqi:
                        {
                    case StringId.youren: {
                            value = "true";
                        }
                        break;
                    case StringId.wuren:
                    case StringId.wuren: {
                            value = "false";
                        }
                        break;
                    case StringId.kaiqi:
                        {
                            value = "open";
                        }
                        break;
                    case StringId.bihe:
                        {
                            value = "false";
                            value = "close";
                        }
                        break;
                    case StringId.zaixian: {