From ad74ff00dc6e1f775810c5596ad8bb9b36fd37d2 Mon Sep 17 00:00:00 2001
From: Mohammad Aljammal <Mohammad.Al-Jammal@cloudsolutions.com.sa>
Date: Tue, 1 Jun 2021 15:49:51 +0300
Subject: [PATCH] fix issues in android and add ChangeCallStatus services in
 IOS

---
 android/app/build.gradle                      |   2 +-
 android/app/src/main/AndroidManifest.xml      |   4 +
 .../com/hmg/hmgDr/ui/VideoCallActivity.java   |  12 +-
 ios/Podfile                                   |   2 +-
 ios/Podfile.lock                              | 331 ------------------
 ios/Runner/VideoViewController.swift          |  35 +-
 lib/client/base_app_client.dart               |  12 +-
 lib/config/config.dart                        |   4 +-
 lib/screens/qr_reader/QR_reader_screen.dart   |   6 +-
 pubspec.lock                                  |  12 +-
 pubspec.yaml                                  |   2 +-
 11 files changed, 63 insertions(+), 359 deletions(-)
 delete mode 100644 ios/Podfile.lock

diff --git a/android/app/build.gradle b/android/app/build.gradle
index fd6c7720..b7605ad0 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 
     //openTok
-    implementation 'com.opentok.android:opentok-android-sdk:2.16.5'
+    implementation 'com.opentok.android:opentok-android-sdk:2.20.1'
     //permissions
     implementation 'pub.devrel:easypermissions:0.4.0'
     //retrofit
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 57a59745..c656ebbf 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.hmg.hmgDr">
     <!--
          io.flutter.app.FlutterApplication is an android.app.Application that
