Merge branch 'fix_label_replay_on_referral' into 'development'

fix label on replay referral

See merge request Cloud_Solution/doctor_app_flutter!728

android/app/src/main/AndroidManifest.xml

@@ -9,12 +9,19 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here.
     -->
-    <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" />
 
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:icon="@mipmap/ic_launcher"

android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java

@@ -190,11 +190,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
     private void hiddenButtons() {
         mVolHandler = new Handler();
-        mVolRunnable = new Runnable() {
-            public void run() {
-                controlPanel.setVisibility(View.GONE);
-            }
-        };
+        mVolRunnable = () -> controlPanel.setVisibility(View.GONE);
         mVolHandler.postDelayed(mVolRunnable, 5 * 1000);
     }
 
@@ -269,8 +265,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     public void onError(Session session, OpentokError opentokError) {
         Log.d(TAG, "onError: Error (" + opentokError.getMessage() + ") in session " + session.getSessionId());
 
-        Toast.makeText(this, "Session error. See the logcat please.", Toast.LENGTH_LONG).show();
-        finish();
+       // Toast.makeText(this, "Session error. See the logcat please.", Toast.LENGTH_LONG).show();
+        //finish();
     }
 
     @Override
@@ -282,6 +278,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         }
         isConnected = true;
         subscribeToStream(stream);
+        if(mConnectedHandler!=null && mConnectedRunnable!=null)
+        mConnectedHandler.removeCallbacks(mConnectedRunnable);
         videoCallPresenter.callChangeCallStatus(new ChangeCallStatusRequestModel(3,sessionStatusModel.getDoctorId(), sessionStatusModel.getGeneralid(),token,sessionStatusModel.getVCID()));
     }
 
@@ -315,8 +313,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     public void onError(PublisherKit publisherKit, OpentokError opentokError) {
         Log.d(TAG, "onError: Error (" + opentokError.getMessage() + ") in publisher");
 
-        Toast.makeText(this, "Session error. See the logcat please.", Toast.LENGTH_LONG).show();
-        finish();
+   //     Toast.makeText(this, "onError: Error (" + opentokError.getMessage() + ") in publisher", Toast.LENGTH_LONG).show();
+      //  finish();
     }
 
     @Override
@@ -427,6 +425,10 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             returnIntent.putExtra("sessionStatusNotRespond", sessionStatusModel);
             setResult(Activity.RESULT_OK, returnIntent);
             finish();
+        } else if( sessionStatusModel.getSessionStatus() == 4 ){
+            isConnected = true;
+            if(mConnectedHandler!=null && mConnectedRunnable!=null)
+            mConnectedHandler.removeCallbacks(mConnectedRunnable);
         }
     }
 

lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart

@@ -58,7 +58,7 @@ class _AddReplayOnReferralPatientState
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                BottomSheetTitle(title: 'Replay'),
+                BottomSheetTitle(title: 'Reply'),
                 SizedBox(
                   height: 10.0,
                 ),
@@ -70,7 +70,7 @@ class _AddReplayOnReferralPatientState
                         Stack(
                           children: [
                             AppTextFieldCustom(
-                              hintText: 'Replay your responses here',
+                              hintText: 'Reply your responses here',
                               controller: replayOnReferralController,
                               maxLines: 35,
                               minLines: 25,
@@ -128,7 +128,7 @@ class _AddReplayOnReferralPatientState
             Container(
                 margin: EdgeInsets.all(5),
                 child: AppButton(
-                    title: 'Submit Replay',
+                    title: 'Submit Reply',
                     color: Color(0xff359846),
                     fontWeight: FontWeight.w700,
                     onPressed: () async {
@@ -147,12 +147,12 @@ class _AddReplayOnReferralPatientState
                         } else {
                           GifLoaderDialogUtils.hideDialog(context);
                           DrAppToastMsg.showSuccesToast(
-                              "Your Replay Added Successfully");
+                              "Your Reply Added Successfully");
                           Navigator.of(context).pop();
                           Navigator.of(context).pop();
                         }
                       } else {
-                        Helpers.showErrorToast("You can't add empty replay");
+                        Helpers.showErrorToast("You can't add empty reply");
                         setState(() {
                           isSubmitted = false;
                         });