2021-4-22 对接乐橙可视对讲

lss

2021-04-22 b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -494,6 +494,18 @@
                        functionCount = FunctionList.List.GetArmSensorList().Count;
                        break;
                    case ShowFunction.VideoIntercom:
<<<<<<< Updated upstream
=======
                        if (FunctionList.List.videoIntercom != null && FunctionList.List.videoIntercom.Count > 0)
                        {
                            functionCount = 1;
                        }
                        break;
                    case ShowFunction.SecurityCenter:
#if DEBUG
                        functionCount = 1;
#endif
>>>>>>> Stashed changes
                        break;

                }
@@ -762,8 +774,16 @@
                        btnName.TextID = StringId.Sensor;
                        functionPageTitleId = StringId.Sensor;
                        break;
                    case ShowFunction.VideoIntercom:
                    case ShowFunction.VideoIntercom://可视对讲
                        btnName.TextID = StringId.VideoIntercom;
<<<<<<< Updated upstream
=======
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
                            videoMethod.MianView(this);
                        };
>>>>>>> Stashed changes
                        break;

                }