diff --git a/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java b/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java index 5549950..954bdb6 100644 --- a/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java +++ b/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java @@ -42,8 +42,8 @@ public class DocumentActivity extends BaseActivity - + + + 感谢您选择有信!\n + 为保障您的权利,在使用我们的服务前,请通过《有信用户协议》和《有信隐私政策》了解我们对于个人信息的使用情况与您所享有的相关权利。\n diff --git a/library/core/src/main/res/drawable-hdpi/icon_app.png b/library/core/src/main/res/drawable-hdpi/icon_app.png index 41f7083..840e7ec 100644 Binary files a/library/core/src/main/res/drawable-hdpi/icon_app.png and b/library/core/src/main/res/drawable-hdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-mdpi/icon_app.png b/library/core/src/main/res/drawable-mdpi/icon_app.png index 41f7083..840e7ec 100644 Binary files a/library/core/src/main/res/drawable-mdpi/icon_app.png and b/library/core/src/main/res/drawable-mdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-xhdpi/icon_app.png b/library/core/src/main/res/drawable-xhdpi/icon_app.png index 41f7083..840e7ec 100644 Binary files a/library/core/src/main/res/drawable-xhdpi/icon_app.png and b/library/core/src/main/res/drawable-xhdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-xxhdpi/icon_app.png b/library/core/src/main/res/drawable-xxhdpi/icon_app.png index 41f7083..840e7ec 100644 Binary files a/library/core/src/main/res/drawable-xxhdpi/icon_app.png and b/library/core/src/main/res/drawable-xxhdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-xxxhdpi/icon_app.png b/library/core/src/main/res/drawable-xxxhdpi/icon_app.png index 41f7083..840e7ec 100644 Binary files a/library/core/src/main/res/drawable-xxxhdpi/icon_app.png and b/library/core/src/main/res/drawable-xxxhdpi/icon_app.png differ diff --git a/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java b/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java index 6df98dc..265b1da 100644 --- a/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java +++ b/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java @@ -189,12 +189,12 @@ public final class UmengClient { }, 1000, TimeUnit.MILLISECONDS); } - if (pushChatMessage.getPlayToText() && pushChatMessage.getPlaySound()) { - MultimediaUtil.playSoundAndTtsSpeak(pushChatMessage.getOnlineRingtone(), pushChatMessage.getText()); + if (pushChatMessage.getPlayToText() && pushChatMessage.getPlaySound()) { // 仅在三重声音播放中选择一种 + MultimediaUtil.playSoundAndTtsSpeak(pushChatMessage.getOnlineRingtone(), pushChatMessage.getText()); // 提示音 } else if (pushChatMessage.getPlayToText()) { - MultimediaUtil.ttsSpeak(pushChatMessage.getText()); + MultimediaUtil.ttsSpeak(pushChatMessage.getText()); // 百度语音转文字 } else if (pushChatMessage.getPlaySound()) { - MultimediaUtil.playSound(pushChatMessage.getOnlineRingtone()); + MultimediaUtil.playSound(pushChatMessage.getOnlineRingtone()); // 播放在线铃声 } RxBus.getInstance().postSticky(pushChatMessage); } diff --git a/library/umeng/src/main/java/com/dolphin/umeng/util/MultimediaUtil.java b/library/umeng/src/main/java/com/dolphin/umeng/util/MultimediaUtil.java index 66e770b..81c3f92 100644 --- a/library/umeng/src/main/java/com/dolphin/umeng/util/MultimediaUtil.java +++ b/library/umeng/src/main/java/com/dolphin/umeng/util/MultimediaUtil.java @@ -12,6 +12,11 @@ import com.dolphin.umeng.R; import lombok.experimental.UtilityClass; +/** + * 媒体声音播放工具类 + * @Author: liusixiang007 + * @since: 2024/1/27 + */ @UtilityClass public class MultimediaUtil {