Преглед изворни кода

腕表事件语音提醒更新,其他优化

weizhengliang пре 11 месеци
родитељ
комит
b341e8443a

+ 9 - 3
android_mobile/src/main/yd_watch_2/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -41,6 +41,7 @@ import com.wdkl.ncs.android.lib.vo.MessageEvent
 import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
+import com.wdkl.ncs.android.middleware.model.PhoneBookItem
 import com.wdkl.ncs.android.middleware.model.ServerIpInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
@@ -69,6 +70,7 @@ import org.linphone.core.AccountCreator
 import org.linphone.core.Call
 import org.linphone.core.TransportType
 import java.util.*
+import kotlin.collections.ArrayList
 
 //@Router(path = "/watch/home")
 class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivityHome2Binding>(), WatchHomeActivityContract.View, View.OnClickListener {
@@ -663,14 +665,18 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         }
     }
 
+    override fun showPhoneBook(data: ArrayList<PhoneBookItem>) {
+
+    }
+
     /**
      * 设置设备数据
      */
     override fun setDeviceSettingData(partSettingDO: PartSettingDO) {
-        Log.i(TAG, "收到设置设备数据 transferDuration" + partSettingDO.transferDuration)
-        Log.i(TAG, "收到设置设备数据 transferDurationLeader" + partSettingDO.transferDurationLeader)
-
         if (partSettingDO != null && partSettingDO.transferDuration != null && partSettingDO.transferDurationLeader != null) {
+            Log.i(TAG, "收到设置设备数据 transferDuration" + partSettingDO.transferDuration)
+            Log.i(TAG, "收到设置设备数据 transferDurationLeader" + partSettingDO.transferDurationLeader)
+
             if (Constants.roleId != null) {
                 if (Constants.roleId == RoleTypeEnum.NURSE_HEAD.value()) {
                     //护士组长

+ 1 - 10
android_mobile/src/main/yd_watch_2/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -421,15 +421,6 @@ class WdKeepAliveService : AbsWorkService() {
                         playVoiceMsg(interaction)
                         val msgTcpModel = ImUtil.imRead(Constants.deviceId, interaction.fromDeviceId, interaction.id)
                         TcpClient.getInstance().sendTcp(msgTcpModel, false, null)
-
-                        /*NettyClient.instance.sendMsg(msgTcpModel.toJson()).subscribe {
-                            if (it) {
-                                Log.d(TAG, "TCP.发送消息完成")
-                            } else {
-                                Log.e(TAG, "TCP.发送消息失败")
-                                HandleTcpConnect.instance.tcpReConnectWithMsgShow()
-                            }
-                        }*/
                     }
                 } else if (tcpModel.action == TcpAction.EventAction.KEY_CLICK) { // 收到新事件
                     //取消掉语音留言录音
@@ -889,7 +880,7 @@ class WdKeepAliveService : AbsWorkService() {
             channelImList.clear()
             showMessage("播放留言...")
             MediaPlayHelper.getInstance().stopMusic(true)
-            SoundPoolManager.getInstance().playSound(1)
+            SoundPoolManager.getInstance().playSound(4)
             AppTool.Time.delay(1000) {
                 imPlayState = 1
                 MediaPlayHelper.getInstance().playUrlMusic(ApiManager.urlManager.device_url + interactionVO.data, 1f, false)

+ 2 - 2
android_mobile/src/main/yd_watch_2/code/com/wdkl/ncs/android/component/home/util/ImPlayDialogHelper.java

@@ -57,8 +57,8 @@ public class ImPlayDialogHelper {
             window.setFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
             imPlayDialog.show();
             WindowManager.LayoutParams lp = window.getAttributes();
-            lp.width = 580;
-            lp.height = 540;
+            lp.width = 200;
+            lp.height = 200;
             lp.gravity = Gravity.CENTER;
             //lp.alpha = 0.8f;//设置透明度
             window.setAttributes(lp);

+ 1 - 1
android_mobile/src/main/yd_watch_2/code/com/wdkl/ncs/android/component/home/util/SoundPoolManager.java

@@ -37,7 +37,7 @@ public class SoundPoolManager {
             builder.setAudioAttributes(attrBuilder.build());
             soundPool = builder.build();
         }else{
-            soundPool = new SoundPool(10, AudioManager.STREAM_SYSTEM, 0);
+            soundPool = new SoundPool(10, AudioManager.STREAM_MUSIC, 0);
         }
 
         soundID.put(1, soundPool.load(BaseApplication.appContext, R.raw.new_msg, 1));

BIN
resource/src/main/res/raw/new_event.mp3


BIN
resource/src/main/res/raw/new_msg.mp3