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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

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

@@ -30,7 +30,7 @@


        /// <summary>

        /// UI显示 
        /// UI显示

        /// </summary>
        public void Show()
        {
@@ -266,7 +266,7 @@
                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
                };
                rowFrameLayout.AddRightView(btnDel);
                #endregion 
                #endregion
                #region 数据处理
                switch (curDoorLockUser.UnlockType)
                {
@@ -314,6 +314,11 @@
                Action<Shared.View> action = async (obj) =>
                 {
                     var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
                     if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                     {
                         refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                         refreshDoorLockData.IsOtherAccountCtrl = true;
                     }
                     refreshDoorLockData.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                     if (doorLock.DeviceAddr != null)
                     {
@@ -362,6 +367,11 @@
                                if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
                                {
                                    var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                    {
                                        deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                        deleteDoorLockData.IsOtherAccountCtrl = true;
                                    }
                                    if (doorLock.DeviceAddr != null)
                                    {
                                        deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -393,6 +403,11 @@
                                    if (isSecondDel)
                                    {
                                        var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                        {
                                            deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                            deleteDoorLockData.IsOtherAccountCtrl = true;
                                        }
                                        if (doorLock.DeviceAddr != null)
                                        {
                                            deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -439,7 +454,7 @@
                        }
                    };
                };
                #endregion 
                #endregion
            }
        }

@@ -523,7 +538,7 @@
                        btnAllMethod.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;

                        // 类型区分 
                        // 类型区分
                        if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
                        {
                            RefreshList();
@@ -709,7 +724,7 @@
                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
                };
                rowFrameLayout.AddRightView(btnDel);
                #endregion 
                #endregion
                #region 数据处理
                switch (curDoorLockUser.UnlockType)
                {
@@ -757,6 +772,11 @@
                Action<Shared.View> action = async (obj) =>
                {
                    var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                    {
                        refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                        refreshDoorLockData.IsOtherAccountCtrl = true;
                    }
                    refreshDoorLockData.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                    if (doorLock.DeviceAddr != null)
                    {
@@ -805,6 +825,11 @@
                                if (resultData.defaultControlResponseData.status == 0)
                                {
                                    var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                    {
                                        deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                        deleteDoorLockData.IsOtherAccountCtrl = true;
                                    }
                                    if (doorLock.DeviceAddr != null)
                                    {
                                        deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;