Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs

@@ -60,11 +60,11 @@
        {

            lock (objLock)

            {

                if (div != -1)

                {

                    //暂时只记录异常信息

                    return;

                }

                //if (div != -1)

                //{

                //    //暂时只记录异常信息

                //    return;

                //}

                //Log文件

                string fileName = this.GetLogFile(div);

                string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory, fileName);