Browse Source

1.0.2 版本 互动的直播间号和开始直播的直播间号,从网页获取,不再是1.

ZhangXueYang
zhangxueyang 3 years ago
parent
commit
4de4003030

+ 2
- 2
XHZB.Desktop/App.config View File

@@ -9,8 +9,8 @@
9 9
     <!--是否输出信息日志0否-->
10 10
     <add key="OutputVideoLog" value="0" />
11 11
     <!--版本号-->
12
-    <add key="VersionCode" value="1" />
13
-    <add key="VersionName" value="1.0.1" />
12
+    <add key="VersionCode" value="2" />
13
+    <add key="VersionName" value="1.0.2" />
14 14
     <!--图片压缩质量 0最差 100最佳-->
15 15
     <add key="ImageCompressionLevel" value="100" />
16 16
     <add key="userName" value="" />

+ 2
- 2
XHZB.Desktop/App.cs View File

@@ -37,7 +37,7 @@ namespace XHZB.Desktop
37 37
         /// <summary>
38 38
         /// 课堂节次
39 39
         /// </summary>
40
-        public static string ClassroomAdd = null;
40
+        public static int ClassroomAdd = 1;
41 41
         /// <summary>
42 42
         /// 接口地址
43 43
         /// </summary>
@@ -301,7 +301,7 @@ namespace XHZB.Desktop
301 301
                         }
302 302
                         if (str.Contains("rid"))
303 303
                         {
304
-                            ClassroomAdd = str.Substring(str.LastIndexOf("=") + 1);
304
+                            ClassroomAdd = Convert.ToInt32(str.Substring(str.LastIndexOf("=") + 1));
305 305
                             LogHelper.WriteInfoLog("课堂=" + ClassroomAdd);
306 306
                         }
307 307
                     }

+ 2
- 2
XHZB.Desktop/Properties/AssemblyInfo.cs View File

@@ -51,5 +51,5 @@ using System.Windows;
51 51
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
52 52
 //通过使用 "*",如下所示:
53 53
 // [assembly: AssemblyVersion("1.0.*")]
54
-[assembly: AssemblyVersion("1.0.1.0")]
55
-[assembly: AssemblyFileVersion("1.0.1.0")]
54
+[assembly: AssemblyVersion("1.0.2.0")]
55
+[assembly: AssemblyFileVersion("1.0.2.0")]

+ 1
- 1
XHZB.Desktop/ToolbarWindow.xaml.cs View File

@@ -835,7 +835,7 @@ namespace XHZB.Desktop
835 835
                 WSocketClient.getInstance().SendMessage(SocketMsgManger.GetIntoMsg());
836 836
 
837 837
 
838
-                NodeKey = "live/1";
838
+                NodeKey = "live/"+APP.ClassroomAdd.ToString();
839 839
                 System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
840 840
                 //开始直播
841 841
                 if(APP.FFmpeg.StartLiveRecordingVideo(APP.RTMPServerPath, NodeKey, DesktopSize,out ErrMessage))

+ 8
- 8
XHZB.Desktop/WebSocket/SocketMsgManger.cs View File

@@ -15,7 +15,7 @@ namespace XHZB.Desktop.WebSocket
15 15
             SocketModel msg = new SocketModel
16 16
             {
17 17
                 c = 1001,
18
-                rid = 1,
18
+                rid = APP.ClassroomAdd,
19 19
                 d = "pc",
20 20
                 u = 1,
21 21
                 s=1,
@@ -41,7 +41,7 @@ namespace XHZB.Desktop.WebSocket
41 41
             SocketModel msg = new SocketModel
42 42
             {
43 43
                 c = 2001,
44
-                rid = 1,
44
+                rid = APP.ClassroomAdd,
45 45
                 d = "pc",
46 46
                 u = 1,
47 47
                 s = 1,
@@ -67,7 +67,7 @@ namespace XHZB.Desktop.WebSocket
67 67
             SocketModel msg = new SocketModel
68 68
             {
69 69
                 c = 1002,
70
-                rid = 1,
70
+                rid = APP.ClassroomAdd,
71 71
                 d = "pc",
72 72
                 u = 1,
73 73
                 s = 1,
@@ -86,7 +86,7 @@ namespace XHZB.Desktop.WebSocket
86 86
             SocketModel msg = new SocketModel
87 87
             {
88 88
                 c = 1021,
89
-                rid = 1,
89
+                rid = APP.ClassroomAdd,
90 90
                 d = "pc",
91 91
                 u = 1,
92 92
                 s = 1,
@@ -105,7 +105,7 @@ namespace XHZB.Desktop.WebSocket
105 105
             SocketModel msg = new SocketModel
106 106
             {
107 107
                 c = 1022,
108
-                rid = 1,
108
+                rid = APP.ClassroomAdd,
109 109
                 d = "pc",
110 110
                 u = 1,
111 111
                 s = 1,
@@ -124,7 +124,7 @@ namespace XHZB.Desktop.WebSocket
124 124
             SocketModel msg = new SocketModel
125 125
             {
126 126
                 c = 1031,
127
-                rid = 1,
127
+                rid = APP.ClassroomAdd,
128 128
                 d = "pc",
129 129
                 u = 1,
130 130
                 s = 1,
@@ -144,7 +144,7 @@ namespace XHZB.Desktop.WebSocket
144 144
             SocketModel msg = new SocketModel
145 145
             {
146 146
                 c = 1032,
147
-                rid = 1,
147
+                rid = APP.ClassroomAdd,
148 148
                 d = "pc",
149 149
                 u = 1,
150 150
                 s = 1,
@@ -163,7 +163,7 @@ namespace XHZB.Desktop.WebSocket
163 163
             SocketModel msg = new SocketModel
164 164
             {
165 165
                 c = 1040,
166
-                rid = 1,
166
+                rid = APP.ClassroomAdd,
167 167
                 d = "pc",
168 168
                 u = 1,
169 169
                 s = 1,

Loading…
Cancel
Save