CrazyIter_Bin пре 1 година
родитељ
комит
e376b54394

Разлика између датотеке није приказан због своје велике величине
+ 27 - 2
HTEXLabel/QRCodeForm.cs


+ 10 - 2
HTEXMark/HTEXMark.csproj

@@ -33,7 +33,7 @@
     <PublishUrl>publish\</PublishUrl>
     <InstallUrl />
     <TargetCulture>zh-chs</TargetCulture>
-    <ApplicationVersion>1.0.0.2</ApplicationVersion>
+    <ApplicationVersion>1.0.0.3</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>7</UpdateInterval>
@@ -328,7 +328,12 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="QRCodeForm.cs" />
+    <Compile Include="QRCodeForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="QRCodeForm.Designer.cs">
+      <DependentUpon>QRCodeForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="ThisAddIn.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -341,6 +346,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Images\AI.png" />
     <Content Include="Images\favicon.ico" />
     <Content Include="Images\二维码.png" />
     <Content Include="Images\作图题.png" />
@@ -348,6 +354,7 @@
     <Content Include="Images\创造.png" />
     <Content Include="Images\判断题.png" />
     <Content Include="Images\单选题.png" />
+    <Content Include="Images\地球.png" />
     <Content Include="Images\填空数量.png" />
     <Content Include="Images\填空题.png" />
     <Content Include="Images\多选题.png" />
@@ -356,6 +363,7 @@
     <Content Include="Images\应用.png" />
     <Content Include="Images\改错题.png" />
     <Content Include="Images\教师.png" />
+    <None Include="Images\数据中心.png" />
     <Content Include="Images\有序多选题.png" />
     <Content Include="Images\正确.png" />
     <Content Include="Images\理解.png" />

BIN
HTEXMark/Images/AI.png


BIN
HTEXMark/Images/地球.png


BIN
HTEXMark/Images/数据中心.png


+ 5 - 0
HTEXMark/MarkLanguage.cs

@@ -47,5 +47,10 @@ namespace HTEXMark
         public string schoolDropDown { get; set; }
         public string subjectDropDown { get; set; }
         public string pointMsgShow { get; set; }
+        public string termOfService {  get; set; }
+        public string privacyPolicy { get; set; }
+        public string dataCenter { get; set; }
+        public string china { get; set; }
+        public string global { get; set; }
     }
 }

+ 48 - 38
HTEXMark/MarkRibbon.Designer.cs

