合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs

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

namespace Shared.Phone
namespace Shared.Phone.UserCenter
{
    /// <summary>
    /// 场景的逻辑
@@ -268,7 +268,7 @@
                    //添加场景失败
                    string msg1 = Language.StringByID(R.MyInternationalizationString.AddSceneFail);
                    //拼接上【网关回复超时】的Msg
                    msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result);
                    msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result);
                    this.ShowTipMsg(msg1);
                    return null;
                }
@@ -569,7 +569,7 @@
                //初始化执行目标失败
                string msg1 = Language.StringByID(R.MyInternationalizationString.uInitAdjustTargetFail);
                //拼接上【网关回复超时】的Msg
                msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result);
                msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result);
                this.ShowTipMsg(msg1);
                return false;
            }
@@ -611,7 +611,7 @@
            }
            var result1 = await Scene.RenameSceneAsync(scene.Id, newName);
            //共通错误检测
            string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result1);
            string error = HdlCheckLogic.Current.CheckCommonErrorCode(result1);
            if (error != null)
            {
                this.ShowErrorMsg(error);
@@ -622,7 +622,7 @@
                //修改场景名称失败
                string msg1 = Language.StringByID(R.MyInternationalizationString.uEditorSceneNameFail);
                //拼接上【网关回复超时】的Msg
                msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result1);
                msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result1);
                this.ShowTipMsg(msg1);
                return false;
            }
@@ -925,7 +925,7 @@
                //控制场景失败
                string msg = Language.StringByID(R.MyInternationalizationString.ControlSceneFail);
                //拼接上【网关回复超时】的Msg
                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
                HdlThreadLogic.Current.RunMain(() =>
                {
                    //该场景正在延时，请稍后
@@ -994,7 +994,7 @@
                //获取执行目标失败
                string msg = Language.StringByID(R.MyInternationalizationString.uGetAdjustTargetFail);
                //拼接上【网关回复超时】的Msg
                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);

                this.ShowTipMsg(msg);
                return null;