请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

old mode 100755
new mode 100644
@@ -288,6 +288,7 @@
                Width = Application.GetRealHeight(757),
                Visible = false,
                UnSelectedImagePath = "DoorLock/UnLockBlankPic.png",
                Gravity = Gravity.CenterHorizontal,
            };
            blankFrameLayout.AddChidren(entryStatusPic);

@@ -316,7 +317,7 @@
            blankFrameLayout.AddChidren(btnPicTip1);
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
                btnPicTip1.Width = 0; 
                btnPicTip1.Width = 0;
            }
        }

@@ -806,17 +807,6 @@
            UserView.HomePage.Instance.ScrollEnabled = true;
            ZbGateway.StatusList.Remove(this);
            base.RemoveFromParent();
        }

        public void Changed(CommonDevice common)
        {
        }
        public void ChangedILogicStatus(ZigBee.Device.Logic logic)
        {
        }

        public void ChangedISceneStatus(Scene scene)
        {
        }
    }
}