Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-10-13 3eb7e4359ed28bef37359fe64a1726274874ba08

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

@@ -947,8 +947,13 @@
                }
            }
            PublicInterface view = new PublicInterface();
            //var listStr = view.GetViewList(key);
            
            var listStr = view.GetSensorLevelList(device);//2022年05月25日10:01:33 产品经理君煌要求改成动态
            //if (listStr.Count == 0)
            //{
            //    //听说是为了兼用很老很老的项目
            //    listStr = view.GetViewList(key);
            //}
            view.SingleSelectionShow(frame, listStr, Language.StringByID(title), view.GetSensorLevelText(device, stateValue,true)
               , (text) =>
               {