From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码

---
 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
index 220a7d5..9655afe 100755
--- a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -159,8 +159,8 @@
             //鍦烘櫙鍥剧墖
             this.btnScenePic = new ImageView();
             btnScenePic.Y = Application.GetRealHeight(46);
-            btnScenePic.Width = Application.GetMinRealAverage(887);
-            btnScenePic.Height = Application.GetMinRealAverage(444);
+            btnScenePic.Width = this.GetPictrueRealSize(887);
+            btnScenePic.Height = this.GetPictrueRealSize(444);
             btnScenePic.Radius = (uint)Application.GetRealHeight(17);
             btnScenePic.Gravity = Gravity.CenterHorizontal;
             if (this.editorScene == null)
@@ -182,7 +182,8 @@
             btnZhezhao.Height = btnScenePic.Height;
             btnZhezhao.Y = btnScenePic.Y;
             btnZhezhao.Gravity = Gravity.CenterHorizontal;
-            btnZhezhao.Radius = btnScenePic.Radius;
+            btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
+            btnZhezhao.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
             framePicBack.AddChidren(btnZhezhao);
 
             //鍒嗕韩鐨勫満鏅笉鑳界紪杈�
@@ -258,7 +259,7 @@
         /// </summary>
         private void InitAddTargetControl()
         {
-            if (this.frameTargetTableControl == null)
+            if (this.frameTargetTableControl == null || this.frameTargetTableControl.Parent == null)
             {
                 //娣诲姞鐩爣鐨勭殑瀹瑰櫒鎺т欢
                 this.frameTargetTableControl = new FrameListControl();
@@ -294,8 +295,11 @@
             {
                 //浠庣綉鍏宠幏鍙栧満鏅殑鎵ц鐩爣
                 var result = await this.GetSceneTargetList();
-                //娣诲姞銆愭墽琛岀洰鏍囪銆�
-                this.AddTargetRow();
+                if (result == true)
+                {
+                    //娣诲姞銆愭墽琛岀洰鏍囪銆�
+                    this.AddTargetRow();
+                }
             });
         }
 
@@ -399,8 +403,6 @@
                 var btnEditor = rowDevice.AddEditorControl();
                 btnEditor.ButtonClickEvent += (sender, e) =>
                 {
-                    //闅愯棌鍙虫粦鑿滃崟
-                    rowDevice.HideMenu();
                     if (device.Type == DeviceType.DimmableLight//璋冨厜鍣�
                       || device.Type == DeviceType.ColorDimmableLight)//褰╃伅
                     {
@@ -590,8 +592,6 @@
                 var btnEditor = rowDelay.AddEditorControl();
                 btnEditor.ButtonClickEvent += (sender, e) =>
                 {
-                    //闅愯棌鍙虫粦鑿滃崟
-                    rowDelay.HideMenu();
                     //寤舵椂鏃堕棿閫夋嫨
                     var form = new AdjustTargetAddDelayTimeForm();
                     form.AddForm(data.DelayTime);
@@ -639,6 +639,7 @@
             {
                 return true;
             }
+
             //鎵撳紑杩涘害鏉�
             this.ShowProgressBar();
             //鑾峰彇鎵ц鐩爣鍒楄〃
@@ -675,7 +676,7 @@
             //閭ｄ釜鐗规畩鐨勬帶浠�
             this.frameBottomTemp = new FrameLayout();
             frameBottomTemp.Height = bodyFrameLayout.Height - btnTemp.Yaxis + Application.GetRealHeight(23);
-            this.listBodyControl.AddChidrenFrame(frameBottomTemp);
+            this.listBodyControl.AddChidren(frameBottomTemp);
         }
 
         #endregion
@@ -821,6 +822,9 @@
             this.editorScene.IconPath = this.cloneScene.IconPath;
             this.editorScene.Save();
 
+            //鏂板缓鍦烘櫙,涓婚〉闇�瑕侀噸鏂板埛鏂�
+            UserView.UserPage.Instance.RefreshAllForm = true;
+
             HdlThreadLogic.Current.RunMain(() =>
             {
                 //璋冪敤鍥炶皟鍑芥暟
@@ -860,6 +864,15 @@
                 //鍙樻洿鎴块棿
                 HdlSceneLogic.Current.ChangedSceneRoom(this.editorScene, this.nowRoomId);
             }
+            else
+            {
+                //绉婚櫎鍑烘埧闂�
+                var room = HdlRoomLogic.Current.GetRoomBySceneId(this.editorScene.Id);
+                if (room != null)
+                {
+                    HdlSceneLogic.Current.DeleteSceneFromRoom(room, this.editorScene);
+                }
+            }
 
             //鍥剧墖鏀瑰彉浜�
             if (isScenePictrueChanged == true)
@@ -887,6 +900,9 @@
             this.editorScene.IconPathType = this.cloneScene.IconPathType;
             this.editorScene.IconPath = this.cloneScene.IconPath;
             this.editorScene.Save();
+
+            //缂栬緫鍦烘櫙,涓婚〉闇�瑕侀噸鏂板埛鏂�
+            UserView.UserPage.Instance.RefreshAllForm = true;
 
             HdlThreadLogic.Current.RunMain(() =>
             {
@@ -942,11 +958,9 @@
             //榛樿鍥惧簱
             menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
             {
-                var localPic = new Device.Room.AddRoomSelectPicByLocal();
-                UserView.HomePage.Instance.AddChidren(localPic);
-                UserView.HomePage.Instance.PageIndex += 1;
-                localPic.Show();
-                localPic.action = (imgPath) =>
+                var form = new SelectLocalSceneImageForm();
+                form.AddForm();
+                form.FinishSelectEvent = (imgPath) =>
                 {
                     if (string.IsNullOrEmpty(imgPath) == true)
                     {

--
Gitblit v1.8.0