Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -94,7 +94,7 @@
        private string GetLogFile(int div)

        {

            //加密,因为这是收集数据,最好不让别人知道这是什么最好

            string fileName = UserCenterResourse.UserInfo.Account + DateTime.Now.ToString("yyyyMMdd");

            string fileName = UserCenterResourse.UserInfo.Account + "-" + DateTime.Now.ToString("yyyyMMdd");

            if (div == -1)

            {

                fileName += "Error";