@@ -39,6 +39,9 @@ namespace HTEXMark
         { 
             this.item_mark_tab = this.Factory.CreateRibbonTab();
             this.item_type = this.Factory.CreateRibbonGroup();
+            this.item_taxonomy = this.Factory.CreateRibbonGroup();
+            this.item_tool = this.Factory.CreateRibbonGroup();
+            this.item_user = this.Factory.CreateRibbonGroup();
             this.single = this.Factory.CreateRibbonButton();
             this.multiple = this.Factory.CreateRibbonButton();
             this.judge = this.Factory.CreateRibbonButton();
@@ -49,7 +52,6 @@ namespace HTEXMark
             this.draw = this.Factory.CreateRibbonButton();
             this.compose = this.Factory.CreateRibbonButton();
             this.sortmultiple = this.Factory.CreateRibbonButton();
-            this.item_taxonomy = this.Factory.CreateRibbonGroup();
             this.remember = this.Factory.CreateRibbonButton();
             this.understand = this.Factory.CreateRibbonButton();
             this.apply = this.Factory.CreateRibbonButton();
@@ -57,7 +59,6 @@ namespace HTEXMark
             this.evaluate = this.Factory.CreateRibbonButton();
             this.create = this.Factory.CreateRibbonButton();
             this.taxonomy = this.Factory.CreateRibbonButton();
-            this.item_tool = this.Factory.CreateRibbonGroup();
             this.answer = this.Factory.CreateRibbonButton();
             this.analysis = this.Factory.CreateRibbonButton();
             this.score = this.Factory.CreateRibbonButton();
@@ -67,11 +68,11 @@ namespace HTEXMark
             this.ended = this.Factory.CreateRibbonButton();
             this.level = this.Factory.CreateRibbonButton();
             this.count = this.Factory.CreateRibbonButton();
-            this.item_user = this.Factory.CreateRibbonGroup();
             this.qrcode = this.Factory.CreateRibbonButton();
             this.user = this.Factory.CreateRibbonButton();
             this.schoolDropDown = this.Factory.CreateRibbonDropDown();
             this.subjectDropDown = this.Factory.CreateRibbonDropDown();
+            this.dataCenter = this.Factory.CreateRibbonDropDown();
             this.item_mark_tab.SuspendLayout();
             this.item_type.SuspendLayout();
             this.item_taxonomy.SuspendLayout();
@@ -103,6 +104,42 @@ namespace HTEXMark
             this.item_type.Label = "题目类型";
             this.item_type.Name = "item_type";
             // 
+            // item_taxonomy
+            // 
+            this.item_taxonomy.Items.Add(this.remember);
+            this.item_taxonomy.Items.Add(this.understand);
+            this.item_taxonomy.Items.Add(this.apply);
+            this.item_taxonomy.Items.Add(this.analyze);
+            this.item_taxonomy.Items.Add(this.evaluate);
+            this.item_taxonomy.Items.Add(this.create);
+            this.item_taxonomy.Items.Add(this.taxonomy);
+            this.item_taxonomy.Label = "认知层次";
+            this.item_taxonomy.Name = "item_taxonomy";
+            // 
+            // item_tool
+            // 
+            this.item_tool.Items.Add(this.answer);
+            this.item_tool.Items.Add(this.analysis);
+            this.item_tool.Items.Add(this.score);
+            this.item_tool.Items.Add(this.point);
+            this.item_tool.Items.Add(this.itrue);
+            this.item_tool.Items.Add(this.ifalse);
+            this.item_tool.Items.Add(this.ended);
+            this.item_tool.Items.Add(this.level);
+            this.item_tool.Items.Add(this.count);
+            this.item_tool.Label = "其他标记";
+            this.item_tool.Name = "item_tool";
+            // 
+            // item_user
+            // 
+            this.item_user.Items.Add(this.qrcode);
+            this.item_user.Items.Add(this.user);
+            this.item_user.Items.Add(this.schoolDropDown);
+            this.item_user.Items.Add(this.subjectDropDown);
+            this.item_user.Items.Add(this.dataCenter);
+            this.item_user.Label = "用户信息";
+            this.item_user.Name = "item_user";
+            // 
             // single
             // 
             this.single.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge;
@@ -193,18 +230,6 @@ namespace HTEXMark
             this.sortmultiple.ShowImage = true;
             this.sortmultiple.Click += new Microsoft.Office.Tools.Ribbon.RibbonControlEventHandler(this.MarkTags_Click);
             // 
-            // item_taxonomy
-            // 
-            this.item_taxonomy.Items.Add(this.remember);
-            this.item_taxonomy.Items.Add(this.understand);
-            this.item_taxonomy.Items.Add(this.apply);
-            this.item_taxonomy.Items.Add(this.analyze);
-            this.item_taxonomy.Items.Add(this.evaluate);
-            this.item_taxonomy.Items.Add(this.create);
-            this.item_taxonomy.Items.Add(this.taxonomy);
-            this.item_taxonomy.Label = "认知层次";
-            this.item_taxonomy.Name = "item_taxonomy";
-            // 
             // remember
             // 
             this.remember.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge;
@@ -268,20 +293,6 @@ namespace HTEXMark
             this.taxonomy.ShowImage = true;
             this.taxonomy.Click += new Microsoft.Office.Tools.Ribbon.RibbonControlEventHandler(this.MarkTags_Click);
             // 
-            // item_tool
-            // 
-            this.item_tool.Items.Add(this.answer);
-            this.item_tool.Items.Add(this.analysis);
-            this.item_tool.Items.Add(this.score);
-            this.item_tool.Items.Add(this.point);
-            this.item_tool.Items.Add(this.itrue);
-            this.item_tool.Items.Add(this.ifalse);
-            this.item_tool.Items.Add(this.ended);
-            this.item_tool.Items.Add(this.level);
-            this.item_tool.Items.Add(this.count);
-            this.item_tool.Label = "其他标记";
-            this.item_tool.Name = "item_tool";
-            // 
             // answer
             // 
             this.answer.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge;
@@ -363,15 +374,6 @@ namespace HTEXMark
             this.count.ShowImage = true;
             this.count.Click += new Microsoft.Office.Tools.Ribbon.RibbonControlEventHandler(this.MarkTags_Click);
             // 
-            // item_user
-            // 
-            this.item_user.Items.Add(this.qrcode);
-            this.item_user.Items.Add(this.user);
-            this.item_user.Items.Add(this.schoolDropDown);
-            this.item_user.Items.Add(this.subjectDropDown);
-            this.item_user.Label = "用户信息";
-            this.item_user.Name = "item_user";
-            // 
             // qrcode
             // 
             this.qrcode.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge;
@@ -406,6 +408,13 @@ namespace HTEXMark
             this.subjectDropDown.ShowImage = true;
             this.subjectDropDown.Visible = false;
             // 
+            // dataCenter
+            // 
+            this.dataCenter.Image = global::HTEXMark.Properties.Resources.数据中心;
+            this.dataCenter.Label = "站点";
+            this.dataCenter.Name = "dataCenter";
+            this.dataCenter.ShowImage = true;
+            // 
             // MarkRibbon
             // 
             this.Name = "MarkRibbon";
@@ -463,6 +472,7 @@ namespace HTEXMark
         internal Microsoft.Office.Tools.Ribbon.RibbonButton user;
         internal Microsoft.Office.Tools.Ribbon.RibbonDropDown schoolDropDown;
         internal Microsoft.Office.Tools.Ribbon.RibbonDropDown subjectDropDown;
+        internal Microsoft.Office.Tools.Ribbon.RibbonDropDown dataCenter;
     }
 
     partial class ThisRibbonCollection

