添加图标

客户端/齐越慧眼/齐越慧眼/ApiHelper.cs

@@ -16,17 +16,21 @@ namespace 齐越慧眼
 
         public static UserInfo LoginSystemUser { get; set; }
 
+        public static bool NoLogin { get; set; }
+        static object lockToken = new object();
+
         static string jwtToken;
 
         public static string JwtToken { 
             get
             {
-             //   return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA";
+             //  return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA";
               
                 if (string.IsNullOrEmpty(jwtToken))
                 {
-                    jwtToken = GetMemoryToken().Replace("\r\n","");
                  
+                        jwtToken = GetMemoryToken().Replace("\r\n", "");
+                   
                 }
 
                 return jwtToken;
@@ -36,45 +40,58 @@ namespace 齐越慧眼
 
         static int getTokentCount = 0;
 
+
         public static string GetMemoryToken()
         {
-            string memoryName=string.Empty;
+            lock (lockToken)
-            string[] args = Environment.GetCommandLineArgs();
-            foreach (var arg in args)
             {
-                if (arg.StartsWith("uid:"))
+                if (NoLogin)
-                { 
+                {
-                    memoryName = arg;
+                    return string.Empty;
+                }
+                string memoryName = string.Empty;
+                string[] args = Environment.GetCommandLineArgs();
+                foreach (var arg in args)
+                {
+                    if (arg.StartsWith("uid:"))
+                    {
+                        memoryName = arg;
+                    }
                 }
-            }
 
-            var result= MemoryHelper.ReadMMF(memoryName);
+                var result = MemoryHelper.ReadMMF(memoryName);
 
-            if (result.isOk)
+                if (result.isOk)
-            {
+                {
-                if (string.IsNullOrEmpty(result.content))
+                    if (string.IsNullOrEmpty(result.content))
+                    {
+                        getTokentCount = getTokentCount + 1;
+                        if (getTokentCount <= 3)
+                        {
+                            Thread.Sleep(300);
+                            if (!NoLogin)
+                                return GetMemoryToken();
+                        }
+                    }
+
+                    return result.content;
+                }
+                else
                 {
                     getTokentCount = getTokentCount + 1;
                     if (getTokentCount <= 3)
                     {
                         Thread.Sleep(300);
-                        return GetMemoryToken();
+                        if (!NoLogin)
+                            return GetMemoryToken();
                     }
-                }
+                    MessageBox.Show("登录失败，请稍后重试！");
+                    NoLogin = true;
+                    //    WpfNoticeMsg.NoticeMessage.Show("小程序登录失败！");
 
-                return result.content;
+                    System.Environment.Exit(0);
-            }
+                    return string.Empty;
-            else {
-                getTokentCount = getTokentCount + 1;
-                if (getTokentCount <= 3)
-                {
-                    Thread.Sleep(300);
-                    return GetMemoryToken();
                 }
-
-                //    WpfNoticeMsg.NoticeMessage.Show("小程序登录失败！");
-                System.Environment.Exit(0);
-                return string.Empty;
             }
         }
 

客户端/齐越慧眼/齐越慧眼/MainWindow.xaml

@@ -12,7 +12,7 @@
         ActiveGlowColor="{DynamicResource PrimaryColor}"
         Height="780" 
         Title="慧眼 V1.0.0.1"
-        Width="1468" 
+        Width="1468" Icon="/icon.ico" 
         >
     <Border Padding="0 10" Background="#EEEEEE">
         <hc:TabControl IsAnimationEnabled="True" IsTabFillEnabled="False" TabItemWidth="150" Name="tab" SelectionChanged="tab_SelectionChanged">

客户端/齐越慧眼/齐越慧眼/MemoryHelper.cs

@@ -9,28 +9,33 @@ namespace Utils
 {
     public class MemoryHelper
     {
+        public static object lockToken=new object();
+
         public static string GetMemoryToken()
         {
-            string memoryName = string.Empty;
+            lock (lockToken)
-            string[] args = Environment.GetCommandLineArgs();
-            foreach (var arg in args)
             {
-                if (arg.StartsWith("uid:"))
+                string memoryName = string.Empty;
+                string[] args = Environment.GetCommandLineArgs();
+                foreach (var arg in args)
                 {
-                    memoryName = arg;
+                    if (arg.StartsWith("uid:"))
+                    {
+                        memoryName = arg;
+                    }
                 }
-            }
 
-            var result = MemoryHelper.ReadMMF(memoryName);
+                var result = MemoryHelper.ReadMMF(memoryName);
 
-            if (result.isOk)
+                if (result.isOk)
-            {
+                {
-                return result.content;
+                    return result.content;
-            }
+                }
-            else
+                else
-            {
+                {
-                System.Environment.Exit(0);
+                    System.Environment.Exit(0);
-                return string.Empty;
+                    return string.Empty;
+                }
             }
         }
 
@@ -75,7 +80,6 @@ namespace Utils
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
                 return (false, null);
             }
         }

客户端/齐越慧眼/齐越慧眼/cefhelper/CefMenuItem.cs

@@ -0,0 +1,139 @@
+using CefSharp;
+using CefSharp.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace 齐越慧眼.cefhelper
+{
+    public class CefMenuItem : IContextMenuHandler
+    {
+     
+            void IContextMenuHandler.OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model)
+            {
+
+            }
+
+            bool IContextMenuHandler.OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags)
+            {
+                return true;
+            }
+
+            void IContextMenuHandler.OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame)
+            {
+                //隐藏菜单栏
+                var chromiumWebBrowser = (ChromiumWebBrowser)browserControl;
+
+                chromiumWebBrowser.Dispatcher.Invoke(() =>
+                {
+                    chromiumWebBrowser.ContextMenu = null;
+                });
+            }
+
+            bool IContextMenuHandler.RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback)
+            {
+
+                //绘制了一遍菜单栏  所以初始化的时候不必绘制菜单栏，再此处绘制即可
+                var chromiumWebBrowser = (ChromiumWebBrowser)browserControl;
+
+                chromiumWebBrowser.Dispatcher.Invoke(() =>
+                {
+                    var menu = new ContextMenu
+                    {
+                        IsOpen = true
+                    };
+
+                    RoutedEventHandler handler = null;
+
+                    handler = (s, e) =>
+                    {
+                        menu.Closed -= handler;
+
+                        //If the callback has been disposed then it's already been executed
+                        //so don't call Cancel
+                        if (!callback.IsDisposed)
+                        {
+                            callback.Cancel();
+                        }
+                    };
+
+                    menu.Closed += handler;
+
+                    menu.Items.Add(new MenuItem
+                    {
+                        Header = "刷新",
+                        Command = new CustomCommand(() => {
+                            Application.Current.Dispatcher.Invoke(() =>
+                            {
+                                chromiumWebBrowser.Reload();
+                            });
+                        })
+                    });
+                    chromiumWebBrowser.ContextMenu = menu;
+
+                });
+
+                return true;
+            }
+
+            /// <summary>
+            /// 关闭窗体
+            /// </summary>
+            private void CloseWindow()
+            {
+                
+            }
+
+            private static IEnumerable<Tuple<string, CefMenuCommand>> GetMenuItems(IMenuModel model)
+            {
+                var list = new List<Tuple<string, CefMenuCommand>>();
+                for (var i = 0; i < model.Count; i++)
+                {
+                    var header = model.GetLabelAt(i);
+                    var commandId = model.GetCommandIdAt(i);
+                    list.Add(new Tuple<string, CefMenuCommand>(header, commandId));
+                }
+
+                return list;
+            }
+        }
+
+    public class CustomCommand : ICommand
+    {
+        Action _TargetExecuteMethod;
+        Func<bool> _TargetCanExecuteMethod;
+        public event EventHandler CanExecuteChanged = delegate { };
+
+        public CustomCommand(Action executeMethod)
+        {
+            _TargetExecuteMethod = executeMethod;
+        }
+
+        bool ICommand.CanExecute(object parameter)
+        {
+            if (_TargetCanExecuteMethod != null)
+            {
+                return _TargetCanExecuteMethod();
+            }
+            if (_TargetExecuteMethod != null)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public void RaiseCanExecuteChanged()
+        {
+            CanExecuteChanged(this, EventArgs.Empty);
+        }
+
+        void ICommand.Execute(object parameter)
+        {
+            _TargetExecuteMethod?.Invoke();
+        }
+    }
+
+}

