Browse Source

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

ZhangXueYang
zhangxueyang 3 years ago
parent
commit
4de4003030

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

9
     <!--是否输出信息日志0否-->
9
     <!--是否输出信息日志0否-->
10
     <add key="OutputVideoLog" value="0" />
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
     <!--图片压缩质量 0最差 100最佳-->
14
     <!--图片压缩质量 0最差 100最佳-->
15
     <add key="ImageCompressionLevel" value="100" />
15
     <add key="ImageCompressionLevel" value="100" />
16
     <add key="userName" value="" />
16
     <add key="userName" value="" />

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

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

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

51
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
51
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
52
 //通过使用 "*",如下所示:
52
 //通过使用 "*",如下所示:
53
 // [assembly: AssemblyVersion("1.0.*")]
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
                 WSocketClient.getInstance().SendMessage(SocketMsgManger.GetIntoMsg());
835
                 WSocketClient.getInstance().SendMessage(SocketMsgManger.GetIntoMsg());
836
 
836
 
837
 
837
 
838
-                NodeKey = "live/1";
838
+                NodeKey = "live/"+APP.ClassroomAdd.ToString();
839
                 System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
839
                 System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
840
                 //开始直播
840
                 //开始直播
841
                 if(APP.FFmpeg.StartLiveRecordingVideo(APP.RTMPServerPath, NodeKey, DesktopSize,out ErrMessage))
841
                 if(APP.FFmpeg.StartLiveRecordingVideo(APP.RTMPServerPath, NodeKey, DesktopSize,out ErrMessage))

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

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

Loading…
Cancel
Save