@@ -11,6 +12,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:icon="@mipmap/ic_launcher"
diff --git a/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java b/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java
index e196e7f1..1c907089 100644
--- a/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java
+++ b/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java
@@ -228,11 +228,15 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
     @AfterPermissionGranted(RC_VIDEO_APP_PERM)
     private void requestPermissions() {
-        String[] perms = {Manifest.permission.INTERNET, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO};
+        String[] perms = {Manifest.permission.INTERNET, Manifest.permission.CAMERA,};
         if (EasyPermissions.hasPermissions(this, perms)) {
-            mSession = new Session.Builder(VideoCallActivity.this, apiKey, sessionId).build();
-            mSession.setSessionListener(this);
-            mSession.connect(token);
+            try {
+                mSession = new Session.Builder(this, apiKey, sessionId).build();
+                mSession.setSessionListener(this);
+                mSession.connect(token);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         } else {
             EasyPermissions.requestPermissions(this, getString(R.string.remaining_ar), RC_VIDEO_APP_PERM, perms);
         }
diff --git a/ios/Podfile b/ios/Podfile
index bebf8f5b..fb41b1b2 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+ platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
deleted file mode 100644
index 59cdf14c..00000000
--- a/ios/Podfile.lock
+++ /dev/null
@@ -1,331 +0,0 @@
-PODS:
-  - Alamofire (4.9.1)
-  - barcode_scan (0.0.1):
-    - Flutter
-    - MTBBarcodeScanner
-    - SwiftProtobuf
-  - connectivity (0.0.1):
-    - Flutter
-    - Reachability
-  - connectivity_for_web (0.1.0):
-    - Flutter
-  - connectivity_macos (0.0.1):
-    - Flutter
-  - device_info (0.0.1):
-    - Flutter
-  - Firebase/CoreOnly (6.33.0):
-    - FirebaseCore (= 6.10.3)
-  - Firebase/Messaging (6.33.0):
-    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 4.7.0)
-  - firebase_core (0.5.3):
-    - Firebase/CoreOnly (~> 6.33.0)
-    - Flutter
-  - firebase_core_web (0.1.0):
-    - Flutter
-  - firebase_messaging (7.0.3):
-    - Firebase/CoreOnly (~> 6.33.0)
-    - Firebase/Messaging (~> 6.33.0)
-    - firebase_core
-    - Flutter
-  - FirebaseCore (6.10.3):
-    - FirebaseCoreDiagnostics (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-  - FirebaseCoreDiagnostics (1.7.0):
-    - GoogleDataTransport (~> 7.4)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-    - nanopb (~> 1.30906.0)
-  - FirebaseInstallations (1.7.0):
-    - FirebaseCore (~> 6.10)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (4.8.0):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstallations (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-  - FirebaseMessaging (4.7.1):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstanceID (~> 4.7)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Reachability (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-    - Protobuf (>= 3.9.2, ~> 3.9)
-  - Flutter (1.0.0)
-  - flutter_flexible_toast (0.0.1):
-    - Flutter
-  - flutter_inappwebview (0.0.1):
-    - Flutter
-  - flutter_plugin_android_lifecycle (0.0.1):
-    - Flutter
-  - GoogleDataTransport (7.5.1):
-    - nanopb (~> 1.30906.0)
-  - GoogleUtilities/AppDelegateSwizzler (6.7.2):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.7.2):
-    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (6.7.2):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/Network (6.7.2):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.7.2)"
-  - GoogleUtilities/Reachability (6.7.2):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.7.2):
-    - GoogleUtilities/Logger
-  - hexcolor (0.0.1):
-    - Flutter
-  - imei_plugin (0.0.1):
-    - Flutter
-  - local_auth (0.0.1):
-    - Flutter
-  - maps_launcher (0.0.1):
-    - Flutter
-  - MTBBarcodeScanner (5.0.11)
-  - nanopb (1.30906.0):
-    - nanopb/decode (= 1.30906.0)
-    - nanopb/encode (= 1.30906.0)
-  - nanopb/decode (1.30906.0)
-  - nanopb/encode (1.30906.0)
-  - OpenTok (2.15.3)
-  - path_provider_linux (0.0.1):
-    - Flutter
-  - path_provider_windows (0.0.1):
-    - Flutter
-  - "permission_handler (5.1.0+2)":
-    - Flutter
-  - PromisesObjC (1.2.11)
-  - Protobuf (3.13.0)
-  - Reachability (3.2)
-  - screen (0.0.1):
-    - Flutter
-  - shared_preferences (0.0.1):
-    - Flutter
-  - shared_preferences_linux (0.0.1):
-    - Flutter
-  - shared_preferences_macos (0.0.1):
-    - Flutter
-  - shared_preferences_web (0.0.1):
-    - Flutter
-  - shared_preferences_windows (0.0.1):
-    - Flutter
-  - speech_to_text (0.0.1):
-    - Flutter
-    - Try
-  - SwiftProtobuf (1.9.0)
-  - Try (2.1.1)
-  - url_launcher (0.0.1):
-    - Flutter
-  - url_launcher_linux (0.0.1):
-    - Flutter
-  - url_launcher_macos (0.0.1):
-    - Flutter
-  - url_launcher_web (0.0.1):
-    - Flutter
-  - url_launcher_windows (0.0.1):
-    - Flutter
-  - video_player (0.0.1):
-    - Flutter
-  - video_player_web (0.0.1):
-    - Flutter
-  - wakelock (0.0.1):
-    - Flutter
-  - webview_flutter (0.0.1):
-    - Flutter
-
-DEPENDENCIES:
-  - Alamofire
-  - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
-  - connectivity (from `.symlinks/plugins/connectivity/ios`)
-  - connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
-  - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
-  - device_info (from `.symlinks/plugins/device_info/ios`)
-  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
-  - firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`)
-  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
-  - Flutter (from `Flutter`)
-  - flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`)
-  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
-  - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
-  - hexcolor (from `.symlinks/plugins/hexcolor/ios`)
-  - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`)
-  - local_auth (from `.symlinks/plugins/local_auth/ios`)
-  - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
-  - OpenTok
-  - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
-  - path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
-  - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
-  - screen (from `.symlinks/plugins/screen/ios`)
-  - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
-  - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
-  - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
-  - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
-  - shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`)
-  - speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
-  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
-  - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
-  - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
-  - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
-  - url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)
-  - video_player (from `.symlinks/plugins/video_player/ios`)
-  - video_player_web (from `.symlinks/plugins/video_player_web/ios`)
-  - wakelock (from `.symlinks/plugins/wakelock/ios`)
-  - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
-
-SPEC REPOS:
-  trunk:
-    - Alamofire
-    - Firebase
-    - FirebaseCore
-    - FirebaseCoreDiagnostics
-    - FirebaseInstallations
-    - FirebaseInstanceID
-    - FirebaseMessaging
-    - GoogleDataTransport
-    - GoogleUtilities
-    - MTBBarcodeScanner
-    - nanopb
-    - OpenTok
-    - PromisesObjC
-    - Protobuf
-    - Reachability
-    - SwiftProtobuf
-    - Try
-
-EXTERNAL SOURCES:
-  barcode_scan:
-    :path: ".symlinks/plugins/barcode_scan/ios"
-  connectivity:
-    :path: ".symlinks/plugins/connectivity/ios"
-  connectivity_for_web:
-    :path: ".symlinks/plugins/connectivity_for_web/ios"
-  connectivity_macos:
-    :path: ".symlinks/plugins/connectivity_macos/ios"
-  device_info:
-    :path: ".symlinks/plugins/device_info/ios"
-  firebase_core:
-    :path: ".symlinks/plugins/firebase_core/ios"
-  firebase_core_web:
-    :path: ".symlinks/plugins/firebase_core_web/ios"
-  firebase_messaging:
-    :path: ".symlinks/plugins/firebase_messaging/ios"
-  Flutter:
-    :path: Flutter
-  flutter_flexible_toast:
-    :path: ".symlinks/plugins/flutter_flexible_toast/ios"
-  flutter_inappwebview:
-    :path: ".symlinks/plugins/flutter_inappwebview/ios"
-  flutter_plugin_android_lifecycle:
-    :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
-  hexcolor:
-    :path: ".symlinks/plugins/hexcolor/ios"
-  imei_plugin:
-    :path: ".symlinks/plugins/imei_plugin/ios"
-  local_auth:
-    :path: ".symlinks/plugins/local_auth/ios"
-  maps_launcher:
-    :path: ".symlinks/plugins/maps_launcher/ios"
-  path_provider_linux:
-    :path: ".symlinks/plugins/path_provider_linux/ios"
-  path_provider_windows:
-    :path: ".symlinks/plugins/path_provider_windows/ios"
-  permission_handler:
-    :path: ".symlinks/plugins/permission_handler/ios"
-  screen:
-    :path: ".symlinks/plugins/screen/ios"
-  shared_preferences:
-    :path: ".symlinks/plugins/shared_preferences/ios"
-  shared_preferences_linux:
-    :path: ".symlinks/plugins/shared_preferences_linux/ios"
-  shared_preferences_macos:
-    :path: ".symlinks/plugins/shared_preferences_macos/ios"
-  shared_preferences_web:
-    :path: ".symlinks/plugins/shared_preferences_web/ios"
-  shared_preferences_windows:
-    :path: ".symlinks/plugins/shared_preferences_windows/ios"
-  speech_to_text:
-    :path: ".symlinks/plugins/speech_to_text/ios"
-  url_launcher:
-    :path: ".symlinks/plugins/url_launcher/ios"
-  url_launcher_linux:
-    :path: ".symlinks/plugins/url_launcher_linux/ios"
-  url_launcher_macos:
-    :path: ".symlinks/plugins/url_launcher_macos/ios"
-  url_launcher_web:
-    :path: ".symlinks/plugins/url_launcher_web/ios"
-  url_launcher_windows:
-    :path: ".symlinks/plugins/url_launcher_windows/ios"
-  video_player:
-    :path: ".symlinks/plugins/video_player/ios"
-  video_player_web:
-    :path: ".symlinks/plugins/video_player_web/ios"
-  wakelock:
-    :path: ".symlinks/plugins/wakelock/ios"
-  webview_flutter:
-    :path: ".symlinks/plugins/webview_flutter/ios"
-
-SPEC CHECKSUMS:
-  Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
-  barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
-  connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
-  connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
-  connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
-  device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
-  Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
-  firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
-  firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
-  firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
-  FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
-  FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
-  FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
-  FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
-  FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143
-  flutter_inappwebview: 69dfbac46157b336ffbec19ca6dfd4638c7bf189
-  flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
-  GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
-  GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
-  hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
-  imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd
-  local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
-  maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92
-  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
-  OpenTok: fde03ecc5ea31fe0a453242847c4ee1f47e1d735
-  path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
-  path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
-  permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
-  PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
-  Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
-  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
-  shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
-  shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
-  shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
-  shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
-  speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
-  SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
-  Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
-  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
-  url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
-  url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
-  url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
-  url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5
-  video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
-  video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7
-  wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
-  webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
-
-PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
-
-COCOAPODS: 1.10.1
diff --git a/ios/Runner/VideoViewController.swift b/ios/Runner/VideoViewController.swift
index 8609c018..44e45f3a 100644
--- a/ios/Runner/VideoViewController.swift
+++ b/ios/Runner/VideoViewController.swift
@@ -43,10 +43,33 @@ class ViewController: UIViewController {
           requestCameraPermissionsIfNeeded()
           hideVideoMuted()
           setupSession()
-          // Do any additional setup after loading the view.
+          
       }
     
     