+ 33 - 14
HTEXMark/MarkRibbon.cs

@@ -25,8 +25,10 @@ namespace HTEXMark
         public  System.Windows.Forms.ListBox knowledgeListBox;
         private HttpClient httpClient;
         public Microsoft.Office.Tools.CustomTaskPane customTaskPane;
+        public static string domain;
         private void MarkRibbon_Load(object sender, RibbonUIEventArgs e)
         {
+           
             // 获取 Office 应用程序的语言设置
             LanguageSettings languageSettings = Globals.ThisAddIn.Application.LanguageSettings;
             // 获取主语言 ID
@@ -77,6 +79,17 @@ namespace HTEXMark
                         break;
                     }
             }
+            domain="www.teammodel.cn";
+            var itemCN = this.Factory.CreateRibbonDropDownItem();
+            itemCN.Label=lang.china;
+            itemCN.Tag="www.teammodel.cn";
+            dataCenter.Items.Add(itemCN);
+            var itemNet = this.Factory.CreateRibbonDropDownItem();
+            itemNet.Label=lang.global;
+            itemNet.Tag="www.teammodel.net";
+            dataCenter.Items.Add(itemNet);
+            dataCenter.SelectionChanged+=DataCenterSelectionChanged;
+
             knowledgeUserControl =new KnowledgeUserControl();
             customTaskPane = Globals.ThisAddIn.CustomTaskPanes.Add(knowledgeUserControl, lang.paneTitle);
             customTaskPane.Visible = false;
@@ -85,6 +98,21 @@ namespace HTEXMark
             knowledgeUserControl.Controls.Add(knowledgeListBox);
             httpClient = HttpClientFactory.Create();
         }
+
+        private void DataCenterSelectionChanged(object sender, RibbonControlEventArgs e)
+        {
+            var data = sender as RibbonDropDown;
+            knowledgeListBox.Items.Clear();
+            schoolDropDown.Items.Clear();
+            subjectDropDown.Items.Clear();
+            user.Visible = false;
+            qrcode.Visible=true;
+            schoolDropDown.Visible=false;
+            subjectDropDown.Visible=false;
+            customTaskPane.Visible=false;
+            domain=data.SelectedItem.Tag.ToString();
+        }
+
         public async void SchoolSelectionChanged(object sender, RibbonControlEventArgs e)
         {
             var data = sender as RibbonDropDown;
@@ -98,7 +126,7 @@ namespace HTEXMark
             subjectDropDown.SelectionChanged-=SubjectSelectionChanged;
             knowledgeListBox.SelectedValueChanged-= KnowledgeListBoxSelectedValueChanged;
             knowledgeListBox.Items.Clear();
-            var response = await httpClient.GetAsync($"https://rc.teammodel.cn/hita/get-school-data?school={school}");
+            var response = await httpClient.GetAsync($"https://{domain}/hita/get-school-data?school={school}");
             if (response.IsSuccessStatusCode)
             {
                 string content = await response.Content.ReadAsStringAsync();
@@ -184,7 +212,7 @@ namespace HTEXMark
         }
         public async Task<List<Block>> AppendKnowledge(string school, string code, string id, HttpClient httpClient)
         {
-            var response = await httpClient.GetAsync($"https://rc.teammodel.cn/hita/get-school-knowledge?school={school}&id={id}&code={code}");
+            var response = await httpClient.GetAsync($"https://{domain}/hita/get-school-knowledge?school={school}&id={id}&code={code}");
             if (response.IsSuccessStatusCode)
             {
 
@@ -253,6 +281,7 @@ namespace HTEXMark
             user.Label=$"{language.user}\n";
             schoolDropDown.Label=$"{language.schoolDropDown}";
             subjectDropDown.Label=$"{language.subjectDropDown}";
+            dataCenter.Label=$"{language.dataCenter}";
             //
             single.Tag=language.single;
             multiple.Tag=language.multiple;
@@ -287,19 +316,9 @@ namespace HTEXMark
         private void QRCode_Click(object sender, RibbonControlEventArgs e) {
             // 创建 Windows Forms 窗口
             var qrcode_button = sender as  RibbonButton;
-            
-            QRCodeForm qrCodeForm = new QRCodeForm(qrcode_button, user,schoolDropDown,subjectDropDown,  lang,this, customTaskPane)
-            {
-
 
-                MaximizeBox = false,
-                MinimizeBox = false,
-                // 设置窗体的边框样式
-                FormBorderStyle = FormBorderStyle.FixedSingle,
-                Width=215,
-                Height=240,
-                // 显示窗口
-            };
+            QRCodeForm qrCodeForm = new QRCodeForm(qrcode_button, user, schoolDropDown, subjectDropDown, lang, this, customTaskPane,domain);
+             
             CenterFormOnScreen(qrCodeForm);
             qrCodeForm.ShowDialog();
         }

+ 10 - 0
HTEXMark/Properties/Resources.Designer.cs

@@ -200,6 +200,16 @@ namespace HTEXMark.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 数据中心 {
+            get {
+                object obj = ResourceManager.GetObject("数据中心", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

+ 16 - 13
HTEXMark/Properties/Resources.resx

@@ -124,8 +124,8 @@
   <data name="配分" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\配分.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="问答题" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Images\问答题.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="填空题" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\填空题.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="创造" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\创造.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -133,6 +133,9 @@
   <data name="错误" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\错误.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="填空数量" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\填空数量.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="记忆" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\记忆.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -142,11 +145,11 @@
   <data name="改错题" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\改错题.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="结束" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Images\结束.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="学校" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\学校.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="填空题" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Images\填空题.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="问答题" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\问答题.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="应用" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\应用.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -169,8 +172,8 @@
   <data name="分析" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\分析.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="填空数量" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Images\填空数量.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="结束" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\结束.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="连线题" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\连线题.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -196,16 +199,16 @@
   <data name="知识点" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\知识点.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="学科" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\学科.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="评价" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\评价.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="难度" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\难度.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="学科" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Images\学科.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="学校" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Images\学校.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="数据中心" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\数据中心.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

+ 107 - 0
HTEXMark/QRCodeForm.Designer.cs

@@ -0,0 +1,107 @@
+using System.Collections.Generic;
+using System.Drawing;
+using System.IdentityModel.Tokens.Jwt;
+using System.Linq;
+using System.Text.Json;
+using System.Windows.Forms;
+using System;
+
+namespace HTEXMark
+{
+    partial class QRCodeForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QRCodeForm));
+            this.privacyPolicy = new System.Windows.Forms.LinkLabel();
+            this.termOfService = new System.Windows.Forms.LinkLabel();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // privacyPolicy
+            // 
+            this.privacyPolicy.AutoSize = true;
+            this.privacyPolicy.Location = new System.Drawing.Point(124, 204);
+            this.privacyPolicy.Name = "privacyPolicy";
+            this.privacyPolicy.Size = new System.Drawing.Size(65, 12);
+            this.privacyPolicy.TabIndex = 0;
+            this.privacyPolicy.TabStop = true;
+            this.privacyPolicy.Text = "隐私权政策";
+            this.privacyPolicy.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.privacyPolicy_LinkClicked);
+            // 
+            // termOfService
+            // 
+            this.termOfService.AutoSize = true;
+            this.termOfService.Location = new System.Drawing.Point(12, 204);
+            this.termOfService.Name = "termOfService";
+            this.termOfService.Size = new System.Drawing.Size(53, 12);
+            this.termOfService.TabIndex = 1;
+            this.termOfService.TabStop = true;
+            this.termOfService.Text = "服务条款";
+            this.termOfService.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.termOfService_LinkClicked);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Location = new System.Drawing.Point(1, 1);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(200, 200);
+            this.pictureBox.TabIndex = 2;
+            this.pictureBox.TabStop = false;
+            // 
+            // QRCodeForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(201, 218);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.termOfService);
+            this.Controls.Add(this.privacyPolicy);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "QRCodeForm";
+            this.Text = "请使用HiTA扫码登录...";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.QRCodeForm_FormClosed);
+            this.Load += new System.EventHandler(this.FormLoad);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.LinkLabel privacyPolicy;
+        private System.Windows.Forms.LinkLabel termOfService;
+        private System.Windows.Forms.PictureBox pictureBox;
+        
+
+    }
+
+}

Разлика између датотеке није приказан због своје велике величине
+ 93 - 74
HTEXMark/QRCodeForm.cs


+ 288 - 0
HTEXMark/QRCodeForm.resx

