Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -142,8 +142,10 @@
                List<CommonDevice> list = Common.LocalDevice.Current.GetDeviceByGatewayID(gatewayId);

                foreach (var device in list)

                {

                    //删除设备，不删除房间信息

                    Common.LocalDevice.Current.DeleteMemmoryDevice(device, false);

                    //删除一般设备

                    Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);

                    //删除Ota设备

                    Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);

                }

                //删除网关文件

                this.DeleteGatewayFile(gatewayId);

@@ -425,6 +427,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 +660,10 @@
            }



            //获取全部设备

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

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

            //关闭进度条

            ProgressBar.Close();

            if (result == false)

            if (result == -1)

            {

                return false;

            }

@@ -758,6 +761,8 @@
            {

                //删除设备文件

                Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);

                //删除Ota设备

                Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);

            }

            //如果是主网关

            if (this.IsMainGateway(zbGatewayID) == 1)

@@ -2379,27 +2384,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;

        }



@@ -2568,10 +2573,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窗帘方向)

            {