Merge branch 'temp-wxr' into NewFilePath

wxr

2021-02-23 34d49c20c2c2543658e844847c5eaa87f4c954e9

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

@@ -490,10 +490,18 @@
                    case ShowFunction.SecurityMonitoring:
                        break;
                    case ShowFunction.Sensor:
                        functionCount = FunctionList.List.sensorsArm.Count;
                        //functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        break;
                    case ShowFunction.VideoIntercom:
                        functionCount = 1;
                        break;

                }

                if(functionCount == 0)
                {
                    continue;
                }

                functionCategoryCount++;
@@ -543,7 +551,8 @@
                };
                functionView.AddChidren(btnName);

                if (item != ShowFunction.Environmental && functionCount != 0)
                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
                    {
@@ -759,15 +768,23 @@
                        break;
                    case ShowFunction.Sensor:
                        btnName.TextID = StringId.Sensor;

                        functionPageTitleId = StringId.Sensor;
                        break;
                    case ShowFunction.VideoIntercom:
                        btnName.TextID = StringId.VideoIntercom;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
#if __IOS__
                            EZSDK.IOS.EZSDK.Go2EZvizMonitor();
#else  //安卓摄像头

#endif
                        };
                        break;

                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面
                if (item != ShowFunction.Music && item != ShowFunction.Environmental)
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.VideoIntercom)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {
@@ -786,10 +803,10 @@
                s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
            }

            #endregion
#endregion
        }

        #region 切换楼层
#region 切换楼层
        /// <summary>
        /// 楼层显示切换
        /// </summary>
@@ -946,6 +963,6 @@
        {

        }
        #endregion
#endregion
    }
}