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

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs

@@ -244,7 +244,7 @@
        /// <returns></returns>

        public BindObj.AddedDeviceBindResponseAllData AddDeviceBindList(BindObj.AddBindData addBindData, string receiveResult)

        {

            var device = HdlDeviceCommonLogic.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);

            var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);

            //获取对象

            var classData = new ModelDeviceBindData();

            var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A设备绑定列表, classData);

@@ -341,7 +341,7 @@
        /// <returns></returns>

        public BindObj.DelDeviceBindResponseAllData DeleteDeviceBindList(BindObj.DelDeviceBindData delDeviceBindData)

        {

            var device = HdlDeviceCommonLogic.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);

            var device = Common.LocalDevice.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);

            //获取对象

            var classData = new ModelDeviceBindData();

            var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A设备绑定列表, classData);

@@ -399,7 +399,7 @@
        /// <returns></returns>

        public BindObj.ClearBindInfoResponseAllData ClearDeviceAllBind(CommonDevice device)

        {

            string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);

            string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);

            if (TemplateCommonLogic.Current.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == true)

            {

                //移除全部的 设备绑定列表 数据

@@ -547,13 +547,13 @@
        /// </summary>

        /// <param name="device"></param>

        /// <returns></returns>

        public HdlDevicePanelLogic.PanelVibrationInfo GetPanelVibrationInfo(string deviceMac, int deviceEpoint)

        public UserCenter.HdlDevicePanelLogic.PanelVibrationInfo GetPanelVibrationInfo(string deviceMac, int deviceEpoint)

        {

            //获取对象

            var classData = new ModelPanelVibrationInfo();

            var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A面板震动功能, classData);



            var data = new HdlDevicePanelLogic.PanelVibrationInfo();

            var data = new UserCenter.HdlDevicePanelLogic.PanelVibrationInfo();

            data.A震动使能 = memoryData.vibrationInfo.A震动使能;

            data.A震动强度 = memoryData.vibrationInfo.A震动强度;

            data.A震动时间 = memoryData.vibrationInfo.A震动时间;

@@ -568,7 +568,7 @@
        /// <param name="datainfo"></param>

        /// <param name="receiveResult">设备返回的结果</param>

        /// <returns></returns>

        public bool SetPanelVibrationInfo(string deviceMac, int deviceEpoint, HdlDevicePanelLogic.PanelVibrationInfo datainfo, string receiveResult)

        public bool SetPanelVibrationInfo(string deviceMac, int deviceEpoint, UserCenter.HdlDevicePanelLogic.PanelVibrationInfo datainfo, string receiveResult)

        {

            //获取对象

            var classData = new ModelPanelVibrationInfo();

@@ -872,7 +872,7 @@
        /// <returns></returns>

        private string SetDouMarks(string i_text)

        {

            return HdlUserCenterResourse.douMarks + i_text + HdlUserCenterResourse.douMarks;

            return UserCenter.UserCenterResourse.douMarks + i_text + UserCenter.UserCenterResourse.douMarks;

        }



        #endregion