+    private func changeCallStatus(callStatus:Int){
+        let URL_USER_REGISTER = baseUrl+"LiveCareApi/DoctorApp/ChangeCallStatus"
+        let headers: HTTPHeaders = ["Content-Type":"application/json","Accept":"application/json",]
+        
+        let parameters = [
+            "CallStatus":callStatus,
+            "VC_ID": VC_ID,
+            "TokenID": TokenID,
+            "generalid": generalid,
+            "DoctorId" : DoctorId ,
+            ] as [String : Any]
+        
+        AF.request(URL_USER_REGISTER, method: .post,parameters: parameters, encoding: JSONEncoding.default, headers: headers).responseJSON{
+                response in
+            if let result = response.value {
+                let jsonData = result as! NSObject
+                let resultVal = jsonData.value(forKey: "Result")
+                print(resultVal as Any)
+            }
+            
+        }
+    }
+    
     private func getSessionStatus() {
             let URL_USER_REGISTER = baseUrl+"LiveCareApi/DoctorApp/GetSessionStatus"
             let headers: HTTPHeaders = [
@@ -61,11 +84,11 @@ class ViewController: UIViewController {
                 "generalid": generalid,
                 "DoctorId" : DoctorId ,
                 ] as [String : Any]
-            Alamofire.request(URL_USER_REGISTER, method: .post,parameters: parameters, encoding: JSONEncoding.default, headers: headers).responseJSON{
+        AF.request(URL_USER_REGISTER, method: .post,parameters: parameters, encoding: JSONEncoding.default, headers: headers).responseJSON{
                     response in
                 if self.isUserConnect {
                 } else {
-                    if let result = response.result.value {
+                    if let result = response.value {
                         let jsonData = result as! NSObject
                         if((jsonData.value(forKey: "SessionStatus")) as! Int  == 2 || (jsonData.value(forKey: "SessionStatus")) as! Int == 3) {
                             //jsonData
@@ -81,7 +104,6 @@ class ViewController: UIViewController {
                     self.sessionDisconnect();
                     self.timer.invalidate()
                 }
-                    //getting json value from the server
                     
             }
         }
@@ -160,6 +182,7 @@ class ViewController: UIViewController {
 
     
     func sessionDisconnect() {
+        changeCallStatus(callStatus: 16)
         if (session != nil)  {
             print("disconnecting....")
             session!.disconnect(nil)
@@ -168,7 +191,7 @@ class ViewController: UIViewController {
         }
         dismiss(animated: true)
     }
-    //  Converted to Swift 5.2 by Swiftify v5.2.26743 - https://swiftify.com/
+    
     func requestCameraPermissionsIfNeeded() {
 
         // check camera authorization status
@@ -306,6 +329,7 @@ extension ViewController: OTSessionDelegate {
    }
 
    func session(_ session: OTSession, didFailWithError error: OTError) {
+       changeCallStatus(callStatus: 16)
        print("The client failed to connect to the OpenTok session: \(error).")
    }
     
@@ -377,6 +401,7 @@ extension ViewController: OTSessionDelegate {
         if let connectionId = connection?.connectionId {
             print("session connectionCreated (\(connectionId))")
         }
+        changeCallStatus(callStatus: 3)
         isUserConnect  = true
         timer.invalidate()
     }
diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart
index b4e5f810..10181bf4 100644
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@@ -79,11 +79,13 @@ class BaseAppClient {
             await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
       }
 
-      //int projectID = await sharedPref.getInt(PROJECT_ID);
-      //if (projectID == 2 || projectID == 3)
-      // body['PatientOutSA'] = true;
-      //else
-      body['PatientOutSA'] = false;
+      int projectID = await sharedPref.getInt(PROJECT_ID);
+      if (projectID == 2 || projectID == 3)
+      body['PatientOutSA'] = true;
+      else if(body.containsKey('facilityId') && body['facilityId']==2 || body['facilityId']==3)
+        body['PatientOutSA'] = true;
+      else
+        body['PatientOutSA'] = false;
 
       body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2;
       print("URL : $url");
diff --git a/lib/config/config.dart b/lib/config/config.dart
index c8af8ad9..0283577e 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
diff --git a/lib/screens/qr_reader/QR_reader_screen.dart b/lib/screens/qr_reader/QR_reader_screen.dart
index 57e6cc11..30c05fef 100644
--- a/lib/screens/qr_reader/QR_reader_screen.dart
+++ b/lib/screens/qr_reader/QR_reader_screen.dart
@@ -1,4 +1,4 @@
-import 'package:barcode_scan/platform_wrapper.dart';
+import 'package:barcode_scan_fix/barcode_scan.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
@@ -137,8 +137,8 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
     /// var result = await BarcodeScanner.scan();
     /// int patientID = get from qr result
     var result = await BarcodeScanner.scan();
-    if (result.rawContent != "") {
-      List<String> listOfParams = result.rawContent.split(',');
+    if (result != "") {
+      List<String> listOfParams = result.split(',');
       String patientType = "1";
       setState(() {
         isLoading = true;
diff --git a/pubspec.lock b/pubspec.lock
index 613c2753..77df9848 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -43,13 +43,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.7.3"
-  barcode_scan:
+  barcode_scan_fix:
     dependency: "direct main"
     description:
-      name: barcode_scan
+      name: barcode_scan_fix
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "1.0.2"
   bazel_worker:
     dependency: transitive
     description:
@@ -629,7 +629,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.4"
+    version: "1.3.0-nullsafety.3"
   mime:
     dependency: transitive
     description:
@@ -921,7 +921,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.2"
+    version: "1.10.0-nullsafety.1"
   sticky_headers:
     dependency: "direct main"
     description:
@@ -1119,5 +1119,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0 <=2.11.0-213.1.beta"
+  dart: ">=2.10.0 <2.11.0"
   flutter: ">=1.22.0 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 2e4d7ce8..973e8800 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -51,7 +51,7 @@ dependencies:
   expandable: ^4.1.4
 
   # Qr code Scanner
-  barcode_scan: ^3.0.1
+  barcode_scan_fix: ^1.0.2
   # permissions
   permission_handler: ^5.0.0+hotfix.3
   device_info: ^0.4.2+4