From 129bfd342bcd0e7d8e8844b8eaf80d7bb583b6e8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 02 四月 2019 11:55:17 +0800
Subject: [PATCH] 3335 拍卖行修改
---
System/Auction/MyFocusWin.cs | 22 ++++++++++++++++++----
System/Auction/AuctionModel.cs | 10 +++++++++-
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/System/Auction/AuctionModel.cs b/System/Auction/AuctionModel.cs
index 10647d9..7e024c1 100644
--- a/System/Auction/AuctionModel.cs
+++ b/System/Auction/AuctionModel.cs
@@ -38,6 +38,7 @@
public bool queryAfterwardAble { get; set; }
public DateTime queryTime = DateTime.Now;
public DateTime locationMyFocusTime = DateTime.Now;
+ public bool alreadyQueryMyFocus { get; set; }
int m_SelectClassifyId = 0;
public int selectClassifyId
@@ -636,7 +637,8 @@
if (existLocationAuction)
{
- WindowCenter.Instance.Open<AuctionHouseWin>(false, 3);
+ alreadyQueryMyFocus = true;
+ WindowCenter.Instance.Open<AuctionHouseWin>(true, 3);
}
}
@@ -894,6 +896,12 @@
{
locationMyFocusGuid = guid;
locationMyFocusTime = DateTime.Now;
+ AuctionItem item;
+ if (TryGetMyFocusAuctionItem(guid, out item))
+ {
+ WindowCenter.Instance.Open<AuctionHouseWin>(true, 3);
+ return;
+ }
AuctionInquiry.Instance.SendQueryAttentionAuctionItem();
}
#endregion
diff --git a/System/Auction/MyFocusWin.cs b/System/Auction/MyFocusWin.cs
index 613cf46..43ce0c4 100644
--- a/System/Auction/MyFocusWin.cs
+++ b/System/Auction/MyFocusWin.cs
@@ -34,18 +34,22 @@
protected override void OnPreOpen()
{
- AuctionInquiry.Instance.SendQueryAttentionAuctionItem();//鏌ヨ鎷嶅崠琛岀殑鍏虫敞鐗╁搧
+ if (!model.alreadyQueryMyFocus)
+ {
+ AuctionInquiry.Instance.SendQueryAttentionAuctionItem();//鏌ヨ鎷嶅崠琛岀殑鍏虫敞鐗╁搧
+ }
+ model.alreadyQueryMyFocus = false;
GetMyFocusList();
ListSotr();
OnCreateGridLineCell(m_ScrollerController);
var index = myFocusAuctionItems.IndexOf(model.locationMyFocusGuid);
- if (index != -1)
+ if (index != -1
+ && (DateTime.Now - model.locationMyFocusTime).TotalSeconds < 5)
{
m_ScrollerController.JumpIndex(index);
}
- model.locationMyFocusGuid = string.Empty;
}
protected override void OnAfterOpen()
@@ -67,7 +71,9 @@
model.auctionItemRefresh -= AuctionItemUpdate;//鍒锋柊
model.fairyAuctionRefresh -= ResetUpdate;
model.onFocusAuctionRefresh -= AddAuctionItemInfoUpdate;
- model.myBiddingAuctionRefresh -= ResetUpdate;
+ model.myBiddingAuctionRefresh -= ResetUpdate;
+
+ model.locationMyFocusGuid = string.Empty;
}
@@ -82,11 +88,19 @@
AuctionInquiry.Instance.SendQueryAttentionAuctionItem();//鏌ヨ鎷嶅崠琛岀殑鍏虫敞鐗╁搧
ResetUpdate();
}
+
private void ResetUpdate()
{
GetMyFocusList();
ListSotr();
OnCreateGridLineCell(m_ScrollerController);
+
+ var index = myFocusAuctionItems.IndexOf(model.locationMyFocusGuid);
+ if (index != -1
+ && (DateTime.Now - model.locationMyFocusTime).TotalSeconds < 5)
+ {
+ m_ScrollerController.JumpIndex(index);
+ }
}
private void AuctionItemUpdate()
--
Gitblit v1.8.0