一个新版本

黄学彪

2019-12-09 163777d8a2cb7cfa469f54a7042528870ebc10a3

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

@@ -117,10 +117,20 @@
            {

                return;

            }



            List<string> listBackupGwId = new List<string>();

            var fileData = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);

            if (fileData != null)

            {

                //新增：虽然概率低，但是确实发生了。如果有网络时，App重新绑定记录的网关失败的话

                //不应该删除它

                listBackupGwId = JsonConvert.DeserializeObject<List<string>>(System.Text.Encoding.UTF8.GetString(fileData));

            }



            List<string> listDelete = new List<string>();
            foreach (var gatewayId in this.dicGateway.Keys)

            {

                if (result.ContainsKey(gatewayId) == false)

                if (result.ContainsKey(gatewayId) == false && listBackupGwId.Contains(gatewayId) == false)

                {

                    //本地存在云端不存在的网关，则删除

                    listDelete.Add(gatewayId);

@@ -451,7 +461,7 @@
                    btnMsg.TextID = R.MyInternationalizationString.uGatewayDataIsChangingPleaseWhait;

                });

            }

            await System.Threading.Tasks.Task.Delay(8000);

            await Task.Delay(8000);



            //获取网关的信息

            var result = await zbGateway.GetZbGwInfoAsync();

@@ -463,15 +473,7 @@
                return -1;

            }



            if (result == null)

            {

                //获取网关信息失败

                string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);

                this.ShowTipMsg(msg);

                return -1;

            }



            if (result.getGwData == null)

            if (result == null || result.getGwData == null)

            {

                //获取网关信息失败

                string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);

@@ -691,15 +693,15 @@
                bool result = await this.SetHomeIdToGateway(realWay, string.Empty);

                if (result == false)

                {

                    //网关解绑失败

                    //网关解绑失败  不理它,因为网关可以按按键强制搜索得到

                    string msg = Language.StringByID(R.MyInternationalizationString.uGatewayUnBindFail);

                    this.ShowErrorMsg(msg);

                    return false;

                    //this.ShowErrorMsg(msg);

                    //return false;

                }

            }



            //删除云端的网关

            await Phone.UserCenter.HdlGatewayLogic.Current.DeleteDataBaseGateway(zbGatewayID);

            await this.DeleteDataBaseGateway(zbGatewayID);



            //删除网关文件
            this.DeleteGatewayFile(zbGatewayID);
@@ -2243,7 +2245,7 @@
            //获取控制主人账号的Token

            Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();



            List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord" };

            List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotSetAgain" };



            bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);

            if (result == false)