|
@@ -22,7 +22,6 @@ using PDFSettings.Settings;
|
|
|
using PDF_Office.Model.Dialog.ToolsDialogs.SaftyDialogs;
|
|
|
using static PDF_Office.Model.Dialog.ToolsDialogs.SaftyDialogs.SetPasswordDialogModel;
|
|
|
|
|
|
-
|
|
|
namespace PDF_Office.ViewModels
|
|
|
{
|
|
|
public class ViewContentViewModel : BindableBase, INavigationAware
|
|
@@ -98,6 +97,7 @@ namespace PDF_Office.ViewModels
|
|
|
}
|
|
|
|
|
|
private Visibility leftTipVisible = Visibility.Collapsed;
|
|
|
+
|
|
|
public Visibility LeftTipVisible
|
|
|
{
|
|
|
get { return leftTipVisible; }
|
|
@@ -394,7 +394,6 @@ namespace PDF_Office.ViewModels
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
private int selectedIndex;
|
|
|
|
|
|
/// <summary>
|
|
@@ -572,8 +571,6 @@ namespace PDF_Office.ViewModels
|
|
|
EnterSelectedBar("TabItemAnnotation");
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 设置Tip状态栏的显示状态
|
|
|
/// </summary>
|
|
@@ -616,6 +613,7 @@ namespace PDF_Office.ViewModels
|
|
|
region.RequestNavigate(LeftTipContentRegionName, "FileRestrictedTip", param);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
public void ShowSelectedTip(ShowTipEventArgs showTipEventArgs)
|
|
|
{
|
|
|
switch (showTipEventArgs.enumTipKind)
|
|
@@ -623,10 +621,12 @@ namespace PDF_Office.ViewModels
|
|
|
case EnumTipKind.StatusNone:
|
|
|
ShowLeftTip(false);
|
|
|
break;
|
|
|
+
|
|
|
case EnumTipKind.StatusSetPasswordSuccessfully:
|
|
|
ShowLeftTip(true);
|
|
|
region.RequestNavigate(LeftTipContentRegionName, "SetPasswordSuccessfullyTip");
|
|
|
break;
|
|
|
+
|
|
|
default: break;
|
|
|
}
|
|
|
}
|
|
@@ -929,15 +929,30 @@ namespace PDF_Office.ViewModels
|
|
|
{
|
|
|
EnterSelectedBar(CurrentBar);
|
|
|
}
|
|
|
-
|
|
|
- //isInPageEdit = false;
|
|
|
- //ShowContent(CurrentBar, false);
|
|
|
- //isInPageEdit = false;
|
|
|
+ bool isExist = false;
|
|
|
+ if (region.Regions.ContainsRegionWithName(TipContentRegionName))
|
|
|
+ {
|
|
|
+ var views = region.Regions[TipContentRegionName].Views;
|
|
|
+ foreach (var item in views)
|
|
|
+ {
|
|
|
+ if (item is Views.TipContent.ReadModelTip readModelTip)
|
|
|
+ {
|
|
|
+ isExist = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (isExist == false)
|
|
|
+ {
|
|
|
+ region.RequestNavigate(TipContentRegionName, "ReadModelTip");
|
|
|
+ }
|
|
|
|
|
|
IsLoading = Visibility.Collapsed;
|
|
|
- ReadModelTip = Visibility.Visible;
|
|
|
+ //ReadModelTip = Visibility.Visible;
|
|
|
+ ShowTip(true);
|
|
|
await Task.Delay(3000);
|
|
|
- ReadModelTip = Visibility.Collapsed;
|
|
|
+ //ReadModelTip = Visibility.Collapsed;
|
|
|
+ TipVisible = Visibility.Collapsed;
|
|
|
}
|
|
|
|
|
|
#region PDFViewer鼠标滚轮缩放事件
|
|
@@ -1478,6 +1493,7 @@ namespace PDF_Office.ViewModels
|
|
|
isInPageEdit = false;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
#endregion 方法
|
|
|
}
|
|
|
}
|