Merge branch 'Wxr-V2.4.2' into Google-2023-11-17-1

wxr

2023-11-28 0f13be8b24ef37fe16cd34c8411a907f93b7f304

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

@@ -775,6 +775,7 @@
                        }
                    }
                    break;
                    //猫眼
                case SPK.Peephole:
                    LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
                    viewPeephole.btnText.TextID = StringId.ActivityDetection;
@@ -791,6 +792,7 @@
                        this.GetEditState(device, index, viewPeephole.btnState, null, null, null);
                    }
                    break;
                    //萤石摄像头
                case SPK.Ev_Ipcam:
                    LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView();
                    viewEzIpcam.btnText.TextID = StringId.ActivityDetection;