Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

View/imgQR.xaml.cs

@@ -1,8 +1,10 @@
 using Net.Codecrete.QrCodeGenerator;
+using SunlightAggregationManager.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -94,9 +96,11 @@ namespace SunlightAggregationManager.View
         }
 
         private void imgQR_Loaded(object sender, RoutedEventArgs e)
-        {           
-            string text_APP = "TEST"; // 要生成二维码的内容
-            string text_LINK = Configini.IniReadvalue("SYS", "LINK"); // 要生成二维码的内容
+        {
+            string text_APP = "TEST"; // 
+            string text_LINK = MainWindowViewModel.MachineIP + ":"+ MainWindowViewModel.MachineIPP1 + 
+                ",HTTP//:" + MainWindowViewModel.SERVERIP + "/" + MainWindowViewModel.Enterprise;
+            // 要生成二维码的内容
 
             imgQR_CREATE(text_APP, imgQR_app);
             imgQR_CREATE(text_LINK, imgQR_link);