IOS使用新的项目名称

黄学彪

2019-11-25 5727cf0b9b54da0a191dd1e23cb5abf21320fbff

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs

old mode 100644
new mode 100755
@@ -17,6 +17,10 @@
            BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
            Tag = "categoryAddScene";
        }
        public override void RemoveFromParent()
        {
            base.RemoveFromParent();
        }
        /// <summary>
        /// 显示灯光的详细设置界面  默认-1(新增-默认开)，0关 ，1开
        /// </summary>
@@ -27,7 +31,19 @@
        public void Show(DeviceUI device, string targetDeviceID="", int state=-1, bool isFromRoom = false)
        {
            #region topview
            var topBGView = new FrameLayout()
            {
                Height = Application.GetRealHeight(CommonPage.Navigation_Height),
                BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor
            };
            AddChidren(topBGView);
            var topView = new FrameLayout()
            {
                Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),
                Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),
                BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
            };
            AddChidren(topView);
            var topBGView = new FrameLayout()
            {
                Height = Application.GetRealHeight(CommonPage.Navigation_Height),
                BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor
            };
            AddChidren(topBGView);
            var topView = new FrameLayout()
            {
                Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),
                Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),
                BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
            };
            AddChidren(topView);

            var title = new Button()
            {
@@ -38,7 +54,8 @@
                Gravity = Gravity.CenterHorizontal
            };
            topView.AddChidren(title);
            var back = new Device.CommonForm.BackButton() { };
            topView.AddChidren(back);
            var back = new Device.CommonForm.BackButton() { };
            topView.AddChidren(back);
            back.MouseUpEventHandler += (sender, e) =>
            {
                this.RemoveFromParent();
@@ -163,7 +180,7 @@
            };
            dimmingRowView.AddChidren(dimmingNextBtn);

            var confirmBtn = new CommonForm.CompleteButton() { };
            var confirmBtn = new CommonForm.CompleteButton(1,2,3);
            AddChidren(confirmBtn);
            if (state == -1)
            {
@@ -322,26 +339,26 @@
                    else
                    {
                        //回到分类
                        var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI);
                        if (sameScene == null)
                        {
                            CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
                            UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
                            var categoryAddScene = new CategoryAddScene();
                            UserView.HomePage.Instance.AddChidren(categoryAddScene);
                            UserView.HomePage.Instance.PageIndex += 1;
                            categoryAddScene.Show();
                        }
                        else
                        {
                            //提示该设备已加入
                            var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ThisSceneHadTheDevice), Language.StringByID(R.MyInternationalizationString.Close));
                            alert.Show();
                            alert.ResultEventHandler += (sendAlert, eAlert) =>
                            {
                                return;
                            };
                        }
                        //var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI);
                        //if (sameScene == null)
                        //{
                        //    CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
                        //    UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
                        //    var categoryAddScene = new CategoryAddScene();
                        //    UserView.HomePage.Instance.AddChidren(categoryAddScene);
                        //    UserView.HomePage.Instance.PageIndex += 1;
                        //    categoryAddScene.Show();
                        //}
                        //else
                        //{
                        //    //提示该设备已加入
                        //    var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ThisSceneHadTheDevice), Language.StringByID(R.MyInternationalizationString.Close));
                        //    alert.Show();
                        //    alert.ResultEventHandler += (sendAlert, eAlert) =>
                        //    {
                        //        return;
                        //    };
                        //}
                    }
                }
                //修改
@@ -364,18 +381,18 @@
                    }
                    else
                    {
                        var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
                        if (targetDeviceUI != null)
                        {
                            targetDeviceUI.Type = sceneTargetDevice.Type;
                            targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
                            targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
                        }
                        UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
                        var categoryAddScene = new CategoryAddScene();
                        UserView.HomePage.Instance.AddChidren(categoryAddScene);
                        UserView.HomePage.Instance.PageIndex += 1;
                        categoryAddScene.Show();
                        //var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
                        //if (targetDeviceUI != null)
                        //{
                        //    targetDeviceUI.Type = sceneTargetDevice.Type;
                        //    targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
                        //    targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
                        //}
                        //UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
                        //var categoryAddScene = new CategoryAddScene();
                        //UserView.HomePage.Instance.AddChidren(categoryAddScene);
                        //UserView.HomePage.Instance.PageIndex += 1;
                        //categoryAddScene.Show();
                    }
                }
            };