From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/UI/UI2/UserPage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 1a387c7..51a7e42 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -8,7 +8,6 @@
{
public partial class UserPage : FrameLayout
{
-
#region 鎺т欢鍒楄〃
/// <summary>
/// 褰撳墠鍖哄煙
@@ -18,6 +17,7 @@
/// 鍐呭鍖哄煙
/// </summary>
FrameLayout ContextView;
+ //VerticalRefreshLayout ContextView;
/// <summary>
/// 瀵艰埅鏍忓尯鍩�
/// </summary>
@@ -307,9 +307,9 @@
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
- void ChooseCollection()//bool qiangzhishuaxin = false)
+ void ChooseCollection(bool qiangzhishuaxin = false)
{
- if (CurAnimationEffect == 0 )//&& !qiangzhishuaxin)
+ if (CurAnimationEffect == 0 || qiangzhishuaxin)
{
return;
}
--
Gitblit v1.8.0