新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

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

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -4,7 +4,7 @@
using Shared.Common;
using ZigBee.Device;

namespace Shared.Phone.UserCenter
namespace Shared.Phone
{
    /// <summary>
    /// App体验账号的逻辑
@@ -36,13 +36,6 @@
        /// 用来递增生成Mac用的
        /// </summary>
        private int DeviceNumber = 0;
        /// <summary>
        /// 是否是游客体验
        /// </summary>
        public bool IsExperience
        {
            get { return Config.Instance.Guid == "chushiGuid"; }
        }

        #endregion

@@ -78,11 +71,11 @@
        /// </summary>
        private void InitUserInfoData()
        {
            UserCenterResourse.UserInfo = new UserInformation();
            UserCenterResourse.UserInfo.AuthorityNo = 1;//给他管理员称号
            UserCenterResourse.UserInfo.AuthorityText = Language.StringByID(R.MyInternationalizationString.Administrator);
            HdlUserCenterResourse.UserInfo = new UserInformation();
            HdlUserCenterResourse.ResidenceOption.AuthorityNo = 1;//给他管理员称号
            HdlUserCenterResourse.ResidenceOption.AuthorityText = Language.StringByID(R.MyInternationalizationString.Administrator);
            //虚拟账号
            UserCenterResourse.UserInfo.UserName = Language.StringByID(R.MyInternationalizationString.uVirtualAccount);
            HdlUserCenterResourse.UserInfo.NickName = Language.StringByID(R.MyInternationalizationString.uVirtualAccount);
        }

        #endregion
@@ -265,7 +258,7 @@
        private void InitDeviceData()
        {
            //先刷新容器
            LocalDevice.Current.ReFreshByLocal();
            HdlDeviceCommonLogic.Current.ReFreshByLocal();
            //顺便也整一下网关(有可能它是从实体账号转为虚拟时,没有清空)
            HdlGatewayLogic.Current.ReFreshByLocal();
            HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
@@ -340,7 +333,7 @@
            var listBind = new List<Scene.DeviceListData>();
            foreach (var mainKey in i_room.ListDevice)
            {
                var device = LocalDevice.Current.GetDevice(mainKey);
                var device = HdlDeviceCommonLogic.Current.GetDevice(mainKey);
                if (device == null) { continue; }
                //只要继电器和灯
                if (device.Type == DeviceType.OnOffOutput
@@ -969,7 +962,7 @@
                device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 258 });
            }
            //添加虚拟设备
            LocalDevice.Current.AddVirtualDeviceToMemory(device);
            HdlDeviceCommonLogic.Current.AddVirtualDeviceToMemory(device);

            var room = HdlRoomLogic.Current.GetRoomById(roomId);
            if (room != null)