Merge branch 'fix_live_care' into 'development'

fix live care issues

See merge request Cloud_Solution/doctor_app_flutter!725

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'

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);
 
     }
 

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}"

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
     
     

lib/core/service/patient/LiveCarePatientServices.dart

@@ -18,7 +18,7 @@ class LiveCarePatientServices extends BaseService {
 
   bool _isFinished = false;
 
-  bool _isLive = false;
+  bool _isLive = true;
 
   bool get isFinished => _isFinished;