合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -425,6 +425,7 @@
        /// 重新绑定网关(1:正常  -1:异常  0:当前的网关绑定在了当前账号下的不同住宅里面)
        /// </summary>
        /// <param name="zbGateway">网关</param>
        /// <param name="btnMsg">消息控件</param>
        public async Task<int> ReBindNewGateway(ZbGateway zbGateway, NormalViewControl btnMsg = null)
        {

            if (zbGateway == null)

@@ -657,10 +658,10 @@
            }



            //获取全部设备

            bool result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);

            int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);

            //关闭进度条

            ProgressBar.Close();

            if (result == false)

            if (result == -1)

            {

                return false;

            }

@@ -2145,7 +2146,7 @@
            bool canBreak = false;

            HdlThreadLogic.Current.RunThread(async () =>

            {

                List<string> list = new List<string>() { "NotSetAgain" };

                List<string> list = new List<string>() { "NotSetAgain", "NotCheck" };



                //设置访问接口的参数

                var pra = new GetGatewayPra();

@@ -2379,27 +2380,27 @@
        /// <returns></returns>

        public async Task<bool> UpLoadDeviceBackupDataToGateway(CommonDevice device, GatewayBackupEnum backupEnum, object upLaodData)

        {

            //ZbGateway realWay = null;

            //if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, device.CurrentGateWayId) == false)

            //{

            //    //没有找到真实物理网关

            //    return false;

            //}

            //string fileName = device.FilePath + ((int)backupEnum).ToString().PadLeft(5, '0');

            ////创建文件对象

            //var result = await realWay.CreateFileAsync(fileName);

            //if (result == null || result.Result != 0)

            //{

            //    return false;

            //}

            ////发送数据流

            //var data = Newtonsoft.Json.JsonConvert.SerializeObject(upLaodData);

            //var byteData = System.Text.Encoding.UTF8.GetBytes(data);

            //var result2 = await realWay.SendFileAsync(byteData);

            //if (result2 == null || result2.Result != 0)

            //{

            //    return false;

            //}

            ZbGateway realWay = null;

            if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, device.CurrentGateWayId) == false)

            {

                //没有找到真实物理网关

                return false;

            }

            string fileName = device.FilePath + ((int)backupEnum).ToString().PadLeft(5, '0');

            //创建文件对象

            var result = await realWay.CreateFileAsync(fileName);

            if (result == null || result.Result != 0)

            {

                return false;

            }

            //发送数据流

            var data = Newtonsoft.Json.JsonConvert.SerializeObject(upLaodData);

            var byteData = System.Text.Encoding.UTF8.GetBytes(data);

            var result2 = await realWay.SendFileAsync(byteData);

            if (result2 == null || result2.Result != 0)

            {

                return false;

            }

            return true;

        }



@@ -2546,7 +2547,7 @@
            else if (backType == GatewayBackupEnum.APir灯光配置)

            {

                var recoverData = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.ConfigureParamates>(System.Text.Encoding.UTF8.GetString(byteData));

                result = await HdlDevicePirSensorLogic.Current.SetPirSensorLightSettion((IASZone)device, recoverData);

                result = await HdlDevicePirSensorLogic.Current.SetPirSensorSettion((IASZone)device, recoverData);

            }

            else if (backType == GatewayBackupEnum.A干接点颜色调节)

            {

@@ -2568,10 +2569,10 @@
                int level = Convert.ToInt32(recoverData["level"]);

                result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode((Panel)device, modeEnable, modeTime, level);

            }

            else if (backType == GatewayBackupEnum.A干接点私有属性)

            else if (backType == GatewayBackupEnum.A干接点第三级别私有属性)

            {

                var recoverData = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(System.Text.Encoding.UTF8.GetString(byteData));

                result = await HdlDevicePanelLogic.Current.EditorDryContactFunction((Panel)device, recoverData);

                result = await HdlDevicePanelLogic.Current.EditorDryContactThirdFunction((Panel)device, recoverData);

            }

            else if (backType == GatewayBackupEnum.A窗帘方向)

            {