From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
old mode 100755
new mode 100644
index 926ef73..c53bfd5
--- a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
@@ -42,9 +42,19 @@
Width = bodyView.Width - Application.GetRealWidth(32)
};
bodyView.AddChidren(webView);
+ try
+ {
+ if (!string.IsNullOrEmpty(url))
+ {
+ //鍔犺浇缃戝潃
+ webView.LoadRequest(url);
+ }
+ }
+ catch
+ {
- //鍔犺浇缃戝潃
- webView.LoadRequest(url);
+ }
+
this.Show();
}
}
--
Gitblit v1.8.0