Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -327,9 +327,7 @@
            };
            contentView.AddChidren(functionListView);


            LoadFunctionRow(functionListView);


            Button btnLine1 = new Button()
            {
@@ -339,7 +337,6 @@
            };
            contentView.AddChidren(btnLine1);


            Button btnLine2 = new Button()
            {
                //Y = sceneDelayRow.Bottom,
@@ -347,12 +344,11 @@
                BackgroundColor = CSS_Color.DividingLineColor,
            };
            contentView.AddChidren(btnLine2);

            #endregion

            Button btnBottomLine = new Button()
            {
                Y = Application.GetRealHeight(667-50)-1,
                Y = Application.GetRealHeight(667 - 50) - 1,
                Height = 1,
                BackgroundColor = CSS_Color.DividingLineColor,
            };
@@ -379,8 +375,8 @@
        void LoadFunctionRow(VerticalScrolViewLayout functionListView)
        {
            functionListView.RemoveAll();
            functionListView.Height = Application.GetRealWidth(65 * scene.sceneFunctionList.Count);
            foreach (var function in scene.sceneFunctionList)
            functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
            foreach (var scenefunction in scene.functions)
            {
                var row = new RowLayout()
                {
@@ -416,7 +412,7 @@
                    TextAlignment = TextAlignment.BottomRight,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = GetFunctionScnenInfo(function),
                    Text = GetFunctionScnenInfo(scenefunction),
                };
                row.AddChidren(btnFunctionInfo);

@@ -431,9 +427,9 @@
                };
                row.AddChidren(btnFunctionDelayInfo);

                if (function.delay > 0)
                if (Convert.ToInt32( scenefunction.delay) > 0)
                {
                    btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + function.delayText;
                    btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + scenefunction.localFunction.delayText;
                }
                else
                {
@@ -447,7 +443,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    Text = function.name,
                    Text = scenefunction.localFunction.name,
                };
                row.AddChidren(btnFunctionName);

@@ -459,20 +455,20 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.TextFontSize,
                    Text = function.GetRoomListName(),
                    Text = scenefunction.localFunction.GetRoomListName(),
                };
                row.AddChidren(btnFunctionFloorAndRoom);

                btnFunctionName.MouseUpEventHandler = (sender, e) =>
                {
                    var ssf = new SceneFunctionInfoEditPage(scene, function, refreshFunctionRowAction);
                    var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(ssf);
                    ssf.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
                btnFunctionFloorAndRoom.MouseUpEventHandler = (sender, e) =>
                {
                    var ssf = new SceneFunctionInfoEditPage(scene, function, refreshFunctionRowAction);
                    var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(ssf);
                    ssf.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -486,10 +482,10 @@
                };
                row.AddRightView(btnDelSceneFunction);
                btnDelSceneFunction.MouseUpEventHandler = (sender, e) => {
                    scene.sceneFunctionList.Remove(function);
                    scene.SaveFunctionData();
                    scene.functions.Remove(scenefunction);
                    scene.SaveSceneData();
                    row.RemoveFromParent();
                    functionListView.Height = Application.GetRealWidth(65 * scene.sceneFunctionList.Count);
                    functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
                    //LoadFunctionRow(functionListView);
                };

@@ -501,32 +497,41 @@
        /// 解析场景功能数据
        /// </summary>
        /// <param name="sceneFunction"></param>
        string GetFunctionScnenInfo(Function sceneFunction)
        string GetFunctionScnenInfo(SceneFunction sceneFunction)
        {
            string sceneFunctionInfo = Language.StringByID(StringId.Close);
            if (sceneFunction.trait_on_off.curValue.ToString() == "off")
                return sceneFunctionInfo;
            sceneFunctionInfo = "";
            var sceneFunctionInfo = "";
            foreach (var sfs in sceneFunction.status)
            {
                if (sfs.key == FunctionAttributeKey.OnOff)
                {
                    if (sfs.value == "off")
                        return Language.StringByID(StringId.Close);
                }
                if (sfs.key == FunctionAttributeKey.Mode)
                {
                    
                }
            }
            FunctionAttributes perTrait;

            switch (sceneFunction.functionType)
            switch (sceneFunction.localFunction.functionType)
            {
                case FunctionType.AC:
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
                         sceneFunction.function.Find((obj) => obj.key == "set_temperature").uintString;
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "fan").GetCurValueText();
                    sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
                         sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").uintString;
                    sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "fan").GetCurValueText();
                    break;
                case FunctionType.FloorHeating:
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
                         sceneFunction.function.Find((obj) => obj.key == "set_temperature").uintString;
                    sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
                         sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").uintString;
                    break;
                case FunctionType.Dimmer:
                    perTrait = sceneFunction.function.Find((obj) => obj.key == "brightness");
                    perTrait = sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness");
                    if (perTrait != null)
                    {
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
                    }
                    else
                    {
@@ -537,10 +542,10 @@
                    sceneFunctionInfo += Language.StringByID(StringId.Open);
                    break;
                case FunctionType.RGB:
                    perTrait = sceneFunction.function.Find((obj) => obj.key == "percent");
                    perTrait = sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent");
                    if (perTrait != null)
                    {
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
                    }
                    else
                    {
@@ -551,10 +556,10 @@
                    sceneFunctionInfo += Language.StringByID(StringId.Open);
                    break;
                case FunctionType.MotorCurtain:
                    perTrait = sceneFunction.function.Find((obj) => obj.key == "percent");
                    perTrait = sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent");
                    if (perTrait != null)
                    {
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "percent").curValue.ToString() + "%";
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent").curValue.ToString() + "%";
                    }
                    else
                    {
@@ -735,20 +740,29 @@
            {
                btnTakePicture.IsSelected = false;

                var pid = Guid.NewGuid();
                //var pid = Guid.NewGuid();
                //CropImage.TakePicture((imagePath) =>
                //{
                //    if (imagePath != null)
                //    {
                //        addSceneImageView.ImagePath = imagePath.ToString();
                //        scene.ImagePath = addSceneImageView.ImagePath;
                //        MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
                //    }
                //}, pid.ToString(), 4, 3);


                //var imageName = Guid.NewGuid().ToString();
                var imageName = scene.sid;
                CropImage.TakePicture((imagePath) =>
                {
                    if (imagePath != null)
                    {
                        addSceneImageView.ImagePath = imagePath.ToString();
                        scene.ImagePath = addSceneImageView.ImagePath;
                        MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
                    }
                }, pid.ToString(), 4, 3);
                if (pageTitleId == StringId.EditScene)
                {
                    scene.SaveFunctionData();
                }
                    CropImageCallBack(imagePath, imageName);
                }, imageName, 4, 3);

                //if (pageTitleId == StringId.EditScene)
                //{
                //    scene.SaveFunctionData();
                //}
                pictureOptionView.Parent.RemoveFromParent();
            };
            btnAlbum.MouseDownEventHandler = (sender, e) => {
@@ -758,20 +772,30 @@
            btnAlbum.MouseUpEventHandler = (sender, e) =>
            {
                btnAlbum.IsSelected = false;
                var pid = Guid.NewGuid();
                //var pid = Guid.NewGuid();
                //CropImage.SelectPicture((imagePath) =>
                //{
                //    if (imagePath != null)
                //    {
                //        addSceneImageView.ImagePath = imagePath.ToString();
                //        scene.ImagePath = addSceneImageView.ImagePath;
                //        MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
                //    }
                //}, pid.ToString(), 4, 3);

                //从相册选择图片裁剪
                //var imageName = Guid.NewGuid().ToString();
                var imageName = scene.sid;
                CropImage.SelectPicture((imagePath) =>
                {
                    if (imagePath != null)
                    {
                        addSceneImageView.ImagePath = imagePath.ToString();
                        scene.ImagePath = addSceneImageView.ImagePath;
                        MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
                    }
                }, pid.ToString(), 4, 3);
                if (pageTitleId == StringId.EditScene)
                {
                    scene.SaveFunctionData();
                }
                    CropImageCallBack(imagePath, imageName);
                }, imageName, 4, 3);


                //if (pageTitleId == StringId.EditScene)
                //{
                //    scene.SaveFunctionData();
                //}
                pictureOptionView.Parent.RemoveFromParent();
            };

