Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

 HDL_ON/UI/UI2/UserPage.cs

@@ -307,9 +307,9 @@
        /// <summary>
        /// 切换到收藏界面
        /// </summary>
        void ChooseCollection()
        void ChooseCollection()//bool qiangzhishuaxin = false)
        {
            if (CurAnimationEffect == 0)
            if (CurAnimationEffect == 0 )//&& !qiangzhishuaxin)
            {
                return;
            }