Merge branch 'temp-wxr' into NewFilePath

wxr

2021-02-23 34d49c20c2c2543658e844847c5eaa87f4c954e9

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

@@ -373,7 +373,14 @@
                        roomView.RemoveFromParent();
                    };

                    var view = new RoomPage(room, ReloadRoomName, deleteAction);
                    //房间背景图修改事件回调
                    Action modifyImageAction = () =>
                    {
                        //roomViewbg.ImagePath = room.backgroundImage;
                        ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
                    };

                    var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
                    MainPage.BasePageView.AddChidren(view);
                    view.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -423,6 +430,7 @@

            var lastY1 = Application.GetRealWidth(16);
            var lastY2 = Application.GetRealWidth(16);
            var functionContentViewHeight = Application.GetRealWidth(16);

            var functionCategoryCount = 0;

@@ -482,37 +490,22 @@
                    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 && item != ShowFunction.Music)
                if(functionCount == 0)
                {
                    continue;
                }

                functionCategoryCount++;

                //FunctionType ft = FunctionType.A31Music
                //switch (item)
                //{
                //    case FunctionType.FloorHeating:
                //        break;
                //    case FunctionType.AC:
                //        break;
                //    case FunctionType.MotorCurtain:
                //    case FunctionType.Curtain:
                //    case FunctionType.RollingShutter:
                //        break;
                //    case FunctionType.Relay:
                //    case FunctionType.Dimmer:
                //    case FunctionType.RGB:
                //    case FunctionType.ColorTemperature:
                //        break;
                //    case FunctionType.Socket:
                //        break;
                //}
                FrameLayout functionView = new FrameLayout()
                {
                    Height = Application.GetRealWidth(161),
@@ -521,7 +514,6 @@
                    Tag = item + "_View",
                    Y = index % 2 == 1 ? lastY2 : lastY1
                };
                MainPage.Log($"Load FunctionView Tag = {item}");
                //高度稍高的view
                if (specialList.Contains(index))
                {
@@ -544,6 +536,7 @@
                {
                    s2View.AddChidren(functionView);
                }
                functionContentViewHeight = functionView.Bottom;


                Button btnName = new Button()
@@ -557,6 +550,37 @@
                    TextAlignment = TextAlignment.CenterLeft,
                };
                functionView.AddChidren(btnName);

                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
                    {
                        X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
                        Y = btnName.Bottom,
                        Width = Application.GetRealWidth(120),
                        Height = Application.GetRealHeight(24),
                        TextColor = CSS_Color.PromptingColor1,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextAlignment = TextAlignment.CenterLeft,
                        Text = "/" + functionCount,
                    };
                    functionView.AddChidren(btnFunctionCount);
                    Button btnOpenCount = new Button()
                    {
                        X = Application.GetRealWidth(16),
                        Y = btnName.Bottom,
                        Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
                        Height = Application.GetRealHeight(24),
                        TextColor = CSS_Color.MainColor,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextAlignment = TextAlignment.CenterLeft,
                        Text = functionOnCount.ToString(),
                        Tag = item + "_onCount",
                        BorderWidth = 0,
                    };
                    functionView.AddChidren(btnOpenCount);
                }


                Button btnFunctionViewBg;
@@ -744,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) =>
                    {
@@ -762,48 +794,19 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    };
                }
                if (item != ShowFunction.Environmental && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
                    {
                        X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
                        Y = btnName.Bottom,
                        Width = Application.GetRealWidth(120),
                        Height = Application.GetRealHeight(24),
                        TextColor = CSS_Color.PromptingColor1,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextAlignment = TextAlignment.CenterLeft,
                        Text = "/" + functionCount,
                    };
                    functionView.AddChidren(btnFunctionCount);
                    Button btnOpenCount = new Button()
                    {
                        X = Application.GetRealWidth(16),
                        Y = btnName.Bottom,
                        Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
                        Height = Application.GetRealHeight(24),
                        TextColor = CSS_Color.MainColor,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextAlignment = TextAlignment.CenterLeft,
                        Text = functionOnCount.ToString(),
                        Tag = item + "_onCount",
                        BorderWidth = 0,
                    };
                    functionView.AddChidren(btnOpenCount);
                }
                index++;
            }

            if (functionCategoryCount > 4)
            //if (functionCategoryCount > 4)
            {
                functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
                s1View.Height = s2View.Height = functionContentView.Height;
                //functionContentView.Height = functionContentViewHeight;// Application.GetRealWidth((240 * (functionCategoryCount / 2)));
                s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
            }

            #endregion
#endregion
        }

        #region 切换楼层
#region 切换楼层
        /// <summary>
        /// 楼层显示切换
        /// </summary>
@@ -921,7 +924,7 @@
                        Text = floor.roomName,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                        IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
                        IsMoreLines = true,
                        //IsMoreLines = true,
                    };
                    contentView.AddChidren(btnHomeName);

@@ -960,6 +963,6 @@
        {

        }
        #endregion
#endregion
    }
}