Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/GateWay.Droid/Application.cs

@@ -36,6 +36,11 @@
            BaseActivity.BackKeyAction = () => {
                try
                {
                    if (Shared.Common.CommonPage.BackKeyCanClick == false)
                    {
                        //不允许按返回键
                        return;
                    }
                    if (Shared.Common.CommonPage.Loading != null)
                    {
                        Console.WriteLine(Shared.Common.CommonPage.Loading.CurStatus);