代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -83,6 +83,7 @@
                        // 类型区分 
                        TypeRefresh();
                        CommonPage.Loading.Hide();
                        bodyView.EndHeaderRefreshing();
                    });
                }
            });
@@ -235,7 +236,6 @@
            {
                bodyView.BeginHeaderRefreshing();
                ReadDoorLockUserInfo();
                bodyView.EndHeaderRefreshing();
            };
            BlankPicUI();
        }
@@ -670,7 +670,7 @@
                        Height = 10,
                        Width = Application.GetRealWidth(173),
                        X = Application.GetRealWidth(58),
                        Y = (j + 1) * Application.GetRealHeight(145),
                        Y = (j + 1) * Application.GetRealHeight(150)-5,
                        BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                    };
                    frameLayoutRow.AddChidren(frameLayoutRowLineHide);