客户端/齐越慧眼/齐越慧眼/cefhelper/ExtChromiumBrowser.cs

@@ -12,13 +12,14 @@ namespace 齐越慧眼.cefhelper
             : base(null)
         {
             this.LifeSpanHandler = new CefLifeSpanHandler();
-
+            this.MenuHandler = new CefMenuItem();
             //this.DownloadHandler = new DownloadHandler(this);
         }
 
         public ExtChromiumBrowser(string url) : base(url)
         {
             this.LifeSpanHandler = new CefLifeSpanHandler();
+            this.MenuHandler = new CefMenuItem();
         }
 
         public event EventHandler<NewWindowEventArgs> StartNewWindow;

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue

@@ -102,7 +102,7 @@
     },
     mounted() {
       window.getDatas = this.getDatas
-      //this.getDatas()
+      this.getDatas()
     },
     activated() {
       //this.getDatas()

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue

@@ -431,7 +431,7 @@ export default {
   },
   mounted() {
     window.getDatas = this.getDatas;
-    // this.getDatas(0)
+     this.getDatas(0)
   },
   activated() {
     //this.getDatas(0)

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue

@@ -392,7 +392,7 @@ export default {
   },
   mounted() {
     window.getDatas = this.getDatas;
-    // this.getDatas(0)
+     this.getDatas(0)
   },
   activated() {
     //this.getDatas(0)

客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

@@ -6,6 +6,7 @@
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64</Platforms>
     <Version>1.0.0.2</Version>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,6 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="icon.ico" />
     <None Remove="vuepage\client\.babelrc" />
     <None Remove="vuepage\client\.eslintignore" />
     <None Remove="vuepage\client\.eslintrc.js" />
@@ -61,6 +63,10 @@
     <None Remove="vuepage\dist\js\chunk-vendors.js.map" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="icon.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="CefSharp.Wpf.NETCore" Version="94.4.110" />
     <PackageReference Include="HandyControl" Version="3.2.0" />
@@ -71,6 +77,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="icon.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="vuepage\dist\css\app.4f57b433.css" />
     <EmbeddedResource Include="vuepage\dist\css\app.css" />
     <EmbeddedResource Include="vuepage\dist\css\chunk-vendors.09af4a6b.css" />