change URL

jhchoi57 · Dec 20, 2020 · 9c41acd · 9c41acd
1 parent 35500a2
commit 9c41acd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/program/program/Controller/MainController.cs b/program/program/Controller/MainController.cs
@@ -20,7 +20,7 @@ namespace program.Controller
 {
     public class MainController
     {
-        private string URL = "http://test.inchang.dev:9000";
+        private string URL = "https://test.inchang.dev:9000";
         private Stack<Form> formNavigator;
         private Form nowForm { get; set; }
         public Form NowForm

diff --git a/program/program/Controller/ProcessController.cs b/program/program/Controller/ProcessController.cs
@@ -30,14 +30,15 @@ public void GetProcess()
                 allProc = Process.GetProcesses();    //시스템의 모든 프로세스 정보 출력
                 int i = 1;
 
-                Console.WriteLine("****** 모든 프로세스 정보 ******");
-                Console.WriteLine("현재 실행중은 모든 프로세스 수 : {0}", allProc.Length);
-
+                //Console.WriteLine("****** 모든 프로세스 정보 ******");
+                //Console.WriteLine("현재 실행중은 모든 프로세스 수 : {0}", allProc.Length);
+                /*
                 foreach (Process p in allProc) {
                     //Console.WriteLine("***** {0}번째 프로세스 ******", i++);
                     //WriteProcessInfo(p);
                     //Console.WriteLine();
                 }
+                */
             }
 
             catch (Exception e) {
@@ -70,7 +71,7 @@ private void time_tick_1(object sender, EventArgs e)
                     {
                         if (processInfo.ProcessName == "chrome")
                         {
-                            mainController.examLog("Process", processInfo.ProcessName, now, room_id);
+                            //mainController.examLog("Process", processInfo.ProcessName, now, room_id);
                         }
                     }
                 }

diff --git a/program/program/View/Components/StudentWebRTCPanel.cs b/program/program/View/Components/StudentWebRTCPanel.cs
@@ -89,7 +89,7 @@ private void initwebrtc()
             CefSettings settings = new CefSettings();
             settings.CefCommandLineArgs.Add("enable-media-stream", "1");
             if (!Cef.IsInitialized) Cef.Initialize(settings);
-            browser = new ChromiumWebBrowser("https://webrtc.inchang.dev:10001/?mode=receiver&autoStart=true&userId=" + student_id + "&roomId=" + room_id);
+            browser = new ChromiumWebBrowser("https://test.inchang.dev:10001/?mode=receiver&autoStart=true&userId=" + student_id + "&roomId=" + room_id);
             browser.Dock = DockStyle.Fill;
             this.webrtcPanel.Controls.Add(browser);
         }

diff --git a/program/program/View/ExamView.cs b/program/program/View/ExamView.cs
@@ -88,7 +88,7 @@ public ExamView(MainController mainController, string room_id, string student_id
             if (isStudent)
             {
                 // 프로그램 화면 크기 모니터 해상도에 맞춤
-                this.WindowState = FormWindowState.Maximized;
+                //this.WindowState = FormWindowState.Maximized;
             }
         }
 
@@ -157,8 +157,8 @@ private void ExamView_Load1(object sender, EventArgs e)
 
                 this.BackColor = Color.DarkGray;
                 // 프로그램 중앙에 메인패널 위치
-                this.mainPanel.BackColor = Color.WhiteSmoke;
-                this.mainPanel.Location = new System.Drawing.Point((this.Width - this.mainPanel.Width) / 2, (this.Height - this.mainPanel.Height) / 2);
+                //this.mainPanel.BackColor = Color.WhiteSmoke;
+                //this.mainPanel.Location = new System.Drawing.Point((this.Width - this.mainPanel.Width) / 2, (this.Height - this.mainPanel.Height) / 2);
 
                 exitButton.Visible = false;
                 minimizeButton.Visible = false;
@@ -269,9 +269,10 @@ private void initwebrtc()
             CefSettings settings = new CefSettings();
             settings.CefCommandLineArgs.Add("enable-media-stream", "1");
             if(!Cef.IsInitialized) Cef.Initialize(settings);
-            browser = new ChromiumWebBrowser("https://webrtc.inchang.dev:10001/?mode=sender&autoStart=true&userId=" + mainController.Me.ID + "&roomId=" + this.room_id);
+            browser = new ChromiumWebBrowser("https://test.inchang.dev:10001/?mode=sender&autoStart=true&userId=" + mainController.Me.ID + "&roomId=" + this.room_id);
             browser.Dock = DockStyle.Fill;
             this.webrtcPanel.Controls.Add(browser);
+            this.webrtcPanel.BringToFront();
         }
 
         private void connectWebsocket()
@@ -523,7 +524,7 @@ private void timer_Tick_1(object sender, EventArgs e)
 
                 if (keyboard.Count > 0)
                 {
-                    keyboardLog();
+                    //keyboardLog();
                 }
 
                 double diffTotalSeconds = (examDate - date).TotalSeconds;

diff --git a/program/program/View/StudentLectureEditView.cs b/program/program/View/StudentLectureEditView.cs
@@ -192,6 +192,7 @@ private void homePictureBox_Click(object sender, EventArgs e)
 
         private void lectureTable_CellClick(object sender, DataGridViewCellEventArgs e)
         {
+            if (e.RowIndex < 0) return;
             //MessageBox.Show(lectureTable.Rows[e.RowIndex].Cells[0].Value.ToString());
             if(lectureTable.Rows[e.RowIndex].Cells[0].Value.ToString().Equals("False"))
                 lectureTable.Rows[e.RowIndex].Cells[0].Value = true;
@@ -201,6 +202,7 @@ private void lectureTable_CellClick(object sender, DataGridViewCellEventArgs e)
 
         private void myLectureTable_CellClick(object sender, DataGridViewCellEventArgs e)
         {
+            if (e.RowIndex < 0) return;
             if (myLectureTable.Rows[e.RowIndex].Cells[0].Value.ToString().Equals("False"))
                 myLectureTable.Rows[e.RowIndex].Cells[0].Value = true;
             else