2019.12.25

gxc

2019-12-25 944b87b6bcccb095cd73f13f4410fb20faf48f74

 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs

@@ -23,7 +23,7 @@
        /// <summary>
        /// sceneImg
        /// </summary>
        private Button sceneImg;
        private ImageView sceneImg;

        /// <summary>
        /// SceneCategoryView
@@ -60,24 +60,21 @@
            {
                Y = Application.GetRealHeight(46),
                Height = Application.GetRealHeight(446 - 46),
                LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor
                LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
                Tag= scene
            };
            AddChidren(sceneRowLayout);

            sceneImg = new Button()
            sceneImg = new ImageView()
            {
                X = Application.GetRealWidth(179),
                Width = Application.GetRealWidth(844),
                Height = Application.GetRealHeight(400),
                UnSelectedImagePath = scene.IconPath,
                ImagePath = scene.IconPathType == 0 ? scene.IconPath : System.IO.Path.Combine(Config.Instance.FullPath, scene.IconPath),
                Radius = (uint)Application.GetRealHeight(17)
            };
            sceneRowLayout.AddChidren(sceneImg);
            if (scene.IconPathType != 0)
            {
                sceneImg.UnSelectedImagePath = System.IO.Path.Combine(Config.Instance.FullPath, scene.IconPath);
            }
            sceneImg.SetViewShadow(true);
            //sceneImg.SetViewShadow(true);

            var leftFL = new FrameLayout
            {
@@ -205,12 +202,12 @@
                if (room.IsLove)
                {
                    Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
                    RemoveViewByTag((sender as Button).Tag);
                    RemoveFromParent();
                }
                else
                {
                    var tip = new CustomAlert { };
                    AddChidren(tip);
                    Common.CommonPage.Instance.AddChidren(tip);
                    tip.Show(Language.StringByID(R.MyInternationalizationString.ConfirmDelete));

                    tip.ResultEventHandler += async (e1) =>
@@ -229,7 +226,7 @@
                            {
                                room.RemoveScene(scene);
                                //RefreshBodyView();
                                RemoveViewByTag((sender as Button).Tag);
                                RemoveFromParent();
                            }
                            //0 移除失败
                            else if (removeSceneAllData.removeSceneData.Result == 0)
@@ -242,7 +239,7 @@
                            {
                                room.RemoveScene(scene);
                                //RefreshBodyView();
                                RemoveViewByTag((sender as Button).Tag);
                                RemoveFromParent();
                                CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneIsNull);
                                return;
                            }