Merge remote-tracking branch 'origin/Ekal_Sprint_34_Final' into Ekal_…

…Sprint_34_Final
Intelehealth · Nov 2, 2023 · e34cf18 · e34cf18
2 parents 6061bde + 2d6c4ed
commit e34cf18
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 190 deletions.
diff --git a/app/src/main/java/org/intelehealth/ekalarogya/activities/homeActivity/HomeActivity.java b/app/src/main/java/org/intelehealth/ekalarogya/activities/homeActivity/HomeActivity.java
@@ -76,6 +76,7 @@
 import org.intelehealth.ekalarogya.utilities.NetworkConnection;
 import org.intelehealth.ekalarogya.utilities.OfflineLogin;
 import org.intelehealth.ekalarogya.utilities.SessionManager;
+import org.intelehealth.ekalarogya.webrtc.activity.EkalCallLogActivity;
 import org.intelehealth.ekalarogya.webrtc.activity.EkalChatActivity;
 import org.intelehealth.ekalarogya.webrtc.activity.EkalVideoActivity;
 import org.intelehealth.ekalarogya.widget.materialprogressbar.CustomProgressDialog;
@@ -333,7 +334,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
-        if (itemId == R.id.userProfileOption) {
+        if (itemId == R.id.actionCallLog) {
+            startActivity(new Intent(this, EkalCallLogActivity.class));
+            return true;
+        } else if (itemId == R.id.userProfileOption) {
             Hw_Profile();
             return true;
         } else if (itemId == R.id.settingsOption) {
@@ -543,12 +547,14 @@ public void onNext(DownloadMindMapRes res) {
                                 Toast.makeText(context, getResources().getString(R.string.no_protocols_found), Toast.LENGTH_SHORT).show();
                             }
                         }
+
                         @Override
                         public void onError(Throwable e) {
                             customProgressDialog.dismiss();
                             Toast.makeText(context, getResources().getString(R.string.unable_to_get_proper_response), Toast.LENGTH_SHORT).show();
                             Log.v(TAG, "jwt_response: " + e.toString());
                         }
+
                         @Override
                         public void onComplete() {
                         }
@@ -638,6 +644,7 @@ public void onClick(DialogInterface dialog, int which) {
                     }
                 }
             }
+
             @Override
             public void onError(Throwable e) {
                 Log.e("Error", "" + e);

diff --git a/app/src/main/java/org/intelehealth/ekalarogya/database/dao/PatientsDAO.java b/app/src/main/java/org/intelehealth/ekalarogya/database/dao/PatientsDAO.java
@@ -434,8 +434,11 @@ public boolean updateOpemmrsId(String openmrsId, String synced, String uuid) thr
             db.endTransaction();
         }
         try {
-            Intent intent = new Intent(IntelehealthApplication.getAppContext(), MyIntentService.class);
-            IntelehealthApplication.getAppContext().startService(intent);
+            Intent in = new Intent();
+            in.setAction("OpenmrsID");
+            IntelehealthApplication.getAppContext().sendBroadcast(in);
+//            Intent intent = new Intent(IntelehealthApplication.getAppContext(), MyIntentService.class);
+//            IntelehealthApplication.getAppContext().startService(intent);
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
         }

diff --git a/app/src/main/java/org/intelehealth/ekalarogya/webrtc/activity/EkalCallLogActivity.kt b/app/src/main/java/org/intelehealth/ekalarogya/webrtc/activity/EkalCallLogActivity.kt
@@ -37,8 +37,7 @@ class EkalCallLogActivity : CoreCallLogActivity(), BaseViewHolder.ViewHolderClic
             layoutManager = LinearLayoutManager(context)
             addItemDecoration(
                 DividerItemDecoration(
-                    this@EkalCallLogActivity,
-                    DividerItemDecoration.VERTICAL
+                    this@EkalCallLogActivity, DividerItemDecoration.VERTICAL
                 )
             )
             this@EkalCallLogActivity.adapter.updateItems(logs.toMutableList())

diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml
@@ -8,10 +8,10 @@
             android:orderInCategory="100"
             android:title="@string/menu_option_hw_profile" />
 
-        <!--<item-->
-        <!--android:id="@+id/syncOption"-->
-        <!--android:title="@string/menu_option_sync"-->
-        <!--android:orderInCategory="50" />-->
+        <item
+            android:id="@+id/actionCallLog"
+            android:orderInCategory="100"
+            android:title="@string/menu_option_call_log" />
 
         <item
             android:id="@+id/settingsOption"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -74,6 +74,7 @@
     <string name="menu_option_end_of_day" translatable="false">End of Day</string>
     <string name="menu_option_logout" translatable="false">Logout</string>
     <string name="menu_option_hw_profile" translatable="false">User Profile</string>
+    <string name="menu_option_call_log" translatable="false">@string/call_logs</string>
 
 
     //Identification Screen

diff --git a/klivekit/src/main/java/org/intelehealth/klivekit/call/ui/activity/CoreVideoCallActivity.kt b/klivekit/src/main/java/org/intelehealth/klivekit/call/ui/activity/CoreVideoCallActivity.kt
@@ -3,7 +3,9 @@ package org.intelehealth.klivekit.call.ui.activity
 import android.Manifest
 import android.content.Intent
 import android.media.MediaPlayer
+import android.media.Ringtone
 import android.media.RingtoneManager
