Merge branch 'temp-wxr' into WJC

陈嘉乐

2021-03-22 551e82d33c9c23442e0ecd320bcfc752f300d9ef

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

@@ -615,7 +615,7 @@
                            LoadEvent_SwitchFunction(btnLightPower, item, functionView);
                        };
                        functionPageTitleId = StringId.Lights;

                      
                        #endregion
                        break;
                    case ShowFunction.AC:
@@ -728,7 +728,7 @@
                        btnName.TextID = StringId.EnvironmentalData;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var skipView = new EnvironmentalSciencePage();
                            var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -755,20 +755,7 @@
                        btnName.TextID = StringId.SecurityMonitoring;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
#if __IOS__
                            EZSDK.IOS.EZSDK.Go2EZvizMonitor();
#else  //安卓摄像头
                            ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
                            {
                                if (b)
                                {
                                    Android.Content.Intent intent = new Android.Content.Intent();
                                    intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
                                    Shared.Application.Activity.StartActivity(intent);
                                }
                            });

#endif
                            HDLCommon.Current.Go2EZvizMonitor(bodyView);
                        };
                        break;
                    case ShowFunction.Sensor: