From 50c4e64b5b8f6a3e2e990c62119a5db10480b9cd Mon Sep 17 00:00:00 2001
From: lxmou666 <772765102@qq.com>
Date: Tue, 2 Mar 2021 15:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20=20=20?=
=?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ClientDemo/App.xaml.cs | 1 -
JianGongYun/App.config | 12 ------------
JianGongYun/App.json | 8 ++++++++
JianGongYun/App.xaml.cs | 10 ++++++++--
JianGongYun/JianGongYun.csproj | 3 ++-
JianGongYun/TRTC/LiveClassroom.cs | 11 +++++------
.../TRTC/ViewModels/SettingWindowViewModel.cs | 4 ++--
JianGongYun/Views/Login.xaml.cs | 3 +--
8 files changed, 26 insertions(+), 26 deletions(-)
delete mode 100644 JianGongYun/App.config
create mode 100644 JianGongYun/App.json
diff --git a/ClientDemo/App.xaml.cs b/ClientDemo/App.xaml.cs
index 5fd2fa4..6d9fedb 100644
--- a/ClientDemo/App.xaml.cs
+++ b/ClientDemo/App.xaml.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
diff --git a/JianGongYun/App.config b/JianGongYun/App.config
deleted file mode 100644
index 63e1132..0000000
--- a/JianGongYun/App.config
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/JianGongYun/App.json b/JianGongYun/App.json
new file mode 100644
index 0000000..ce548cc
--- /dev/null
+++ b/JianGongYun/App.json
@@ -0,0 +1,8 @@
+{
+ "sDKAppID": "1400472092",
+ "sDKAppKEY": "75907eef24093acc1d2cc20ed1eb95c50cd6728c8f5e0d98b17c5180824eee78",
+ "lIVEAppID": "1302772646",
+ "lIVEBizid": "110962",
+ "wSUrl": "wss://web.cqjgjyw.cn/websocket",
+ "paramTip": "Startup Parameter Null"
+}
\ No newline at end of file
diff --git a/JianGongYun/App.xaml.cs b/JianGongYun/App.xaml.cs
index cf97065..5fad5d3 100644
--- a/JianGongYun/App.xaml.cs
+++ b/JianGongYun/App.xaml.cs
@@ -1,6 +1,6 @@
-using System;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
@@ -28,5 +28,11 @@ namespace JianGongYun
return bitmapImage;
}
}
+ private static JObject config = JObject.Parse(System.IO.File.ReadAllText(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "App.json")));
+
+ public static T GetConfig(string key)
+ {
+ return config[key].ToObject();
+ }
}
}
diff --git a/JianGongYun/JianGongYun.csproj b/JianGongYun/JianGongYun.csproj
index 4cace9b..9333d6d 100644
--- a/JianGongYun/JianGongYun.csproj
+++ b/JianGongYun/JianGongYun.csproj
@@ -29,7 +29,7 @@
-
+
Always
@@ -60,4 +60,5 @@
+
diff --git a/JianGongYun/TRTC/LiveClassroom.cs b/JianGongYun/TRTC/LiveClassroom.cs
index dbfbf3a..38be140 100644
--- a/JianGongYun/TRTC/LiveClassroom.cs
+++ b/JianGongYun/TRTC/LiveClassroom.cs
@@ -20,7 +20,6 @@ using System.Drawing;
using System.Diagnostics;
using System.Runtime.InteropServices;
using AduSkin.Controls.Metro;
-using System.Configuration;
using Websocket.Client;
using System.Windows.Threading;
using Newtonsoft.Json.Linq;
@@ -36,11 +35,11 @@ namespace JianGongYun.TRTC
//const string SDKAppKEY = "6ee2586282eb8ab5bff3f917b44500c4ffd9bbd3d820258b1fa8cdd470cfd1ee";
//const uint LIVEAppID = 1252883401;
//const uint LIVEBizid = 126866;
- static uint SDKAppID { get { return uint.Parse(ConfigurationManager.AppSettings[nameof(SDKAppID)]); } }
- static string SDKAppKEY { get { return ConfigurationManager.AppSettings[nameof(SDKAppKEY)]; } }
- static uint LIVEAppID { get { return uint.Parse(ConfigurationManager.AppSettings[nameof(LIVEAppID)]); } }
- static uint LIVEBizid { get { return uint.Parse(ConfigurationManager.AppSettings[nameof(LIVEBizid)]); } }
- static string WSUrl { get { return ConfigurationManager.AppSettings[nameof(WSUrl)]; } }
+ static uint SDKAppID { get { return App.GetConfig("sDKAppID"); } }
+ static string SDKAppKEY { get { return App.GetConfig("sDKAppKEY"); } }
+ static uint LIVEAppID { get { return App.GetConfig("lIVEAppID"); } }
+ static uint LIVEBizid { get { return App.GetConfig("lIVEBizid"); } }
+ static string WSUrl { get { return App.GetConfig("wSUrl"); } }
///
/// TRTC实例
diff --git a/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs b/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs
index 914b988..b772393 100644
--- a/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs
+++ b/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs
@@ -195,7 +195,7 @@ namespace JianGongYun.TRTC.ViewModels
{
get
{
- if (AudioSource == "2"||AudioSource=="3")
+ if (AudioSource == "2" || AudioSource == "3")
{
_ShowSytemGatherSlider = Visibility.Visible;
}
@@ -916,7 +916,7 @@ namespace JianGongYun.TRTC.ViewModels
#region 配置持久化
//配置文件路径
- private string sPath = ".\\TRTCConfig.ini";
+ private string sPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "TRTCConfig.ini");
//根节点
private const string INI_ROOT_KEY = "TRTCLOCALCONFIG";
//设备
diff --git a/JianGongYun/Views/Login.xaml.cs b/JianGongYun/Views/Login.xaml.cs
index 6f910fb..03addf0 100644
--- a/JianGongYun/Views/Login.xaml.cs
+++ b/JianGongYun/Views/Login.xaml.cs
@@ -3,7 +3,6 @@ using AduSkin.Controls.Metro;
using JianGongYun.TRTC;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Text;
using System.Windows;
using System.Windows.Controls;
@@ -28,7 +27,7 @@ namespace JianGongYun.Views
const string TEACHER_ID = "--teacherid";
const string TEACHER_NAME = "--teachername";
const string END_TIME = "endtime";
- static string ParamTip { get { return ConfigurationManager.AppSettings[nameof(ParamTip)]; } }
+ static string ParamTip { get { return App.GetConfig("paramTip"); } }
public Login()
{
InitializeComponent();