@@ -782,7 +806,7 @@
                    addSceneImageView.ImagePath = scene.ImagePath;
                    if (pageTitleId == StringId.EditScene)
                    {
                        scene.SaveFunctionData();
                        scene.SaveSceneData();
                    }
                };

@@ -791,6 +815,58 @@
                galleryPage.LoadPage(true);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };

        }

        /// <summary>
        /// 裁剪完照片回调，统一处理
        /// </summary>
        /// <param name="imagePath">裁剪后的真实路径</param>
        /// <param name="imageName">自定义的图片名称</param>
        void CropImageCallBack(string imagePath, string imageName)
        {
            if (string.IsNullOrEmpty(imagePath) == true)
            {
                return;
            }

            try
            {
                var mPath = imagePath;
                MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);

#if __IOS__


#else
                //1.使用新名字，解决相同路径不刷新图片问题
                imageName = Guid.NewGuid().ToString() + ".png";
                //1.2如果是自定义图片删除之前的
                if (!addSceneImageView.ImagePath.Contains("Gallery/scenebg"))
                {
                    Utlis.WriteLine("删除: " + addSceneImageView.ImagePath);
                    System.IO.File.Delete(addSceneImageView.ImagePath);
                }
                //1.3如果是安卓需要拷贝回来APP根目录
                FileUtils.FileCopyToRootPath(imagePath, imageName);
                System.IO.File.Delete(imagePath);
                MainPage.Log("SelectPicture 最终路径: " + imageName);
                mPath = imageName;
#endif
                //清空原来图片
                addSceneImageView.ImagePath = "NULL";
                addSceneImageView.ImagePath = mPath;
                scene.ImagePath = mPath;

                if (pageTitleId == StringId.EditScene)
                {
                    scene.SaveSceneData();
                }
            }
            catch
            {

            }

        }

@@ -821,7 +897,7 @@
                            return;
                        }
                    }
                    scene.SaveFunctionData();
                    scene.SaveSceneData();
                    DB_ResidenceData.functionList.scenes.Add(scene);
                    backAction();
                    this.RemoveFromParent();
@@ -862,7 +938,7 @@
                scene.name = str;
                if (pageTitleId == StringId.EditScene)
                {
                    scene.SaveFunctionData();
                    scene.SaveSceneData();
                }
            };
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
@@ -879,5 +955,6 @@
            btnEditSceneNameIcon.MouseUpEventHandler = eventHandler;
        }


    }
}