@@ -117,4 +117,292 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAAMMOAADDDgAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzenXANvv5QGn2bMLndWqK5jT
+        pUSQz55FkM+dP5XSo56OzpvOldGisZbSo12Y06U5oNasDprUpwec1KgAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAArty4ALHd
+        uwmS0J9Vi82Zt4nMl+CJzJfyiMyW84fLleyIzJbxhsuU+ofLlf+IzJb3js6b3pTRoZaZ06Z3mdOmM6fZ
+        swaa1KcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AADI59AA6/XwBJnTpkmW0qOOjs+cuIfMlfyGy5T/h8uV/IbLlP6Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Hy5X6i82Z7ZHQnr2V0aKbiMyWeI/PnTK34MQDpdiyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAicyYAKzbtxuT0KA6jM6aYpDPnZiNzpvci82Z7onMl+qHy5X+hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T+iMyW/IfLlf2JzJfikM+dfpLQnyyl2LEWe8eLAK/d
+        uwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAACs27gArty6F5XSo1yQz52zis2Y8YbLlPyGy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP2IzJbhktCfuZrUqFiw3bwErNu4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAKvbtgCw3bsDktCfJ5DPnp+LzZnwhsuU/IbLlP+Gy5T/hsuU/4fL
+        lfuHy5XkiMyW7ojMlfqGy5T9hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+KzZjwj8+db5rUpwiT0aEAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5fLsAABQAADB5MsGktCfbYnMluOGy5T9hsuU/4fL
+        lf6Hy5X2icyWzIvNmZmR0J9jl9KkXI/PnbqNzpvoiMyV+obLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4fLlfaNzpuek9CgPZrT
+        phCc1KkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnTpACc1KcOj8+clojM
+        lu+JzJf+i82Z8YnMl7GMzppijM2ZRZXRohGo2rQMktCfeInMl92Gy5T+hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/orNl+yMzpqnldGiJ4nNlwCp2bUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM/o
+        zwCHypEAmM+cao3Nl/uJzJfYjc6bnZPQoEyV0aINktCfAIvNmQCZ06Ylj8+clorNl8OLzZm9iMyWo5HQ
+        n6KR0J7Bjs6byY3Om+uLzZj1iMyW94rNmPKGy5T9hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/h8uV/o/Pnr2e168jj9ChAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAADP6M8AAIwTAJ3Rnk2Vz5xvmdOlKv///wGl2LQAAAAAAM/r1wD///8Am9SoLpLQ
+        oDqc1KlHj8+co4nMl7yJzJe5icyXzozOmtGKzZjuicyX84jMlvWLzZnph8uV94bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4jMlv+Kzp3/j9Oprpja
+        uhOP1rEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA////AILJkACS0KBDjs6b0IfMlf+Gy5T/h8uV/obLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4fL
+        lf+Kzpv/iNCi/4PRqfyG1LSyj9jBMIvWvAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAANHu3ACLzJcAltKkLpPRoGeJzJdphsuUaI3OmnSR0J58is2XhojM
+        lpeMzpqXis2YuYfLlfiGy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+JzZn/iM+g/4TRp/+A0a//fNG1/33SvsN808UjddDBAPX28QAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAD3/fwAAAAAAJ3Vqg6Pz51ei82ZfYrNmImJzJfthsuU/4bLlP+Gy5T/hsuU/4bL
+        lP+Gy5T/hsuU/4bLlP+Gy5T/hsuU/4bLlP+IzJf/ic+f/4XRpv+A0a7/fdG1/3vSvf920cP/ddLKuYjZ
+        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
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKLi9ADR8PgDY9Hup1zO
+        7f9cz+3/XM/t/1zP7f9cz+3/XM/t/1zP7f9cz+3/XM/t/1zP7f9czu3/Xc/t/2/U76DdxZQt17yBbtW4
+        eIvSs2/807Vz8dKzbv7Vt3fH5dOxEtS3dmTXu37U0rNu/dKybP/Ssmz/07Vxzde7f0fUtnTP28KNJtvC
+        jgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AACM3PIAmN/zB2bR7rldz+3/Xc/t/13P7f9dz+3/Xc/t/13P7f9dz+3/Xc/t/13P7f9dz+3/Xc/t/13P
+        7f9n0u6/2L2CL9W3d43VuHlk0rNu79W3d+LSsmz807Rv69rBjC3Ut3Zn1LZ0+dGxav/RsWn/0bFp/9Kz
+        buvYvYJO07Vxyte8gEzTtXEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAatPuAGzT7g1bzu3FWs7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO
+        7f9azu3/Ws7t/1rO7f9azu3/Xs/trN3FlBrXu4CT2L2DOtKzbOPRsWr/0bFp/9Kya/bVuXo+1bd2QNO1
+        cu7Rsmv70bFp/9Gxaf/Ssmz21LVzUNKzbrfUtnWV7ODNAde7fwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGjS7gBr0+42XM/t7VrO7f9azu3/Ws7t/1rO
+        7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/2nS7sTl0rMD17t/ete7gETSsmu90bFp/9Gx
+        af/Rsmr/1bh3Z9rBih3VuHjT0rNt9dGxaf/RsWn/0bFp/9S3doLUtnWC0rNt39a6fiTWun0AAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABazu0AZNHuX1vO
+        7f5azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1vO7f5t0++20rNuANS2
+        c1PVt3Zf1bh4ddGya//RsWn/0bFq/9W5ep7j0a0K1LZzttKya//RsWn/0bFp/9Gxaf/UtnW61rp+TdO0
+        b+vUtXNN07VyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAB/2PEAjt3zBmHQ7qlazu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO
+        7f9bzu35atLub9W3dwDZv4hQ17t/kt3GljTUtnPj0bFp/9Gxaf/Ss23M2sGNENO1cpfSs2z/0bFp/9Gx
+        af/RsWn/0rNt6dm+h0XTtG+/07RwsNm+hwrXu4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAadLvAGrT7ypdz+3lWs7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO
+        7f9azu3/Ws7t/1rO7f9azu3/W87t+mnS7nPZwIoA28KPO9e7gLHXu4A31LZ0zdGxav7RsWn/0rRv6dvD
+        jzHUtnR20rNt/tGxav7RsWn/0bFp/9Gyav/VuHip1bd3p9KybPfUt3VT0rJrANW3eQAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdNXwAO31+wFg0O6HWs7t/1rO7f9azu3/Ws7t/1rO
+        7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1vO7fZp0u5T28KOANvCjzbZvobS2b6HVdW4
+        eaDSsmz80bFp/9Kzbf7XvIBu1bh6RdKybPPRsWn/0bFp/9Gxaf/RsWn/0rNs6te7fpjSsmz30rNuyda5
+        fBzVuXsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4/X6AF3P7QBl0e45XM/t517P
+        7f9bzu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9ez+3ab9TvJd/I
+        mwDhzKIM2L6FoNa6fL3WuXt/0bJr/dGxaf/RsWn/1LVzz9i8givUtnSp0bFp/9Gxaf/RsWn/0bFp/9Gx
+        af/UtnO21Ld2stGxavzSs26S2sGMCNm+hwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF/Q
+        7gBq0+4UXc/tt1vO7f5ez+77Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO
+        7f9azu3/ZtHuntPw+QQAAAAAz65jANS1c3LSs23j2b6FXNS3dd7RsWn/0bFp/9Gyav/WuXty2b+JfNKz
+        bf7Rsmr+0bFp/9Gxaf/RsWn/0bFq8tS2c47Ut3a30rNu9dK1d3G+rJIDybCBAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAG3I7wB2yfAMZM7ulFzO7f1bzu37W87t+lrO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO
+        7f9azu3/Ws7t/1rO7f9azu3/XM/t+G3T705bzu0AAAAAANGwaADSs21a07Rv9NW4eY3UtnNv07Rw+dKz
+        bfzRsWn/07Rvxti9hGzUtXLF0bFq/9Gxaf/RsWn/0bFp/9Gxaf/Ssmzj17t+ls+zd+nDqn3wt6WSZa+t
+        yQSvpaoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAHSz8AB8svAKZLbuh17A7fphy+7/Xs/t/1rO7f9azu3/Ws7t/1rO
+        7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/2DQ7s961/AVetfwAAAAAADWuXsA1rl7HtKz
+        b9bSs27n1bh6V9W5er3TtHDv0bFp/tGxav/VuHeK17t/XtKzbfXRsWn/0bFp/9Gxaf/RsWn/0bFs/8yw
+        eNjDrIessqCP8KKWn/ORjLJ6e4LMDYGExAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+B6QBahuoSWZXsklii7PlasO3/Xr3t/2DI
+        7f9ezu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/13P7f9t0++HAJrbAIDY
+        8QAAAAAA38maAMGWMgDVuHh00rNt/NKzbq7dxZQx17t/u9Gxav/RsWn/07Vxyd3FlCvTtXGX0bFp/tGx
+        af/RsWr/0LJv/8muef+9p4T/saCT2KSZpKuPiq/yeXu++WRx0apbc+Uywdz/AYKa7gAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdI/rAAAA1QBWcOcuUnfnslGD
+        6fxXlev8XqXt91qu7f9duu3/YMXt/1/N7f9bzu3/Ws7t/1rO7f9azu3/Ws7t/1rO7f9azu3/Ws7t/1rO
+        7f9f0O7kd9bwN3DU7wAAAAAAAAAAAAAAAADXun4A1rp+HtO1cs7UtnPv2L2EYNe7f5vSsmv/0bFp/9Ky
+        bPzWuXuk2b+HMtKzbdjRsWv/zrFy/8atfP+7pYb/r56T/6CUoP+Piq/kf4G/u2lzzeRSZ9z/SWHk4kxk
+        5XVZcucbm7PyAnCK6wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrhOoAeZPtAmB4
+        6BhVbedySGDl20pn5f9Ue+jtWIvq6laV6/5XoOz/Wqzt/1y47f9fw+3/Yczu/13O7f9azu3/Ws7t/1rO
+        7f9azu3/Ws7t/1rO7f9bzu3+Z9LuddTx+QKD2vEAAAAAAAAAAAAAAAAA6tq/AM6sYQDXu35R07Vy8dO1
+        cunWun2X1rp+0tO1cfbRsWj/0rJr+ti8gZXWu4CCzbF4+8OrgPu5pYr8rZ2V/5+Uof+Pia7/fX67/2t0
+        y/FabtvFUWrlwkhg5fFEXOT9SGDl2E5l5otOZuVAZHzpFWR96QaMqvAAhqPvAAAAAAAAAAAAABPYAGmD
+        6gRlfukWUmvmQ01m5opIYOXURV3k+0Vd5PVMZOXZUXDm4VB66PtSh+r/VZTr/1ig7P9aq+3/XLbt/1/A
+        7f9hyu3/Xs7t/1vO7f9azu3/Ws7t/1rO7f9azu3/XM/t42nS7ilj0e4AAAAAAAAAAAAAAAAAAAAAAAAA
+        AADVt3YA1bd2Cta5e4PTtHHf1LZ1yt3GlnjWuXrZ0bJq/tGxav/RtHT8zrSDocawjay4pI36rJyX/5+U
+        ov+Qiq3/f4C6/252yP9bbNb/SmLi/Ehg5dVRaea5SWHl2EVd5PVEXOT/Rl7k9khg5dFIYOWzRl7kmE5m
+        5oRSauZ2T2fmg0Vd5JZIYOWsSWHl00Ze5PdEXOT/RV3k9Utj5eJNZeXNR1/k5kdg5P9Ob+b/UXzo/1KI
+        6v9Vlev/WKDs/1qr7f9cte3/Xr7t/2HH7f9gze7/XM7t/1rO7f9azu3/W87t/2TR7pKg4fMEhNrxAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAMmiSQDr3coC1LZ0jNS2dPrWuXqg2L2FrNW4e9/PsnT8yK57/7+o
+        hPG6qJa0sqOenZ+Uo/KQiq3/gYG5/3F3xv9gb9P/TmXg/0Rc5P9EXOT/RV3k9khh5dtOZua+UWnmy0pi
+        5dpGXuT2RV3k/kRc5P9EXOT/RF3k/0Rc5P9EXOT/RV3k/EZe5PZLY+XbTWXlyU1m5cRJYeXnRV3k+kRc
+        5P9EXOT/SWTl/09y5/9Rfuj/U4rq/1WV6/9Xn+z/Wqrt/1yz7f9evO3/YcXt/2LM7v9ezu3/Ws7t/17P
+        7eVy1O8tbdPvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1rl7ANe7fzfVt3fb0rJs/dS3
+        eL3TuYN3x6+C2L2nhf+0oY7/qpuZ+aKYqJaWkbGKhYS673N5xf9jcdH/Umje/0Ze5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/Ehg5epMZOXPTWXlzkxl5c5NZeW7T2fmw1Fp5slSa+bEUGjmwU1l5cdMZOXOTWXl1Edf
+        5exEXOT9RFzk/0Rc5P9EXOT/RFzk/0Vd5P9LZ+X/UHXn/1GA6P9Ti+r/VZbr/1if7P9aqe3/W7Lt/166
+        7f9gw+3/Ycrt/2HP7vxp0u6Cm+DzBIfa8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPDm
+        2QA/AAAA1rp9YNGzc/XLsHr8xq+Fi8GuloW0opL4qZqa/52To/+SjK76iIi8o4CGyHdpddDhV2rb/0hg
+        4/9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P5EXOT8Rl7k9klh5fBJYeXsSWHl8EZe
+        5PZEXOT9RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/Rl/k/01r5v9Qd+f/UoHp/1SM
+        6v9Vluv/V5/s/1qo7f9bse3/Xbnt/2DB7f9qy+68gtnxFHzV8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA17+OANzEkQvLsoGawaqC/7umi/G2ppuoq56fz52TpP+Ri63/hIO3/3d7
+        wv9td87HZnncpVNr489FXuT7RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9IYeX/Tm7m/1F55/9Sg+n/VI3r/1WW6/9Xn+z/Wafs/1yw7f9iuu3ab8XvOmK97QCl3PYAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFsI4AyLOQF7unjp+xoJT5qZud96KZ
+        q96VkLDrhYO3/nh8wf9rdcv/Xm7W/1Fo4e5SaubHXHXo4Etj5fFEXOT+RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0pk5f9Pceb/UXvo/1KE6f9Ujev/Vpbr/1qg7PxjrO7SbbjuSUqR
+        6QBkue4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALiq
+        pQC9raIPqp2hn56Vpv2Tja78iIa4+IGEw/RxesvyYnDU+VNp3/5GX+T/RFzk/ktj5fZPaObaTWXl8khg
+        5fxEXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9FXeT/S2jl/1Bz5/9RfOj/UoXp/1eP
+        6/xjn+2ddLLwKGy07wJtse8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAoJesAKWcrRmYk7CSiYe363t+v/9yesn6aXfU7llu3fhJYuP9RFzk/0Rc
+        5P9EXOT/RFzk/khg5ftLY+X7RV3k/0Rc5P1EXeT8RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Zf
+        5P9Na+b/UHXn/1N/6P9bjevVaJvtQFyR6wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLl9gAvJ3YAr6vFBIKEwE1yecfaZnLQ/1pt
+        2v5YcOTxVm7n70Ze5P1FXeT9RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT8RFzk+0Rc5P9GXuT+Rl7k/URc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/SGLl/05u5v9We+jiYYvqTWGg7QJYjOoAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAISM
+        0AAVLc4AcoDVZmFz2exRaOH8Rl7k/0xk5fpLZOXyUGjm7k1l5fFFXeT9RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Vd5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0df5PlRbObIW3voSAAAigB5mewAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAVGbVAHiJ2w5mfeJkWXLmskli5fxFXeT+RFzk/kZf5PxSa+btTmfm80lh
+        5fVGXuT8S2Pl9EZe5PxEXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/SGDl9Exl5eZVbuemYHnoHk9n
+        5gBifegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgu/YAAA7SAGiC6h9jfemPUWvm3kdf
+        5PxFXeT/RV7k/0Vd5P9MZeXyTGTl9VNs5upLY+X4RV3k/0Ze5PtFXeT+SGDl/EVd5P9EXOT/R1/k/kZe
+        5P5FXeT9RV3k/0Rc5P9EXOT/SGDl/kVd5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9GXuT8SmLl7Vdw
+        57JYcedebIbqE2V+6QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AABthusAe5XtBl546C5YceelTGXl+Ehg5fpEXOT/RFzk/0Rc5P9GXuT+R1/l/UZe5P5IYeX7RV3k/U1l
+        5flHX+X+RFzk/01m5vJRaebuSGHl9UVd5P5EXOT/RFzk/0Rd5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Ze
+        5PlJYuX5VW7nt1dw509jfOkV////AJat8gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABuhusAcorrLFpz6H5Yced4T2jmzkZe5P9FXeT+RFzk/0Rc
+        5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc5P9FXeT+RV3k/kRc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Rc
+        5P5EXOT/Rl7k/09n5vZZcufOVm/nbFp05zJQbOYDUWzmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD9j3gAnQ88AOEzjAGaA
+        6jNWb+dmUWnmdkhg5bZHX+TdSWHl8U1l5etIYOX5RFzk/0Rc5P9EXOT/RFzk/0Rc5P9EXOT/RFzk/0Vd
+        5P9HX+T/RV3k+01m5fNVbefbU2zm8U9n5uldduiqaIHqQmJ86QNfeegAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAD///8AAAAAAC5D3gBed+gMV2/nJl126FpXcOeXSmLlq0lh5cRJYeX3TWXl5Exk
+        5btNZuXYTGTl5URc5NpNZubgYXrp1V116JFheunBUWrmsl126IlYcec+XnboDwAAxgCpwfUAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA////wAH///////+AAH///////gAAD//////wAAAB/////8AAAAD/////AAAAAH////4AAAAA
+        H////AAAAAAP///8DAAAAAf///w8AAAAA/////4AAAAB/////gAAAAD//////QAAAH//////gAAAP///
+        ///8AAA///////4AAB/4/////4AAD/j/////wAAP+Px////gAAfwfH////AAB/B4////8AAD8HD////4
+        AAHwcP////wAAeBR/////gAB4IF////+AAHggH////8AAMCAf////wAAwAB/////gAAAAH////+AAAEA
+        f////4AAAAB/////gAAAAH/////AAAEAf////4AAAAB/////gAAAAH////+AAAAAP////4AAAAA/////
+        gACAAD////8AAIAAH////wAAgAAf///+AACAAA////4AAIAAB////AAAwAAD///4AAHAAAH///AAAcAA
+        AP//4AAD4AAAP//AAAPgAAAP/gAAA/AAAADwAAAH8AAAAAAAAAf4AAAAAAAAD/wAAAAAAAAP/gAAAAAA
+        AB/+AAAAAAAAP/8AAAAAAAB//4AAAAAAAH//wAAAAAAB///gAAAAAAH///gAAAAAB///+AAAAAAP///+
+        AAAAAB////8AAAAAP////8AAAAD/////6AAAA//////+AAAP//8=
+</value>
+  </data>
 </root>