+import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
@@ -81,21 +83,21 @@ abstract class CoreVideoCallActivity : AppCompatActivity() {
 
 
     // initiate the incoming call ringtone
-//    private val ringtone: Ringtone by lazy {
-//        val notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-//        RingtoneManager.getRingtone(applicationContext, notification)
-//    }
+    private val ringtone: Ringtone by lazy {
+        val notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
+        RingtoneManager.getRingtone(applicationContext, notification)
+    }
 
 //    private val audioManager: AudioManager by lazy {
 //        applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
 //    }
 
-    private val mediaPlayer: MediaPlayer by lazy {
-        val notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-        MediaPlayer.create(this, notification).apply {
-            isLooping = true
-        };
-    }
+//    private val mediaPlayer: MediaPlayer by lazy {
+//        val notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
+//        MediaPlayer.create(this, notification).apply {
+//            isLooping = true
+//        };
+//    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         window.addFlags(
@@ -304,12 +306,20 @@ abstract class CoreVideoCallActivity : AppCompatActivity() {
 
     open fun playRingtone() {
 //        mediaPlayer.prepare()
-        mediaPlayer.start()
+//        mediaPlayer.start()
+        if (!ringtone.isPlaying) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                ringtone.isLooping = true
+            }
+            ringtone.play()
+        }
     }
 
     open fun stopRingtone() {
-        Timber.e { "stopRingtone ${mediaPlayer.isPlaying}" }
-        if (mediaPlayer.isPlaying) mediaPlayer.stop()
+//        Timber.e { "stopRingtone ${mediaPlayer.isPlaying}" }
+//        if (mediaPlayer.isPlaying) mediaPlayer.stop()
+        Timber.e { "stopRingtone ${ringtone.isPlaying}" }
+        if (ringtone.isPlaying) ringtone.stop()
     }
 
     override fun onResume() {

diff --git a/klivekit/src/main/java/org/intelehealth/klivekit/call/ui/viewmodel/CoreVideoViewModel.kt b/klivekit/src/main/java/org/intelehealth/klivekit/call/ui/viewmodel/CoreVideoViewModel.kt
diff --git a/klivekit/src/main/java/org/intelehealth/klivekit/call/utils/CallNotificationHandler.kt b/klivekit/src/main/java/org/intelehealth/klivekit/call/utils/CallNotificationHandler.kt
@@ -144,8 +144,8 @@ object CallNotificationHandler {
 
         return NotificationCompat.Builder(context, getChannelId(context))
             .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setContentTitle(getApplicationName(context))
-            .setContentText("Incoming call from ${messageBody.doctorName ?: "unknown"}")
+            .setContentTitle(messageBody.doctorName ?: "unknown")
+            .setContentText("Incoming call")
             .setColor(ContextCompat.getColor(context, R.color.blue_1))
             .setSmallIcon(messageBody.notificationIcon)
 //            .setSound(getDefaultRingtoneUrl(), AudioManager.STREAM_RING)
@@ -176,8 +176,8 @@ object CallNotificationHandler {
 
         return NotificationCompat.Builder(context, getChannelId(context))
             .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setContentTitle("Ongoing call with ${messageBody.doctorName ?: "unknown"}")
-//            .setContentText("Ongoing call with ${messageBody.doctorName ?: "unknown"}")
+            .setContentTitle(messageBody.doctorName ?: "unknown")
+            .setContentText("Ongoing call")
             .setColor(ContextCompat.getColor(context, R.color.blue_1))
             .setSmallIcon(messageBody.notificationIcon)
             .setCategory(NotificationCompat.CATEGORY_CALL).setContentIntent(notificationIntent)
@@ -226,8 +226,8 @@ object CallNotificationHandler {
         messageBody.callStatus = CallStatus.MISSED
         return NotificationCompat.Builder(context, getChannelId(context))
             .setPriority(NotificationCompat.PRIORITY_LOW)
-//            .setContentTitle(getApplicationName(context))
-            .setContentText("Missed call from ${messageBody.doctorName}")
+            .setContentTitle(messageBody.doctorName)
+            .setContentText("Missed call")
             .setColor(ContextCompat.getColor(context, R.color.red))
             .setSmallIcon(messageBody.notificationIcon)
             .setCategory(NotificationCompat.CATEGORY_MISSED_CALL).setAutoCancel(true)

diff --git a/klivekit/src/main/java/org/intelehealth/klivekit/chat/ui/adapter/ChatListingAdapter.java b/klivekit/src/main/java/org/intelehealth/klivekit/chat/ui/adapter/ChatListingAdapter.java
@@ -21,7 +21,7 @@
 import java.util.List;
 
 public class ChatListingAdapter extends DateHeaderAdapter {
-
+// Medicine adapter <- Test <- Aid adapter <- Header adapter <- Recycler.Adapter
     public interface AttachmentClickListener {
         void onClick(String url);
     }

diff --git a/klivekit/src/main/java/org/intelehealth/klivekit/socket/SocketManager.kt b/klivekit/src/main/java/org/intelehealth/klivekit/socket/SocketManager.kt
@@ -1,5 +1,8 @@
 package org.intelehealth.klivekit.socket
 
+import android.app.ActivityManager
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import com.github.ajalt.timberkt.Timber
 import com.google.gson.Gson
 import io.socket.client.IO
@@ -107,6 +110,10 @@ open class SocketManager @Inject constructor() {
     private fun invokeListeners(event: String, args: Any?) {
         Timber.d { "No of listener => ${emitterListeners.size}" }
         emitterListeners.forEach { it.invoke(event).call(args) }
+
+//        if (CallNotificationHandler.isAppInBackground() && event == EVENT_CALL_CANCEL_BY_DR) {
+//
+//        }
     }
 
     private fun notifyIfNotActiveRoom(jsonArray: JSONArray, block: (ChatMessage) -> Unit) {