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

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs

@@ -570,15 +570,14 @@
                            if (doorLock.tempPasswordObject != null)
                            {
                                var addDoorLockTempPasswordData = new ZigBee.Device.DoorLock.AddDoorLockTempPasswordData();
                                if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
                                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                {
                                    //☆マーク☆
                                    //addDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                    addDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                    addDoorLockTempPasswordData.IsOtherAccountCtrl = true;
                                }
                                //对密码进行加密处理
                                string hdlKey = "hD1(La3o";
                                var enPsw = HdlCommonLogic.Current.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
                                var enPsw = UserCenterLogic.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
                                addDoorLockTempPasswordData.TempPwd = enPsw;
                                if (doorLock.DeviceAddr != null)
                                {
@@ -598,7 +597,7 @@
                                    });
                                    return;
                                }
                                if (result1.Code != HttpMessageEnum.A成功)
                                if (result1.StateCode != "Success")
                                {
                                    Application.RunOnMainThread(() =>
                                    {
@@ -709,7 +708,7 @@
            {
                dialog.Close();
                string msg = Language.StringByID(R.MyInternationalizationString.SureToDeleteTempPassword);
                var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
                var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
                alert.Show();
                //使用确认型弹框时,的回调函数
                alert.ConfirmClickEvent += () =>
@@ -744,10 +743,9 @@
                        if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
                        {
                            var delDoorLockTempPasswordData = new ZigBee.Device.DoorLock.DelDoorLockTempPasswordData();
                            if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
                            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                            {
                                //☆マーク☆
                                //delDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                delDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                delDoorLockTempPasswordData.IsOtherAccountCtrl = true;
                            }
                            if (doorLock.DeviceAddr != null)
@@ -757,7 +755,7 @@
                            var result1 = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLockPwd", delDoorLockTempPasswordData);
                            if (result1 != null)
                            {
                                if (result1.Code == HttpMessageEnum.A成功)
                                if (result1.StateCode == "Success")
                                {
                                    doorLock.tempPasswordObject = null;
                                    doorLock.LocalTempPassword = "";
@@ -822,10 +820,9 @@
                try
                {
                    var getDoorLockTempPasswordData = new ZigBee.Device.DoorLock.GetDoorLockTempPasswordData();
                    if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                    {
                        //☆マーク☆
                        //getDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                        getDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                        getDoorLockTempPasswordData.IsOtherAccountCtrl = true;
                    }
                    if (doorLock.DeviceAddr != null)
@@ -845,7 +842,7 @@
                                tpObj.InValidTime = curDoorLockTempPaw.ValidEndTime;
                                //解密密码
                                string hdlKey = "hD1(La3o";
                                var desPsw = HdlCommonLogic.Current.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
                                var desPsw = UserCenterLogic.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
                                doorLock.LocalTempPassword = tpObj.TempPassword = desPsw;
                                doorLock.tempPasswordObject = tpObj;
                                TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);