kevin 5 mesiacov pred
rodič
commit
8da7fbf760

+ 8 - 0
ExampleCode/ExampleCode/Info.plist

@@ -42,5 +42,13 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
+    <key>UIRequiredDeviceCapabilities</key>
+        <array>
+            <string>armv7</string>
+            <string>video-camera</string>
+            <string>front-facing-camera</string>
+            <string>microphone</string>
+            <string>still-camera</string>
+        </array>
 </dict>
 </plist>

+ 8 - 0
NexilisLite/NexilisLite/Info.plist

@@ -80,5 +80,13 @@
 		<string>fonts/Poppins-SemiBold.ttf</string>
 		<string>fonts/Poppins-SemiBoldItalic.ttf</string>
 	</array>
+    <key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+		<string>video-camera</string>
+		<string>front-facing-camera</string>
+		<string>microphone</string>
+		<string>still-camera</string>
+	</array>
 </dict>
 </plist>

+ 19 - 10
NexilisLite/NexilisLite/Source/View/Call/VideoConferenceViewController.swift

@@ -68,6 +68,7 @@ class VideoConferenceViewController: UIViewController {
     var isAddCall = ""
     var ticketId = ""
     var roomId = ""
+    var isCalled = false
     private var frontCamera = true
     var users: [User] = []
     let poweredByView: UIStackView = {
@@ -159,21 +160,29 @@ class VideoConferenceViewController: UIViewController {
         if fPin != ""{
             getDataProfile(fPin: fPin)
         }
-        
         addZoomView()
         addCameraView()
         addListRemoteView()
         addTimerVC()
         didTapAcceptCallButton()
-        if isInisiator {
-            API.initiateCR(sConfRoom: roomId, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
-            Nexilis.write(message: CoreMessage_TMessageBank.startVCallConference(blog_id: roomId, time: "\(Date().currentTimeMillis())"))
-        }
-        else {
-            API.joinCR(sConfRoom: roomId, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
-            Nexilis.write(message: CoreMessage_TMessageBank.joinVCallConference(blog_id: roomId))
+        print("Room id: \(roomId)")
+        print("is initiatior \(isInisiator)")
+        print(listRemoteViewFix)
+        print(cameraView)
+        print(zoomView)
+        do {
+            if isInisiator && !isCalled {
+                API.initiateCR(sConfRoom: roomId, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
+                Nexilis.write(message: CoreMessage_TMessageBank.startVCallConference(blog_id: roomId, time: "\(Date().currentTimeMillis())"))
+            }
+            else if !isCalled {
+                API.joinCR(sConfRoom: roomId, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
+                Nexilis.write(message: CoreMessage_TMessageBank.joinVCallConference(blog_id: roomId))
+            }
+            isCalled = true
+        } catch {
+            print(error)
         }
-        
 //        API.initiateCCall(sParty: dataPerson[0]["f_pin"]!, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
 //        addBackgroundIncoming()
 //        addProfileNameCalling()
@@ -273,7 +282,7 @@ class VideoConferenceViewController: UIViewController {
             zoomView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             zoomView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
         ])
-        zoomView.backgroundColor = .secondaryColor
+        zoomView.backgroundColor = .black
         zoomView.isUserInteractionEnabled = true
         zoomView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(hideToolbar)))
     }

+ 1 - 1
NexilisLite/NexilisLite/Source/View/Streaming/CreateSeminarViewController.swift

@@ -242,7 +242,7 @@ public class CreateSeminarViewController: UITableViewController {
                     return
                 }
                 
-                let id = "CR\(Date().currentTimeMillis().toHex())"
+                let id = User.getMyPin()! +  CoreMessage_TMessageUtil.getTID()
                 
                 data["title"] = conferenceTitle
 //         TODO:        data["start"]