From a1abcaa7c08144ddd65a77b7ac3d5af643d8f5f0 Mon Sep 17 00:00:00 2001
From: Mohammad Aljammal <Mohammad.Al-Jammal@cloudsolutions.com.sa>
Date: Mon, 7 Jun 2021 17:05:51 +0300
Subject: [PATCH] fix live care issues

---
 android/app/build.gradle                               | 10 ++++++++--
 .../kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java     |  6 +++---
 android/build.gradle                                   |  2 ++
 ios/Runner/VideoViewController.swift                   |  2 +-
 lib/core/service/patient/LiveCarePatientServices.dart  |  2 +-
 pubspec.lock                                           |  6 +++---
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b7605ad0..16960d54 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -54,6 +54,11 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
 }
 
 flutter {
@@ -74,9 +79,10 @@ dependencies {
     //permissions
     implementation 'pub.devrel:easypermissions:0.4.0'
     //retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
 
 }
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
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 1c907089..80f60c33 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
@@ -134,8 +134,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
     @SuppressLint("ClickableViewAccessibility")
     private void initUI() {
-        mPublisherViewContainer = (FrameLayout) findViewById(R.id.local_video_view_container);
-        mSubscriberViewContainer = (RelativeLayout) findViewById(R.id.remote_video_view_container);
+        mPublisherViewContainer = findViewById(R.id.local_video_view_container);
+        mSubscriberViewContainer = findViewById(R.id.remote_video_view_container);
 
         apiKey = getIntent().getStringExtra("apiKey");
         sessionId = getIntent().getStringExtra("sessionId");
@@ -184,7 +184,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 videoCallPresenter.callClintConnected(sessionStatusModel);
             }
         };
-        mConnectedHandler.postDelayed(mConnectedRunnable, 30 * 1000);
+        mConnectedHandler.postDelayed(mConnectedRunnable, 55 * 1000);
 
     }
 
diff --git a/android/build.gradle b/android/build.gradle
index ea0f0026..badc1b18 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -16,10 +16,12 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven { url 'https://tokbox.bintray.com/maven' }
     }
 }
 
+
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
diff --git a/ios/Runner/VideoViewController.swift b/ios/Runner/VideoViewController.swift
index 44e45f3a..0fb39f7c 100644
--- a/ios/Runner/VideoViewController.swift
+++ b/ios/Runner/VideoViewController.swift
@@ -31,7 +31,7 @@ class ViewController: UIViewController {
     
     var callBack: ICallProtocol?
     var timer = Timer()
-    var seconds = 30
+    var seconds = 55 
     var isUserConnect : Bool = false
     
     
diff --git a/lib/core/service/patient/LiveCarePatientServices.dart b/lib/core/service/patient/LiveCarePatientServices.dart
index ed09bbb9..949b3de4 100644
--- a/lib/core/service/patient/LiveCarePatientServices.dart
+++ b/lib/core/service/patient/LiveCarePatientServices.dart
@@ -19,7 +19,7 @@ class LiveCarePatientServices extends BaseService {
 
   bool _isFinished = false;
 
-  bool _isLive = false;
+  bool _isLive = true;
 
   bool get isFinished => _isFinished;
 
diff --git a/pubspec.lock b/pubspec.lock
index 25596d43..77df9848 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -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"