2019.10.18

gxc

2019-10-18 d569f44a62fa915d4f01a80c21e617f676b6c5ea

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

@@ -174,26 +174,26 @@
                        }
                        else
                        {
                            var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.ElseScenesId == sceneTargetDevice.ElseScenesId);
                            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.ThisSceneHadTheScene), Language.StringByID(R.MyInternationalizationString.Close));
                                alert.Show();
                                alert.ResultEventHandler += (sendAlert, eAlert) =>
                                {
                                    return;
                                };
                            }
                            //var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.ElseScenesId == sceneTargetDevice.ElseScenesId);
                            //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.ThisSceneHadTheScene), Language.StringByID(R.MyInternationalizationString.Close));
                            //    alert.Show();
                            //    alert.ResultEventHandler += (sendAlert, eAlert) =>
                            //    {
                            //        return;
                            //    };
                            //}
                        }
                    }
                    else
@@ -235,13 +235,13 @@
                        {
                            if (!string.IsNullOrEmpty(targetDeviceID))
                            {
                                var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
                                if (targetDeviceUI != null)
                                {
                                    targetDeviceUI.Type = sceneTargetDevice.Type;
                                    targetDeviceUI.ElseScenesId = sceneTargetDevice.ElseScenesId;
                                    targetDeviceUI.SceneName = sceneTargetDevice.SceneName;
                                }
                                //var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
                                //if (targetDeviceUI != null)
                                //{
                                //    targetDeviceUI.Type = sceneTargetDevice.Type;
                                //    targetDeviceUI.ElseScenesId = sceneTargetDevice.ElseScenesId;
                                //    targetDeviceUI.SceneName = sceneTargetDevice.SceneName;
                                //}
                            }

                            //var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.ElseScenesId == sceneTargetDevice.ElseScenesId);