|
@@ -275,19 +275,25 @@ namespace fis
|
|
|
case WindowType.LiveCourse:
|
|
|
targetMethodName = TargetMethodName.OpenLiveCoursePage;
|
|
|
break;
|
|
|
+ case WindowType.StudyAnalysis:
|
|
|
+ targetMethodName = TargetMethodName.AutoLoginWithGivenAccount;
|
|
|
+ break;
|
|
|
default:
|
|
|
targetMethodName = TargetMethodName.OpenMeasurePage;
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
_lastRouteName = targetMethodName;
|
|
|
- await DoRoute(executeContent);
|
|
|
+ await DoRoute(executeContent,windowType);
|
|
|
}
|
|
|
|
|
|
- private async Task DoRoute(string executeContent)
|
|
|
- {
|
|
|
- Logger.WriteShellLog("excute js begin");
|
|
|
- BrowserManager.SlaveBrowser.ExecuteJavaScript(executeContent);
|
|
|
+ private async Task DoRoute(string executeContent, WindowType windowType)
|
|
|
+ {
|
|
|
+ if (windowType != WindowType.StudyAnalysis)
|
|
|
+ {
|
|
|
+ Logger.WriteShellLog("excute js begin");
|
|
|
+ BrowserManager.SlaveBrowser.ExecuteJavaScript(executeContent);
|
|
|
+ }
|
|
|
await Dispatcher.UIThread.InvokeAsync(() =>
|
|
|
{
|
|
|
Logger.WriteShellLog("start show slave window,ShowInTaskbar:" + ShowInTaskbar.ToString());
|
|
@@ -328,7 +334,10 @@ namespace fis
|
|
|
}
|
|
|
Dispatcher.UIThread.InvokeAsync(() =>
|
|
|
{
|
|
|
- BrowserManager.SlaveBrowser.ExecuteJS(TargetMethodName.RouterToDefaultPage, new List<string>());
|
|
|
+ if (_lastRouteName != TargetMethodName.AutoLoginWithGivenAccount)
|
|
|
+ {
|
|
|
+ BrowserManager.SlaveBrowser.ExecuteJS(TargetMethodName.RouterToDefaultPage, new List<string>());
|
|
|
+ }
|
|
|
_isRoutedOnSecondWindow = false;
|
|
|
ShowActivated = false;
|
|
|
Hide();
|