Merge pull request #47 from jimmyeao/dev

Dev
jimmyeao · Mar 26, 2024 · 20fff21 · 20fff21
2 parents 12c7b6d + a2f59a6
commit 20fff21
Show file tree

Hide file tree

Showing 15 changed files with 1,305 additions and 1,126 deletions.
diff --git a/API/Device.cs b/API/Device.cs
diff --git a/API/MeetingState.cs b/API/MeetingState.cs
@@ -10,16 +10,16 @@ public class MeetingPermissions
     {
         #region Public Properties
 
-        public bool CanToggleMute { get; set; }
-        public bool CanToggleVideo { get; set; }
-        public bool CanToggleHand { get; set; }
-        public bool CanToggleBlur { get; set; }
         public bool CanLeave { get; set; }
+        public bool CanPair { get; set; }
         public bool CanReact { get; set; }
-        public bool CanToggleShareTray { get; set; }
-        public bool CanToggleChat { get; set; }
         public bool CanStopSharing { get; set; }
-        public bool CanPair { get; set; }
+        public bool CanToggleBlur { get; set; }
+        public bool CanToggleChat { get; set; }
+        public bool CanToggleHand { get; set; }
+        public bool CanToggleMute { get; set; }
+        public bool CanToggleShareTray { get; set; }
+        public bool CanToggleVideo { get; set; }
 
         #endregion Public Properties
     }
@@ -28,14 +28,15 @@ public class MeetingState
     {
         #region Public Properties
 
-        public bool IsMuted { get; set; }
-        public bool IsVideoOn { get; set; }
+        public bool HasUnreadMessages { get; set; }
+        public bool IsBackgroundBlurred { get; set; }
         public bool IsHandRaised { get; set; }
         public bool IsInMeeting { get; set; }
+        public bool IsMuted { get; set; }
         public bool IsRecordingOn { get; set; }
-        public bool IsBackgroundBlurred { get; set; }
         public bool IsSharing { get; set; }
-        public bool HasUnreadMessages { get; set; }
+        public bool IsVideoOn { get; set; }
+        public bool teamsRunning { get; set; }
 
         #endregion Public Properties
     }
@@ -49,4 +50,4 @@ public class MeetingUpdate
 
         #endregion Public Properties
     }
-}
+}
diff --git a/API/MqttClientWrapper.cs b/API/MqttClientWrapper.cs