Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/doctor_app_flutter!151

ios/Runner/AppDelegate.swift

@@ -42,7 +42,9 @@ import OpenTok
                  let tokenID = arguments!["TokenID"] as? String
                  let generalId = arguments!["generalId"] as? String
                  let doctorId = arguments!["DoctorId"] as? Int
-                self.openVideoChat(result: result,kApiKey: kApiKey!,kSessionId:kSessionId!,kToken: kToken!, appLang: appLang!, vC_ID: vC_ID!,tokenID: tokenID!,generalId: generalId!,doctorId: doctorId!)
+                let baseUrl = arguments!["baseUrl"] as? String
+
+                self.openVideoChat(result: result,kApiKey: kApiKey!,kSessionId:kSessionId!,kToken: kToken!, appLang: appLang!, vC_ID: vC_ID!,tokenID: tokenID!,generalId: generalId!,doctorId: doctorId!, baseUrl: baseUrl!)
             }
             default:
             result(FlutterMethodNotImplemented)
@@ -56,7 +58,7 @@ import OpenTok
 
     
     
-    private func openVideoChat(result: FlutterResult,kApiKey: String, kSessionId: String,kToken: String,appLang:String, vC_ID: Int,tokenID:String,generalId:String,doctorId:Int) {
+    private func openVideoChat(result: FlutterResult,kApiKey: String, kSessionId: String,kToken: String,appLang:String, vC_ID: Int,tokenID:String,generalId:String,doctorId:Int,baseUrl:String) {
            
                let storyboard = UIStoryboard(name: "Main", bundle: nil)
                           let identifier = "ViewControllerNav"
@@ -69,7 +71,7 @@ import OpenTok
                           videoVC.generalid = generalId
                           videoVC.TokenID = tokenID
                           videoVC.DoctorId = doctorId
-        
+                          videoVC.baseUrl = baseUrl
                           videoVC.callBack = self
                           videoVC.navigationController?.setNavigationBarHidden(true, animated: false)
                           navVC.modalPresentationStyle = .fullScreen

ios/Runner/VideoViewController.swift

@@ -27,6 +27,7 @@ class ViewController: UIViewController {
     var TokenID: String = ""
     var generalid : String = ""
     var DoctorId: Int = 0
+    var baseUrl:String = ""
     
     var callBack: ICallProtocol?
     var timer = Timer()
@@ -47,7 +48,7 @@ class ViewController: UIViewController {
     
     
     private func getSessionStatus() {
-            let URL_USER_REGISTER = "https://uat.hmgwebservices.com/LiveCareApi/DoctorApp/GetSessionStatus"
+            let URL_USER_REGISTER = baseUrl+"LiveCareApi/DoctorApp/GetSessionStatus"
             let headers: HTTPHeaders = [
                 "Content-Type":"application/json",
                 "Accept":"application/json",