新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/Common/Logic/HdlSceneLogic.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using ZigBee.Device;

namespace Shared.Phone.UserCenter
namespace Shared.Phone
{
    /// <summary>
    /// 场景的逻辑
@@ -150,7 +150,7 @@
                //加入缓存
                this.dicScenes[newScene.Id] = newScene;
                //备份
                HdlAutoBackupLogic.AddOrEditorFile(newScene.FileName);
                HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(newScene.FileName);
            }

        }
@@ -268,7 +268,7 @@
                    //添加场景失败
                    string msg1 = Language.StringByID(R.MyInternationalizationString.AddSceneFail);
                    //拼接上【网关回复超时】的Msg
                    msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result);
                    msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result);
                    this.ShowTipMsg(msg1);
                    return null;
                }
@@ -569,7 +569,7 @@
                //初始化执行目标失败
                string msg1 = Language.StringByID(R.MyInternationalizationString.uInitAdjustTargetFail);
                //拼接上【网关回复超时】的Msg
                msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result);
                msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result);
                this.ShowTipMsg(msg1);
                return false;
            }
@@ -611,7 +611,7 @@
            }
            var result1 = await Scene.RenameSceneAsync(scene.Id, newName);
            //共通错误检测
            string error = HdlCheckLogic.Current.CheckCommonErrorCode(result1);
            string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result1);
            if (error != null)
            {
                this.ShowErrorMsg(error);
@@ -622,7 +622,7 @@
                //修改场景名称失败
                string msg1 = Language.StringByID(R.MyInternationalizationString.uEditorSceneNameFail);
                //拼接上【网关回复超时】的Msg
                msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result1);
                msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result1);
                this.ShowTipMsg(msg1);
                return false;
            }
@@ -674,7 +674,7 @@
            if (Global.IsExistsByHomeId(sceneUI.FileName) == true)
            {
                Global.DeleteFilebyHomeId(sceneUI.FileName);
                HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
                HdlBackupLogic.Current.DeleteAutoBackFileStatu(sceneUI.FileName);
            }
            //删除图片
            if (sceneUI.IconPathType == 1 || sceneUI.IconPathType == 2)
@@ -682,7 +682,7 @@
                if (Global.IsExistsByHomeId(sceneUI.IconPath))
                {
                    Global.DeleteFilebyHomeId(sceneUI.IconPath);
                    HdlAutoBackupLogic.DeleteFile(sceneUI.IconPath);
                    HdlBackupLogic.Current.DeleteAutoBackFileStatu(sceneUI.IconPath);
                }
            }
            //删除场景时,需要刷新主页
@@ -925,7 +925,7 @@
                //控制场景失败
                string msg = Language.StringByID(R.MyInternationalizationString.ControlSceneFail);
                //拼接上【网关回复超时】的Msg
                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
                HdlThreadLogic.Current.RunMain(() =>
                {
                    //该场景正在延时，请稍后
@@ -994,7 +994,7 @@
                //获取执行目标失败
                string msg = Language.StringByID(R.MyInternationalizationString.uGetAdjustTargetFail);
                //拼接上【网关回复超时】的Msg
                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);

                this.ShowTipMsg(msg);
                return null;