+ 19 - 4
HTEXMark/lang.json

@@ -38,7 +38,12 @@
     "paneTitle": "知识点",
     "schoolDropDown": "学校",
     "subjectDropDown": "学科",
-    "pointMsgShow" :"请在知识点标签后添加!"
+    "pointMsgShow": "请在知识点标签后添加!",
+    "termOfService": "服务条款",
+    "privacyPolicy": "隐私权政策",
+    "dataCenter": "站点",
+    "china": "中国大陆",
+    "global": "国际"
   },
   "tw": {
     "single": "選擇題",
@@ -79,7 +84,12 @@
     "paneTitle": "知識點",
     "schoolDropDown": "學校",
     "subjectDropDown": "學科",
-    "pointMsgShow": "請在知識點標簽後添加!"
+    "pointMsgShow": "請在知識點標簽後添加!",
+    "termOfService": "服務條款",
+    "privacyPolicy": "隱私權政策",
+    "dataCenter": "站點",
+    "china": "中國大陸",
+    "global": "國際"
   },
   "en": {
     "single": "MultipleChoice",
@@ -115,11 +125,16 @@
     "item_user": "UserProfile",
     "qrcode": "Login",
     "user": "User",
-    "qrcode_title": "Please use HiTA scan to login...",
+    "qrcode_title": "HiTA scan to login...",
     "unlogin": "Not logged in!",
     "paneTitle": "Knowledge Points",
     "schoolDropDown": "School",
     "subjectDropDown": "Subject",
-    "pointMsgShow": "Please add after the knowledge point label!"
+    "pointMsgShow": "Please add after the knowledge point label!",
+    "termOfService": "Term Of Service",
+    "privacyPolicy": "Privacy Policy",
+    "dataCenter": "Website",
+    "china": "Chinese Mainland",
+    "global": "Global"
   }
 }